Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merged-gcc grimoire by Andraž Levstik (e2a817e63d92efebfa7357f60953181af2bd87ff)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-merged-gcc grimoire by Andraž Levstik (e2a817e63d92efebfa7357f60953181af2bd87ff)
  • Date: Fri, 24 Jul 2009 11:18:06 -0500

GIT changes to devel-merged-gcc grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

gnu/gcc/BUILD | 69 +++++++++++++++++++++++----------------------
gnu/gcc/HISTORY | 4 ++
gnu/gcc/PRE_BUILD | 82
+++++++++++++++++++++++++++---------------------------
3 files changed, 81 insertions(+), 74 deletions(-)

New commits:
commit e2a817e63d92efebfa7357f60953181af2bd87ff
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

gcc: reformatting

diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index fa5f317..0ece038 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -1,9 +1,9 @@
# install gcc libraries to /lib instead of /lib64
-sedit "s/lib64/lib/" gcc/config/i386/linux64.h &&
+sedit "s/lib64/lib/" gcc/config/i386/linux64.h &&
if [[ "$GCC_NOLIB64" == 'y' ]]; then
# tell gcc to target binaries to expect the linker in /lib instead of
/lib64
sedit "s/lib64/lib/" gcc/config/i386/t-linux64
-fi &&
+fi &&

