1 files changed, 7 insertions, 34 deletions
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index e710b43f5a..6453fce5e7 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -1,15 +1,5 @@
 default_pre_build  &&
-if list_find "$GCC_COMPILER" "c++" ; then
-  cd $BUILD_DIRECTORY  &&
-  unpack_file 3
-fi  &&
-if list_find "$GCC_COMPILER" "objc" ; then
-  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}  &&
@@ -27,31 +17,10 @@ if list_find "$GCC_COMPILER" "ada" ; then
   sedit 's:and Nam is "gnatgcc":and Nam is "gcc":'  \
         $SOURCE_DIRECTORY/gcc/ada/osint.ads &&
   cd ${SOURCE_DIRECTORY}
-#  if [[ "$GCC_ADA_BINDING_GENERATOR" == "y" ]]; then
-#    zcat ${SCRIPT_DIRECTORY}/txt00120.txt.gz | patch -p0 || return 1
-#  fi &&
-#  if [[ "$GCC_ADA_LIBADDRLINE" == "y" ]]; then
-#    patch -p1 < ${SCRIPT_DIRECTORY}/ada-symbolic-tracebacks.diff || return 1
-#  fi
   #
   # End Ada bootstrap cache code
   #
 fi  &&
-if list_find "$GCC_COMPILER" "java" ; then
-  cd $BUILD_DIRECTORY  &&
-  unpack_file 9  &&
-  verify_file 15  &&
-
-  cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar
-fi  &&
-if list_find "$GCC_COMPILER" "fortran" ; then
-  cd $BUILD_DIRECTORY  &&
-  unpack_file 11
-fi  &&
-if list_find "$GCC_COMPILER" "go" ; then
-  cd $BUILD_DIRECTORY  &&
-  unpack_file 16
-fi  &&
 
 mk_source_dir $SOURCE_DIRECTORY.bld  &&
 cd $SOURCE_DIRECTORY  &&
@@ -59,7 +28,11 @@ cd $SOURCE_DIRECTORY  &&
 sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
 sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
 
-patch -p0 < "$SPELL_DIRECTORY/glibc216.patch" &&
 patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/remove-libffi.patch"
+
+if list_find "$GCC_COMPILER" "go"; then
+  patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
+fi &&
+
+patch -p1 < "$SPELL_DIRECTORY/0002-4.7.2-ffast-math.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch"