diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/Makefrag.am | 10 | ||||
| -rw-r--r-- | gcc/configury2.patch | 25 |
3 files changed, 40 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 03afc8b..7d39bd4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-11-19 Neal H. Walfield <neal@gnu.org> + + * configury2.patch: New file. + * Makefrag.am (gcc_patch_files): Add configury2.patch. + (gcc/gcc.build/configure.stamp): Only add --with-arch for x86 + machines. + 2008-12-04 Neal H. Walfield <neal@gnu.org> * Makefrag.am (gcc/gcc.build/configure.stamp): Disable c++. diff --git a/gcc/Makefrag.am b/gcc/Makefrag.am index d513ea8..d1ecc59 100644 --- a/gcc/Makefrag.am +++ b/gcc/Makefrag.am @@ -22,7 +22,8 @@ gcc_snapshot = $(addprefix ftp://ftp.gnu.org/gnu/gcc/gcc-$(gcc_version)/,$(1)) # Patches to apply to GCC's source tree. gcc_patch_files = \ - configury.patch + configury.patch \ + configury2.patch $(addprefix $(srcdir)/gcc/,$(gcc_tarballs)): $(srcdir)/gcc/%: cd $(srcdir)/gcc/ && \ @@ -61,6 +62,11 @@ gcc/gcc.build/configure.stamp: $(srcdir)/gcc/gcc/patch.stamp binutils/binutils.b rm -rf gcc/gcc.build mkdir -p gcc/gcc.build ( cd gcc/gcc.build && \ + case "$(host_alias)" in \ + i[34567]86-*-*) \ + extra_args=--with-arch=$(word 1,$(subst -, ,$(host_alias))) \ + ;; \ + esac && \ $(abs_srcdir)/gcc/gcc/configure \ --target=$(host_alias) \ --prefix='$(abs_top_builddir)' \ @@ -71,7 +77,7 @@ gcc/gcc.build/configure.stamp: $(srcdir)/gcc/gcc/patch.stamp binutils/binutils.b --without-headers \ --with-newlib \ --enable-languages=c \ - --with-arch=$(word 1,$(subst -, ,$(host_alias))) \ + $$extra_args \ ) touch $@ diff --git a/gcc/configury2.patch b/gcc/configury2.patch new file mode 100644 index 0000000..2443ff9 --- /dev/null +++ b/gcc/configury2.patch @@ -0,0 +1,25 @@ +#!/bin/sh + +patch -p0 -f "$@" < $0 +exit "$?" + + +Add x86_64 support. + +--- gcc/config.gcc~ 2008-11-03 12:51:22.000000000 +0100 ++++ gcc/config.gcc 2008-11-18 16:16:15.000000000 +0100 +@@ -1091,12 +1091,13 @@ i[34567]86-*-linux* | i[34567]86-*-kfree + # TODO. GNU/Hurd originally didn't have `t-dfprules'. + tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtfm t-dfprules" + ;; +-x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) ++x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu | x86_64-*-viengoos-gnu*) + tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \ + i386/x86-64.h i386/linux64.h" + case ${target} in + x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;; + x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;; ++ x86_64-*-viengoos-gnu*) tm_file="${tm_file} gnu.h viengoos.h i386/viengoos.h" ;; + esac + tmake_file="${tmake_file} i386/t-linux64 i386/t-crtfm t-dfprules" + ;; |