if [[ "$ARCHITECTURE" == "pentium4" ||
"$ARCHITECTURE" == "pentium-m" ]]; then
@@ -12,7 +12,7 @@ if [[ "$ARCHITECTURE" == "pentium4" ||
fi &&

# fixes seg-fault on libiberty/splay.c in v 4.3.2
-CFLAGS="-O1 $CFLAGS"
+CFLAGS="-O1 $CFLAGS" &&

if [[ $CROSS_INSTALL == on ]]; then
OPTS="--host=$HOST $OPTS"
@@ -22,47 +22,50 @@ fi &&

# store CFLAGS and LDFLAGS persistently so they can be read by the other
# split spells later, see bug #10087
-GCC_CFLAGS="$CFLAGS" &&
-GCC_LDFLAGS="$LDFLAGS" &&
+GCC_CFLAGS="$CFLAGS" &&
+GCC_LDFLAGS="$LDFLAGS" &&
persistent_add GCC_CFLAGS GCC_LDFLAGS &&
# when updating this spell please check if this is still necessary:
if [[ $GCJ_AWT == y ]]; then
CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/freetype2"
-fi &&
-if list_find "$GCC_COMPILER" "ada" ; then
-# setup bootstrap ada compiler
- ADA_PATH=${SOURCE13/.tar.bz2/} &&
- PATH=$SOURCE_DIRECTORY/$ADA_PATH/usr/bin:$PATH &&
+fi &&

- export CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gcc" &&
- export
INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gcc/$HOST/4.3.3/include" &&
- export LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gcc/$HOST/4.3.3/"
&&
- export LDFLAGS="-L${LIB_DIR}"
+if list_find "$GCC_COMPILER" "ada" ; then
+ # setup bootstrap ada compiler
+ ADA_PATH=${SOURCE13/.tar.bz2/} &&
+ PATH=$SOURCE_DIRECTORY/$ADA_PATH/usr/bin:$PATH &&

- export LIBRARY_PATH="$LIB_DIR" &&
- export LD_LIBRARY_PATH="$LIB_DIR" &&
- export COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin" &&
+ if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
+ export CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gnatgcc"
+ elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ export CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gcc"
+ fi &&
+ export
INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gcc/$HOST/${VERSION13}/include"
&&
+ export
LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gcc/$HOST/${VERSION13}/" &&
+ export LDFLAGS="-L${LIB_DIR}" &&
+ export LIBRARY_PATH="$LIB_DIR" &&
+ export LD_LIBRARY_PATH="$LIB_DIR" &&
+ export COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin" &&

- export ADA_OBJECTS_PATH="$LIB_DIR/adalib" &&
- export ADA_INCLUDE_PATH="$LIB_DIR/adainclude" &&
+ export ADA_OBJECTS_PATH="$LIB_DIR/adalib" &&
+ export ADA_INCLUDE_PATH="$LIB_DIR/adainclude" &&

- OPTS="--enable-libada $OPTS"
+ OPTS="--enable-libada $OPTS"

-fi
-cd $SOURCE_DIRECTORY.bld &&
-$SOURCE_DIRECTORY/configure \
- --prefix=${INSTALL_ROOT}/usr \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --enable-threads=posix \
+fi &&
+cd $SOURCE_DIRECTORY.bld &&
+$SOURCE_DIRECTORY/configure \
+ --prefix=${INSTALL_ROOT}/usr \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --enable-threads=posix \
--enable-languages=$(echo ${GCC_COMPILER} | tr " " ",") \
- --with-system-zlib \
- $GCC_MULTILIB $OPTS &&
+ --with-system-zlib \
+ $GCC_MULTILIB $OPTS &&

if [[ "$GCC_TARGET" == "profiledbootstrap" ]] ||
[[ "$GCC_TARGET" == "profiledbootstrap-lean" ]] ; then
-make_single
-fi &&
+ make_single
+fi &&
echo "$MAKE_NJOBS $JOBS_PER_HOST"
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
- $GCC_TARGET
+make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $GCC_TARGET
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 5538c2e..6dbec56 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2009-07-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * BUILD: reformatted and added support for x86
+ * PRE_BUILD: reformatted
+
2009-07-24 Peng Chang (Charles) <chp AT sourcemage.org>
* CONFIGURE: query for GCJ_AWT only when java is to be compiled
* PRE_BUILD: removed duplicate mk_source_dir $SOURCE_DIRECTORY.bld
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 5a47397..082fcff 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -1,51 +1,51 @@
-default_pre_build &&
+default_pre_build &&
if list_find "$GCC_COMPILER" "c++" ; then
-cd $BUILD_DIRECTORY &&
-unpack_file 3
-fi
+ cd $BUILD_DIRECTORY &&
+ unpack_file 3
+fi &&
if list_find "$GCC_COMPILER" "objc" ; then
-cd $BUILD_DIRECTORY &&
-unpack_file 5
-fi
+ cd $BUILD_DIRECTORY &&
+ unpack_file 5
+fi &&
if list_find "$GCC_COMPILER" "ada" ; then
-cd $BUILD_DIRECTORY &&
-unpack_file 7
-cd $SOURCE_DIRECTORY &&
-
-mkdir ${SOURCE13/.tar.bz2} &&
-cd ${SOURCE13/.tar.bz2} &&
-unpack_file 13 &&
-
-#
-# This section is used to build a gnat bootstrap cache
-#
-touch $SOURCE_DIRECTORY/gcc/cstamp-h.in &&
-touch $SOURCE_DIRECTORY/gcc/ada/[es]info.h &&
-touch $SOURCE_DIRECTORY/gcc/ada/nmake.ad[bs] &&
-
-
-sedit 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):' \
- $SOURCE_DIRECTORY/gcc/ada/makegpr.adb &&
-sedit 's:and Nam is "gnatgcc":and Nam is "gcc":' \
- $SOURCE_DIRECTORY/gcc/ada/osint.ads
-#
-# End Ada bootstrap cache code
-#
-fi
+ cd $BUILD_DIRECTORY &&
+ unpack_file 7
+ cd $SOURCE_DIRECTORY &&
+
+ mkdir ${SOURCE13/.tar.bz2} &&
+ cd ${SOURCE13/.tar.bz2} &&
+ unpack_file 13 &&
+
+ #
+ # This section is used to build a gnat bootstrap cache
+ #
+ touch $SOURCE_DIRECTORY/gcc/cstamp-h.in &&
+ touch $SOURCE_DIRECTORY/gcc/ada/[es]info.h &&
+ touch $SOURCE_DIRECTORY/gcc/ada/nmake.ad[bs] &&
+
+
+ sedit 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):' \
+ $SOURCE_DIRECTORY/gcc/ada/makegpr.adb &&
+ sedit 's:and Nam is "gnatgcc":and Nam is "gcc":' \
+ $SOURCE_DIRECTORY/gcc/ada/osint.ads
+ #
+ # End Ada bootstrap cache code
+ #
+fi &&
if list_find "$GCC_COMPILER" "java" ; then
-cd $BUILD_DIRECTORY &&
-unpack_file 9 &&
-verify_file 14 &&
+ cd $BUILD_DIRECTORY &&
+ unpack_file 9 &&
+ verify_file 14 &&

-cp -v $SOURCE_CACHE/$SOURCE14 $SOURCE_DIRECTORY/ecj.jar
-fi
+ cp -v $SOURCE_CACHE/$SOURCE14 $SOURCE_DIRECTORY/ecj.jar
+fi &&
if list_find "$GCC_COMPILER" "fortran" ; then
-cd $BUILD_DIRECTORY &&
-unpack_file 11
-fi
+ cd $BUILD_DIRECTORY &&
+ unpack_file 11
+fi &&

-mk_source_dir $SOURCE_DIRECTORY.bld &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir $SOURCE_DIRECTORY.bld &&
+cd $SOURCE_DIRECTORY &&

#apply the GCC 4.1.1 fast-math fix
#patch -p1 < $SPELL_DIRECTORY/gcc-$VERSION-ffast-math.patch



  • [SM-Commit] GIT changes to devel-merged-gcc grimoire by Andraž Levstik (e2a817e63d92efebfa7357f60953181af2bd87ff), Andraž Levstik, 07/24/2009

Archive powered by MHonArc 2.6.24.

Top of Page