From: Jo-Philipp Wich Date: Sun, 29 Jan 2012 20:22:56 +0000 (+0000) Subject: toolchain: fix gcc 3.4.6 (brcm-2.4) after relocation from usr/, refresh patches while... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=18bed3c54c0fb3fd081aa6c685a0526effdf06b0;p=openwrt%2Fsvn-archive%2Fopenwrt.git toolchain: fix gcc 3.4.6 (brcm-2.4) after relocation from usr/, refresh patches while being at it SVN-Revision: 29950 --- diff --git a/toolchain/gcc/patches/3.4.6/100-uclibc-conf.patch b/toolchain/gcc/patches/3.4.6/100-uclibc-conf.patch index 29e4c802e2..b007c7253a 100644 --- a/toolchain/gcc/patches/3.4.6/100-uclibc-conf.patch +++ b/toolchain/gcc/patches/3.4.6/100-uclibc-conf.patch @@ -1,7 +1,6 @@ -diff -urN gcc-3.4.1-dist/boehm-gc/configure gcc-3.4.1/boehm-gc/configure ---- gcc-3.4.1-dist/boehm-gc/configure 2004-07-01 14:14:03.000000000 -0500 -+++ gcc-3.4.1/boehm-gc/configure 2004-08-12 16:22:57.000000000 -0500 -@@ -1947,6 +1947,11 @@ +--- a/boehm-gc/configure ++++ b/boehm-gc/configure +@@ -1947,6 +1947,11 @@ linux-gnu*) lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -13,10 +12,9 @@ diff -urN gcc-3.4.1-dist/boehm-gc/configure gcc-3.4.1/boehm-gc/configure netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -diff -urN gcc-3.4.1-dist/boehm-gc/ltconfig gcc-3.4.1/boehm-gc/ltconfig ---- gcc-3.4.1-dist/boehm-gc/ltconfig 2002-11-20 09:59:06.000000000 -0600 -+++ gcc-3.4.1/boehm-gc/ltconfig 2004-08-12 15:54:42.000000000 -0500 -@@ -1981,6 +1981,23 @@ +--- a/boehm-gc/ltconfig ++++ b/boehm-gc/ltconfig +@@ -1981,6 +1981,23 @@ linux-gnu*) fi ;; @@ -40,9 +38,8 @@ diff -urN gcc-3.4.1-dist/boehm-gc/ltconfig gcc-3.4.1/boehm-gc/ltconfig netbsd*) version_type=sunos if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -diff -urN gcc-3.4.1-dist/gcc/config/arm/linux-elf.h gcc-3.4.1/gcc/config/arm/linux-elf.h ---- gcc-3.4.1-dist/gcc/config/arm/linux-elf.h 2004-01-31 00:18:11.000000000 -0600 -+++ gcc-3.4.1/gcc/config/arm/linux-elf.h 2004-08-12 15:54:42.000000000 -0500 +--- a/gcc/config/arm/linux-elf.h ++++ b/gcc/config/arm/linux-elf.h @@ -81,6 +81,18 @@ "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" @@ -70,10 +67,9 @@ diff -urN gcc-3.4.1-dist/gcc/config/arm/linux-elf.h gcc-3.4.1/gcc/config/arm/lin #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS() -diff -urN gcc-3.4.1-dist/gcc/config/cris/linux.h gcc-3.4.1/gcc/config/cris/linux.h ---- gcc-3.4.1-dist/gcc/config/cris/linux.h 2003-11-28 21:08:09.000000000 -0600 -+++ gcc-3.4.1/gcc/config/cris/linux.h 2004-08-12 15:54:43.000000000 -0500 -@@ -79,6 +79,25 @@ +--- a/gcc/config/cris/linux.h ++++ b/gcc/config/cris/linux.h +@@ -79,6 +79,25 @@ Boston, MA 02111-1307, USA. */ #undef CRIS_DEFAULT_CPU_VERSION #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG @@ -99,7 +95,7 @@ diff -urN gcc-3.4.1-dist/gcc/config/cris/linux.h gcc-3.4.1/gcc/config/cris/linux #undef CRIS_SUBTARGET_VERSION #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu" -@@ -93,6 +112,8 @@ +@@ -93,6 +112,8 @@ Boston, MA 02111-1307, USA. */ %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\ %{!r:%{O2|O3: --gc-sections}}" @@ -108,17 +104,15 @@ diff -urN gcc-3.4.1-dist/gcc/config/cris/linux.h gcc-3.4.1/gcc/config/cris/linux /* Node: Run-time Target */ -diff -urN gcc-3.4.1-dist/gcc/config/cris/t-linux-uclibc gcc-3.4.1/gcc/config/cris/t-linux-uclibc ---- gcc-3.4.1-dist/gcc/config/cris/t-linux-uclibc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.1/gcc/config/cris/t-linux-uclibc 2004-08-12 15:54:43.000000000 -0500 +--- /dev/null ++++ b/gcc/config/cris/t-linux-uclibc @@ -0,0 +1,3 @@ +T_CFLAGS = -DUSE_UCLIBC +TARGET_LIBGCC2_CFLAGS += -fPIC +CRTSTUFF_T_CFLAGS_S = $(TARGET_LIBGCC2_CFLAGS) -diff -urN gcc-3.4.1-dist/gcc/config/i386/linux.h gcc-3.4.1/gcc/config/i386/linux.h ---- gcc-3.4.1-dist/gcc/config/i386/linux.h 2003-11-28 21:08:10.000000000 -0600 -+++ gcc-3.4.1/gcc/config/i386/linux.h 2004-08-12 15:54:43.000000000 -0500 -@@ -118,6 +118,15 @@ +--- a/gcc/config/i386/linux.h ++++ b/gcc/config/i386/linux.h +@@ -118,6 +118,15 @@ Boston, MA 02111-1307, USA. */ %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \ %{static:-static}}}" #else @@ -134,7 +128,7 @@ diff -urN gcc-3.4.1-dist/gcc/config/i386/linux.h gcc-3.4.1/gcc/config/i386/linux #define LINK_SPEC "-m elf_i386 %{shared:-shared} \ %{!shared: \ %{!ibcs: \ -@@ -126,6 +135,7 @@ +@@ -126,6 +135,7 @@ Boston, MA 02111-1307, USA. */ %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \ %{static:-static}}}" #endif @@ -142,10 +136,9 @@ diff -urN gcc-3.4.1-dist/gcc/config/i386/linux.h gcc-3.4.1/gcc/config/i386/linux /* A C statement (sans semicolon) to output to the stdio stream FILE the assembler definition of uninitialized global DECL named -diff -urN gcc-3.4.1-dist/gcc/config/mips/linux.h gcc-3.4.1/gcc/config/mips/linux.h ---- gcc-3.4.1-dist/gcc/config/mips/linux.h 2004-06-15 20:42:24.000000000 -0500 -+++ gcc-3.4.1/gcc/config/mips/linux.h 2004-08-12 15:54:43.000000000 -0500 -@@ -109,6 +109,17 @@ +--- a/gcc/config/mips/linux.h ++++ b/gcc/config/mips/linux.h +@@ -109,6 +109,17 @@ Boston, MA 02111-1307, USA. */ /* Borrowed from sparc/linux.h */ #undef LINK_SPEC @@ -163,7 +156,7 @@ diff -urN gcc-3.4.1-dist/gcc/config/mips/linux.h gcc-3.4.1/gcc/config/mips/linux #define LINK_SPEC \ "%(endian_spec) \ %{shared:-shared} \ -@@ -118,6 +129,7 @@ +@@ -118,6 +129,7 @@ Boston, MA 02111-1307, USA. */ %{rdynamic:-export-dynamic} \ %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \ %{static:-static}}}" @@ -171,10 +164,9 @@ diff -urN gcc-3.4.1-dist/gcc/config/mips/linux.h gcc-3.4.1/gcc/config/mips/linux #undef SUBTARGET_ASM_SPEC #define SUBTARGET_ASM_SPEC "\ -diff -urN gcc-3.4.1-dist/gcc/config/rs6000/linux.h gcc-3.4.1/gcc/config/rs6000/linux.h ---- gcc-3.4.1-dist/gcc/config/rs6000/linux.h 2004-02-25 09:11:19.000000000 -0600 -+++ gcc-3.4.1/gcc/config/rs6000/linux.h 2004-08-12 15:54:43.000000000 -0500 -@@ -61,7 +61,11 @@ +--- a/gcc/config/rs6000/linux.h ++++ b/gcc/config/rs6000/linux.h +@@ -69,7 +69,11 @@ #define LINK_START_DEFAULT_SPEC "%(link_start_linux)" #undef LINK_OS_DEFAULT_SPEC @@ -186,10 +178,9 @@ diff -urN gcc-3.4.1-dist/gcc/config/rs6000/linux.h gcc-3.4.1/gcc/config/rs6000/l #define LINK_GCC_C_SEQUENCE_SPEC \ "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}" -diff -urN gcc-3.4.1-dist/gcc/config/rs6000/sysv4.h gcc-3.4.1/gcc/config/rs6000/sysv4.h ---- gcc-3.4.1-dist/gcc/config/rs6000/sysv4.h 2004-06-10 01:39:50.000000000 -0500 -+++ gcc-3.4.1/gcc/config/rs6000/sysv4.h 2004-08-12 15:54:43.000000000 -0500 -@@ -947,6 +947,7 @@ +--- a/gcc/config/rs6000/sysv4.h ++++ b/gcc/config/rs6000/sysv4.h +@@ -949,6 +949,7 @@ extern int fixuplabelno; mcall-linux : %(link_os_linux) ; \ mcall-gnu : %(link_os_gnu) ; \ mcall-netbsd : %(link_os_netbsd) ; \ @@ -197,7 +188,7 @@ diff -urN gcc-3.4.1-dist/gcc/config/rs6000/sysv4.h gcc-3.4.1/gcc/config/rs6000/s mcall-openbsd: %(link_os_openbsd) ; \ : %(link_os_default) }" -@@ -1124,6 +1125,10 @@ +@@ -1127,6 +1128,10 @@ extern int fixuplabelno; %{rdynamic:-export-dynamic} \ %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" @@ -208,7 +199,7 @@ diff -urN gcc-3.4.1-dist/gcc/config/rs6000/sysv4.h gcc-3.4.1/gcc/config/rs6000/s #if defined(HAVE_LD_EH_FRAME_HDR) # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " #endif -@@ -1290,6 +1295,7 @@ +@@ -1293,6 +1298,7 @@ ncrtn.o%s" { "link_os_sim", LINK_OS_SIM_SPEC }, \ { "link_os_freebsd", LINK_OS_FREEBSD_SPEC }, \ { "link_os_linux", LINK_OS_LINUX_SPEC }, \ @@ -216,10 +207,9 @@ diff -urN gcc-3.4.1-dist/gcc/config/rs6000/sysv4.h gcc-3.4.1/gcc/config/rs6000/s { "link_os_gnu", LINK_OS_GNU_SPEC }, \ { "link_os_netbsd", LINK_OS_NETBSD_SPEC }, \ { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ -diff -urN gcc-3.4.1-dist/gcc/config/sh/linux.h gcc-3.4.1/gcc/config/sh/linux.h ---- gcc-3.4.1-dist/gcc/config/sh/linux.h 2004-01-11 20:29:13.000000000 -0600 -+++ gcc-3.4.1/gcc/config/sh/linux.h 2004-08-12 15:54:43.000000000 -0500 -@@ -73,12 +73,21 @@ +--- a/gcc/config/sh/linux.h ++++ b/gcc/config/sh/linux.h +@@ -73,12 +73,21 @@ do { \ #undef SUBTARGET_LINK_EMUL_SUFFIX #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" #undef SUBTARGET_LINK_SPEC @@ -241,9 +231,8 @@ diff -urN gcc-3.4.1-dist/gcc/config/sh/linux.h gcc-3.4.1/gcc/config/sh/linux.h #undef LIB_SPEC #define LIB_SPEC \ -diff -urN gcc-3.4.1-dist/gcc/config/sh/t-linux-uclibc gcc-3.4.1/gcc/config/sh/t-linux-uclibc ---- gcc-3.4.1-dist/gcc/config/sh/t-linux-uclibc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.1/gcc/config/sh/t-linux-uclibc 2004-08-12 15:54:43.000000000 -0500 +--- /dev/null ++++ b/gcc/config/sh/t-linux-uclibc @@ -0,0 +1,13 @@ +T_CFLAGS = -DUSE_UCLIBC + @@ -258,9 +247,8 @@ diff -urN gcc-3.4.1-dist/gcc/config/sh/t-linux-uclibc gcc-3.4.1/gcc/config/sh/t- +MULTILIB_EXCEPTIONS= + +EXTRA_MULTILIB_PARTS= crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o -diff -urN gcc-3.4.1-dist/gcc/config/sh/t-sh64-uclibc gcc-3.4.1/gcc/config/sh/t-sh64-uclibc ---- gcc-3.4.1-dist/gcc/config/sh/t-sh64-uclibc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.1/gcc/config/sh/t-sh64-uclibc 2004-08-12 15:54:43.000000000 -0500 +--- /dev/null ++++ b/gcc/config/sh/t-sh64-uclibc @@ -0,0 +1,13 @@ +EXTRA_MULTILIB_PARTS= crt1.o crti.o crtn.o crtbegin.o crtend.o + @@ -275,9 +263,8 @@ diff -urN gcc-3.4.1-dist/gcc/config/sh/t-sh64-uclibc gcc-3.4.1/gcc/config/sh/t-s +MULTILIB_DIRNAMES= $(MULTILIB_ENDIAN) nofpu compact nofpu/compact media64 nofpu/media64 +MULTILIB_MATCHES= +MULTILIB_EXCEPTIONS= -diff -urN gcc-3.4.1-dist/gcc/config/t-linux-uclibc gcc-3.4.1/gcc/config/t-linux-uclibc ---- gcc-3.4.1-dist/gcc/config/t-linux-uclibc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.1/gcc/config/t-linux-uclibc 2004-08-12 15:54:43.000000000 -0500 +--- /dev/null ++++ b/gcc/config/t-linux-uclibc @@ -0,0 +1,15 @@ +T_CFLAGS = -DUSE_UCLIBC + @@ -294,10 +281,9 @@ diff -urN gcc-3.4.1-dist/gcc/config/t-linux-uclibc gcc-3.4.1/gcc/config/t-linux- +LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \ + $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c +LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h -diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc ---- gcc-3.4.1-dist/gcc/config.gcc 2004-04-21 10:12:35.000000000 -0500 -+++ gcc-3.4.1/gcc/config.gcc 2004-08-12 15:59:46.000000000 -0500 -@@ -664,6 +664,12 @@ +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -676,6 +676,12 @@ arm*-*-netbsd*) extra_parts="" use_collect2=yes ;; @@ -310,7 +296,7 @@ diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc arm*-*-linux*) # ARM GNU/Linux with ELF tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h" tmake_file="t-slibgcc-elf-ver t-linux arm/t-linux" -@@ -725,6 +731,10 @@ +@@ -741,6 +747,10 @@ cris-*-elf | cris-*-none) tmake_file="cris/t-cris cris/t-elfmulti" gas=yes ;; @@ -321,7 +307,7 @@ diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc cris-*-linux*) tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h" tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux" -@@ -988,6 +998,11 @@ +@@ -1004,6 +1014,11 @@ i[34567]86-*-linux*libc1) # Intel 80386' thread_file='single' fi ;; @@ -333,7 +319,7 @@ diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc i[34567]86-*-linux*) # Intel 80386's running GNU/Linux # with ELF format using glibc 2 # aka GNU/Linux C library 6 -@@ -1547,6 +1562,16 @@ +@@ -1563,6 +1578,16 @@ mips64*-*-linux*) gnu_ld=yes gas=yes ;; @@ -350,7 +336,7 @@ diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc mips*-*-linux*) # Linux MIPS, either endian. tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h" case ${target} in -@@ -1764,6 +1789,10 @@ +@@ -1776,6 +1801,10 @@ powerpc-*-linux*spe*) tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h" tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm" ;; @@ -359,9 +345,9 @@ diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc + tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux-uclibc rs6000/t-ppccomm" + ;; powerpc-*-linux*) - tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h" + tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h" tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm" -@@ -1916,7 +1945,7 @@ +@@ -1940,7 +1969,7 @@ sh-*-rtems*) tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h" ;; sh-*-linux* | sh[2346lbe]*-*-linux*) @@ -370,7 +356,7 @@ diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc case ${target} in sh*be-*-* | sh*eb-*-*) ;; *) -@@ -1924,9 +1953,17 @@ +@@ -1948,9 +1977,17 @@ sh-*-linux* | sh[2346lbe]*-*-linux*) tmake_file="${tmake_file} sh/t-le" ;; esac @@ -389,10 +375,9 @@ diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc sh64*) tmake_file="${tmake_file} sh/t-sh64" tm_file="${tm_file} sh/sh64.h" -diff -urN gcc-3.4.1-dist/libtool.m4 gcc-3.4.1/libtool.m4 ---- gcc-3.4.1-dist/libtool.m4 2004-05-18 04:08:37.000000000 -0500 -+++ gcc-3.4.1/libtool.m4 2004-08-12 15:54:43.000000000 -0500 -@@ -689,6 +689,11 @@ +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -689,6 +689,11 @@ linux-gnu*) lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -404,10 +389,9 @@ diff -urN gcc-3.4.1-dist/libtool.m4 gcc-3.4.1/libtool.m4 netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] -diff -urN gcc-3.4.1-dist/ltconfig gcc-3.4.1/ltconfig ---- gcc-3.4.1-dist/ltconfig 2004-03-05 15:05:41.000000000 -0600 -+++ gcc-3.4.1/ltconfig 2004-08-12 15:55:48.000000000 -0500 -@@ -602,6 +602,7 @@ +--- a/ltconfig ++++ b/ltconfig +@@ -602,6 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- # Transform linux* to *-*-linux-gnu*, to support old configure scripts. case $host_os in @@ -415,7 +399,7 @@ diff -urN gcc-3.4.1-dist/ltconfig gcc-3.4.1/ltconfig linux-gnu*) ;; linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` esac -@@ -1262,6 +1263,24 @@ +@@ -1262,6 +1263,24 @@ linux-gnu*) dynamic_linker='GNU/Linux ld.so' ;; diff --git a/toolchain/gcc/patches/3.4.6/200-uclibc-locale.patch b/toolchain/gcc/patches/3.4.6/200-uclibc-locale.patch index 26cf90624e..5747d4260b 100644 --- a/toolchain/gcc/patches/3.4.6/200-uclibc-locale.patch +++ b/toolchain/gcc/patches/3.4.6/200-uclibc-locale.patch @@ -1,7 +1,6 @@ -diff -urN gcc-3.4.2-dist/libstdc++-v3/acinclude.m4 gcc-3.4.2/libstdc++-v3/acinclude.m4 ---- gcc-3.4.2-dist/libstdc++-v3/acinclude.m4 2004-07-15 12:42:45.000000000 -0500 -+++ gcc-3.4.2/libstdc++-v3/acinclude.m4 2004-09-10 10:47:40.000000000 -0500 -@@ -996,7 +996,7 @@ +--- a/libstdc++-v3/acinclude.m4 ++++ b/libstdc++-v3/acinclude.m4 +@@ -1015,7 +1015,7 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ AC_MSG_CHECKING([for C locale to use]) GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@], [use MODEL for target locale package], @@ -10,7 +9,7 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/acinclude.m4 gcc-3.4.2/libstdc++-v3/acincl # If they didn't use this option switch, or if they specified --enable # with no specific model, we'll have to look for one. If they -@@ -1012,6 +1012,9 @@ +@@ -1031,6 +1031,9 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ # Default to "generic". if test $enable_clocale_flag = auto; then case x${target_os} in @@ -20,7 +19,7 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/acinclude.m4 gcc-3.4.2/libstdc++-v3/acincl xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu) AC_EGREP_CPP([_GLIBCXX_ok], [ #include -@@ -1138,6 +1141,41 @@ +@@ -1157,6 +1160,41 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -62,10 +61,9 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/acinclude.m4 gcc-3.4.2/libstdc++-v3/acincl esac # This is where the testsuite looks for locale catalogs, using the -diff -urN gcc-3.4.2-dist/libstdc++-v3/aclocal.m4 gcc-3.4.2/libstdc++-v3/aclocal.m4 ---- gcc-3.4.2-dist/libstdc++-v3/aclocal.m4 2004-08-13 15:44:03.000000000 -0500 -+++ gcc-3.4.2/libstdc++-v3/aclocal.m4 2004-09-10 10:47:40.000000000 -0500 -@@ -1025,6 +1025,9 @@ +--- a/libstdc++-v3/aclocal.m4 ++++ b/libstdc++-v3/aclocal.m4 +@@ -1044,6 +1044,9 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ # Default to "generic". if test $enable_clocale_flag = auto; then case x${target_os} in @@ -75,7 +73,7 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/aclocal.m4 gcc-3.4.2/libstdc++-v3/aclocal. xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu) AC_EGREP_CPP([_GLIBCXX_ok], [ #include -@@ -1151,6 +1154,41 @@ +@@ -1170,6 +1173,41 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -117,9 +115,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/aclocal.m4 gcc-3.4.2/libstdc++-v3/aclocal. esac # This is where the testsuite looks for locale catalogs, using the -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/c++locale_internal.h @@ -0,0 +1,59 @@ +// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*- + @@ -180,9 +177,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h +extern "C" __typeof(uselocale) __uselocale; + +#endif // GLIBC 2.3 and later -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c_locale.cc ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c_locale.cc 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/c_locale.cc @@ -0,0 +1,160 @@ +// Wrapper for underlying C-language localization -*- C++ -*- + @@ -344,9 +340,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-3.4.2 +{ + const char* const* const locale::_S_categories = __gnu_cxx::category_names; +} // namespace std -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c_locale.h ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.h 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2004-09-10 10:48:08.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/c_locale.h @@ -0,0 +1,115 @@ +// Wrapper for underlying C-language localization -*- C++ -*- + @@ -463,9 +458,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-3.4.2/ +} + +#endif -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/codecvt_members.cc @@ -0,0 +1,306 @@ +// std::codecvt implementation details, GNU version -*- C++ -*- + @@ -773,9 +767,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gc + } +#endif +} -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/collate_members.cc ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/collate_members.cc 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/collate_members.cc @@ -0,0 +1,80 @@ +// std::collate implementation details, GNU version -*- C++ -*- + @@ -857,9 +850,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc gc + { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); } +#endif +} -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/ctype_members.cc @@ -0,0 +1,300 @@ +// std::ctype implementation details, GNU version -*- C++ -*- + @@ -1161,9 +1153,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc- + } +#endif // _GLIBCXX_USE_WCHAR_T +} -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/messages_members.cc ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/messages_members.cc 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/messages_members.cc @@ -0,0 +1,100 @@ +// std::messages implementation details, GNU version -*- C++ -*- + @@ -1265,9 +1256,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc g + } +#endif +} -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-3.4.2/libstdc++-v3/config/locale/uclibc/messages_members.h ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.h 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/messages_members.h @@ -0,0 +1,118 @@ +// std::messages implementation details, GNU version -*- C++ -*- + @@ -1387,9 +1377,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.h gc + this->_S_create_c_locale(this->_M_c_locale_messages, __s); + } + } -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/monetary_members.cc @@ -0,0 +1,698 @@ +// std::moneypunct implementation details, GNU version -*- C++ -*- + @@ -2089,9 +2078,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc g + } +#endif +} -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/numeric_members.cc @@ -0,0 +1,183 @@ +// std::numpunct implementation details, GNU version -*- C++ -*- + @@ -2276,9 +2264,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc gc + { delete _M_data; } + #endif +} -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/time_members.cc ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.cc 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/time_members.cc 2004-09-10 10:48:00.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/time_members.cc @@ -0,0 +1,356 @@ +// std::time_get, std::time_put implementation, GNU version -*- C++ -*- + @@ -2636,9 +2623,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-3 + } +#endif +} -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.h gcc-3.4.2/libstdc++-v3/config/locale/uclibc/time_members.h ---- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.h 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/time_members.h 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/locale/uclibc/time_members.h @@ -0,0 +1,68 @@ +// std::time_get, std::time_put implementation, GNU version -*- C++ -*- + @@ -2708,9 +2694,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.h gcc-3. + delete _M_data; + _S_destroy_c_locale(_M_c_locale_timepunct); + } -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_base.h ---- gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_base.h 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_base.h 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/os/uclibc/ctype_base.h @@ -0,0 +1,58 @@ +// Locale support -*- C++ -*- + @@ -2770,9 +2755,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-3.4.2/li + static const mask punct = _ISpunct; + static const mask alnum = _ISalpha | _ISdigit; + }; -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_inline.h ---- gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_inline.h 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/os/uclibc/ctype_inline.h @@ -0,0 +1,69 @@ +// Locale support -*- C++ -*- + @@ -2843,9 +2827,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-3.4.2/ + ++__low; + return __low; + } -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_noninline.h ---- gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_noninline.h 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/os/uclibc/ctype_noninline.h @@ -0,0 +1,92 @@ +// Locale support -*- C++ -*- + @@ -2939,9 +2922,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-3.4 + } + return __high; + } -diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/os_defines.h gcc-3.4.2/libstdc++-v3/config/os/uclibc/os_defines.h ---- gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/os_defines.h 1969-12-31 18:00:00.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/config/os/uclibc/os_defines.h 2004-09-10 10:47:40.000000000 -0500 +--- /dev/null ++++ b/libstdc++-v3/config/os/uclibc/os_defines.h @@ -0,0 +1,44 @@ +// Specific definitions for GNU/Linux -*- C++ -*- + @@ -2987,10 +2969,9 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/os_defines.h gcc-3.4.2/li +#define __NO_STRING_INLINES + +#endif -diff -urN gcc-3.4.2-dist/libstdc++-v3/configure gcc-3.4.2/libstdc++-v3/configure ---- gcc-3.4.2-dist/libstdc++-v3/configure 2004-08-13 15:44:04.000000000 -0500 -+++ gcc-3.4.2/libstdc++-v3/configure 2004-09-10 10:47:40.000000000 -0500 -@@ -3878,6 +3878,11 @@ +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -4012,6 +4012,11 @@ linux-gnu*) lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -3002,7 +2983,7 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/configure gcc-3.4.2/libstdc++-v3/configure netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -@@ -5545,6 +5550,9 @@ +@@ -5704,6 +5709,9 @@ fi; # Default to "generic". if test $enable_clocale_flag = auto; then case x${target_os} in @@ -3011,8 +2992,8 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/configure gcc-3.4.2/libstdc++-v3/configure + ;; xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu) cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -5759,6 +5767,77 @@ + /* confdefs.h. */ +@@ -5916,6 +5924,77 @@ echo "${ECHO_T}IEEE 1003.1" >&6 CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -3090,10 +3071,9 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/configure gcc-3.4.2/libstdc++-v3/configure esac # This is where the testsuite looks for locale catalogs, using the -diff -urN gcc-3.4.2-dist/libstdc++-v3/configure.host gcc-3.4.2/libstdc++-v3/configure.host ---- gcc-3.4.2-dist/libstdc++-v3/configure.host 2004-08-27 14:52:30.000000000 -0500 -+++ gcc-3.4.2/libstdc++-v3/configure.host 2004-09-10 10:47:40.000000000 -0500 -@@ -217,6 +217,12 @@ +--- a/libstdc++-v3/configure.host ++++ b/libstdc++-v3/configure.host +@@ -217,6 +217,12 @@ case "${host_os}" in ;; esac @@ -3106,10 +3086,9 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/configure.host gcc-3.4.2/libstdc++-v3/conf # Set any OS-dependent and CPU-dependent bits. # THIS TABLE IS SORTED. KEEP IT THAT WAY. -diff -urN gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 gcc-3.4.2/libstdc++-v3/crossconfig.m4 ---- gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 2004-07-06 20:23:49.000000000 -0500 -+++ gcc-3.4.2/libstdc++-v3/crossconfig.m4 2004-09-10 10:47:40.000000000 -0500 -@@ -138,6 +138,99 @@ +--- a/libstdc++-v3/crossconfig.m4 ++++ b/libstdc++-v3/crossconfig.m4 +@@ -138,6 +138,99 @@ case "${host}" in ;; esac ;; @@ -3209,7 +3188,7 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 gcc-3.4.2/libstdc++-v3/cros *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu) AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \ machine/endian.h machine/param.h sys/machine.h sys/types.h \ -@@ -152,7 +245,7 @@ +@@ -152,7 +245,7 @@ case "${host}" in AC_DEFINE(HAVE_INT64_T) case "$target" in *-uclinux*) @@ -3218,10 +3197,9 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 gcc-3.4.2/libstdc++-v3/cros ;; *) AC_DEFINE(_GLIBCXX_USE_LFS) -diff -urN gcc-3.4.2-dist/libstdc++-v3/include/c_compatibility/wchar.h gcc-3.4.2/libstdc++-v3/include/c_compatibility/wchar.h ---- gcc-3.4.2-dist/libstdc++-v3/include/c_compatibility/wchar.h 2003-12-08 21:51:45.000000000 -0600 -+++ gcc-3.4.2/libstdc++-v3/include/c_compatibility/wchar.h 2004-09-10 10:47:40.000000000 -0500 -@@ -101,7 +101,9 @@ +--- a/libstdc++-v3/include/c_compatibility/wchar.h ++++ b/libstdc++-v3/include/c_compatibility/wchar.h +@@ -101,7 +101,9 @@ using std::wmemcmp; using std::wmemcpy; using std::wmemmove; using std::wmemset; @@ -3231,10 +3209,9 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/include/c_compatibility/wchar.h gcc-3.4.2/ #if _GLIBCXX_USE_C99 using std::wcstold; -diff -urN gcc-3.4.2-dist/libstdc++-v3/include/c_std/std_cwchar.h gcc-3.4.2/libstdc++-v3/include/c_std/std_cwchar.h ---- gcc-3.4.2-dist/libstdc++-v3/include/c_std/std_cwchar.h 2004-07-20 03:52:12.000000000 -0500 -+++ gcc-3.4.2/libstdc++-v3/include/c_std/std_cwchar.h 2004-09-10 10:47:40.000000000 -0500 -@@ -179,7 +179,9 @@ +--- a/libstdc++-v3/include/c_std/std_cwchar.h ++++ b/libstdc++-v3/include/c_std/std_cwchar.h +@@ -179,7 +179,9 @@ namespace std using ::wcscoll; using ::wcscpy; using ::wcscspn; diff --git a/toolchain/gcc/patches/3.4.6/300-libstdc++-pic.patch b/toolchain/gcc/patches/3.4.6/300-libstdc++-pic.patch index c030ba6205..51d29cbba6 100644 --- a/toolchain/gcc/patches/3.4.6/300-libstdc++-pic.patch +++ b/toolchain/gcc/patches/3.4.6/300-libstdc++-pic.patch @@ -1,9 +1,9 @@ # DP: Build and install libstdc++_pic.a library. ---- gcc/libstdc++-v3/src/Makefile.am~ 2003-02-28 09:21:05.000000000 +0100 -+++ gcc/libstdc++-v3/src/Makefile.am 2003-02-28 09:28:50.000000000 +0100 -@@ -224,6 +224,10 @@ - @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ +--- a/libstdc++-v3/src/Makefile.am ++++ b/libstdc++-v3/src/Makefile.am +@@ -210,6 +210,10 @@ CXXLINK = $(LIBTOOL) --tag CXX --mode=li + $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@ +install-exec-local: @@ -11,12 +11,11 @@ + $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) + # Added bits to build debug library. - if GLIBCPP_BUILD_DEBUG + if GLIBCXX_BUILD_DEBUG all-local: build_debug - ---- gcc/libstdc++-v3/src/Makefile.in~ 2004-02-21 09:55:48.000000000 +0100 -+++ gcc/libstdc++-v3/src/Makefile.in 2004-02-21 09:59:34.000000000 +0100 -@@ -585,7 +585,7 @@ +--- a/libstdc++-v3/src/Makefile.in ++++ b/libstdc++-v3/src/Makefile.in +@@ -592,7 +592,7 @@ info-am: install-data-am: install-data-local @@ -25,7 +24,7 @@ install-info: install-info-am -@@ -618,6 +618,7 @@ +@@ -625,6 +625,7 @@ uninstall-am: uninstall-info-am uninstal distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-data-local \ install-exec install-exec-am install-info install-info-am \ @@ -33,7 +32,7 @@ install-man install-strip install-toolexeclibLTLIBRARIES \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ -@@ -707,6 +708,11 @@ +@@ -709,6 +710,11 @@ build_debug: stamp-debug install_debug: (cd ${debugdir} && $(MAKE) \ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) diff --git a/toolchain/gcc/patches/3.4.6/601-gcc34-arm-ldm.patch b/toolchain/gcc/patches/3.4.6/601-gcc34-arm-ldm.patch index 142052fdf0..90c5853c83 100644 --- a/toolchain/gcc/patches/3.4.6/601-gcc34-arm-ldm.patch +++ b/toolchain/gcc/patches/3.4.6/601-gcc34-arm-ldm.patch @@ -1,6 +1,6 @@ ---- gcc-3.4.0/gcc/config/arm/arm.c.arm-ldm 2004-02-27 09:51:05.000000000 -0500 -+++ gcc-3.4.0/gcc/config/arm/arm.c 2004-04-24 18:16:25.000000000 -0400 -@@ -8520,6 +8520,26 @@ +--- a/gcc/config/arm/arm.c ++++ b/gcc/config/arm/arm.c +@@ -8514,6 +8514,26 @@ arm_output_function_prologue (FILE *f, H return_used_this_function = 0; } @@ -27,7 +27,7 @@ const char * arm_output_epilogue (rtx sibling) { -@@ -8753,27 +8773,47 @@ +@@ -8747,27 +8767,47 @@ arm_output_epilogue (rtx sibling) saved_regs_mask |= (1 << PC_REGNUM); } @@ -94,7 +94,7 @@ } if (current_function_pretend_args_size) -@@ -11401,22 +11441,6 @@ +@@ -11395,22 +11435,6 @@ replace_symbols_in_block (tree block, rt } } diff --git a/toolchain/gcc/patches/3.4.6/700-pr15068-fix.patch b/toolchain/gcc/patches/3.4.6/700-pr15068-fix.patch index 2977765c5f..09c867fe47 100644 --- a/toolchain/gcc/patches/3.4.6/700-pr15068-fix.patch +++ b/toolchain/gcc/patches/3.4.6/700-pr15068-fix.patch @@ -16,9 +16,9 @@ make: *** [all] Error 2 [ rediffed against gcc-3.4.1, with elbow grease, ending up with same thing as http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/flow.c.diff?cvsroot=gcc&only_with_tag=csl-arm-branch&r1=1.563.4.2&r2=1.563.4.3 ] ---- gcc-3.4.1/gcc/flow.c.old 2004-02-27 19:39:19.000000000 -0800 -+++ gcc-3.4.1/gcc/flow.c 2004-08-26 07:29:46.000000000 -0700 -@@ -1878,6 +1878,7 @@ +--- a/gcc/flow.c ++++ b/gcc/flow.c +@@ -1884,6 +1884,7 @@ init_propagate_block_info (basic_block b rtx set_src = SET_SRC (pc_set (BB_END (bb))); rtx cond_true = XEXP (set_src, 0); rtx reg = XEXP (cond_true, 0); @@ -26,7 +26,7 @@ http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/flow.c.diff?cvsroot=gcc&only_with_ if (GET_CODE (reg) == SUBREG) reg = SUBREG_REG (reg); -@@ -1886,11 +1887,13 @@ +@@ -1892,11 +1893,13 @@ init_propagate_block_info (basic_block b in the form of a comparison of a register against zero. If the condition is more complex than that, then it is safe not to record any information. */ diff --git a/toolchain/gcc/patches/3.4.6/701-pr16276-fix.patch b/toolchain/gcc/patches/3.4.6/701-pr16276-fix.patch index 69d7373f60..c6d00c7ac4 100644 --- a/toolchain/gcc/patches/3.4.6/701-pr16276-fix.patch +++ b/toolchain/gcc/patches/3.4.6/701-pr16276-fix.patch @@ -8,9 +8,9 @@ http://gcc.gnu.org/PR16276 PUT_JUMP_TABLES_IN_TEXT_SECTION. (final_scan_insn): Likewise. ---- a/gcc/final.c 2003-12-03 09:42:25.000000000 -0800 -+++ b/gcc/final.c 2004-07-08 14:45:07.900366938 -0700 -@@ -100,6 +100,9 @@ Software Foundation, 59 Temple Place - S +--- a/gcc/final.c ++++ b/gcc/final.c +@@ -105,6 +105,9 @@ Software Foundation, 59 Temple Place - S #define JUMP_TABLES_IN_TEXT_SECTION 0 #endif @@ -20,7 +20,7 @@ http://gcc.gnu.org/PR16276 #if defined(READONLY_DATA_SECTION) || defined(READONLY_DATA_SECTION_ASM_OP) #define HAVE_READONLY_DATA_SECTION 1 #else -@@ -1119,7 +1122,8 @@ shorten_branches (first) +@@ -835,7 +838,8 @@ shorten_branches (rtx first ATTRIBUTE_UN next = NEXT_INSN (insn); /* ADDR_VECs only take room if read-only data goes into the text section. */ @@ -30,7 +30,7 @@ http://gcc.gnu.org/PR16276 if (next && GET_CODE (next) == JUMP_INSN) { rtx nextbody = PATTERN (next); -@@ -1282,7 +1286,8 @@ shorten_branches (first) +@@ -998,7 +1002,8 @@ shorten_branches (rtx first ATTRIBUTE_UN { /* This only takes room if read-only data goes into the text section. */ @@ -40,7 +40,7 @@ http://gcc.gnu.org/PR16276 insn_lengths[uid] = (XVECLEN (body, GET_CODE (body) == ADDR_DIFF_VEC) * GET_MODE_SIZE (GET_MODE (body))); -@@ -1483,7 +1488,8 @@ shorten_branches (first) +@@ -1199,7 +1204,8 @@ shorten_branches (rtx first ATTRIBUTE_UN PUT_MODE (body, CASE_VECTOR_SHORTEN_MODE (min_addr - rel_addr, max_addr - rel_addr, body)); @@ -50,7 +50,7 @@ http://gcc.gnu.org/PR16276 { insn_lengths[uid] = (XVECLEN (body, 1) * GET_MODE_SIZE (GET_MODE (body))); -@@ -2254,7 +2260,7 @@ final_scan_insn (insn, file, optimize, p +@@ -1877,7 +1883,7 @@ final_scan_insn (rtx insn, FILE *file, i target, so don't output the label at all. Leave that to the back end macros. */ #else diff --git a/toolchain/gcc/patches/3.4.6/800-arm-bigendian.patch b/toolchain/gcc/patches/3.4.6/800-arm-bigendian.patch index 0bae8f474c..6ba698c636 100644 --- a/toolchain/gcc/patches/3.4.6/800-arm-bigendian.patch +++ b/toolchain/gcc/patches/3.4.6/800-arm-bigendian.patch @@ -3,9 +3,8 @@ Adds support for arm*b-linux* big-endian ARM targets See http://gcc.gnu.org/PR16350 -diff -urN gcc-3.4.1-dist/gcc/config/arm/linux-elf.h gcc-3.4.1/gcc/config/arm/linux-elf.h ---- gcc-3.4.1-dist/gcc/config/arm/linux-elf.h 2004-08-16 16:01:50.000000000 -0500 -+++ gcc-3.4.1/gcc/config/arm/linux-elf.h 2004-08-16 15:43:40.000000000 -0500 +--- a/gcc/config/arm/linux-elf.h ++++ b/gcc/config/arm/linux-elf.h @@ -30,17 +30,34 @@ /* Do not assume anything about header files. */ #define NO_IMPLICIT_EXTERN_C @@ -53,10 +52,9 @@ diff -urN gcc-3.4.1-dist/gcc/config/arm/linux-elf.h gcc-3.4.1/gcc/config/arm/lin SUBTARGET_EXTRA_LINK_SPEC #endif -diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc ---- gcc-3.4.1-dist/gcc/config.gcc 2004-08-16 16:01:50.000000000 -0500 -+++ gcc-3.4.1/gcc/config.gcc 2004-08-16 16:01:25.000000000 -0500 -@@ -672,6 +672,11 @@ +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -684,6 +684,11 @@ arm*-*-linux-uclibc*) # ARM GNU/Linux w ;; arm*-*-linux*) # ARM GNU/Linux with ELF tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h" diff --git a/toolchain/gcc/patches/3.4.6/810-arm-bigendian-uclibc.patch b/toolchain/gcc/patches/3.4.6/810-arm-bigendian-uclibc.patch index a4d87e2317..886324c761 100644 --- a/toolchain/gcc/patches/3.4.6/810-arm-bigendian-uclibc.patch +++ b/toolchain/gcc/patches/3.4.6/810-arm-bigendian-uclibc.patch @@ -1,6 +1,5 @@ -diff -urN gcc-3.4.1-dist/gcc/config/arm/linux-elf.h gcc-3.4.1/gcc/config/arm/linux-elf.h ---- gcc-3.4.1-dist/gcc/config/arm/linux-elf.h 2004-08-16 16:08:18.000000000 -0500 -+++ gcc-3.4.1/gcc/config/arm/linux-elf.h 2004-08-16 16:06:24.000000000 -0500 +--- a/gcc/config/arm/linux-elf.h ++++ b/gcc/config/arm/linux-elf.h @@ -107,7 +107,7 @@ %{rdynamic:-export-dynamic} \ %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0} \ @@ -10,10 +9,9 @@ diff -urN gcc-3.4.1-dist/gcc/config/arm/linux-elf.h gcc-3.4.1/gcc/config/arm/lin SUBTARGET_EXTRA_LINK_SPEC #else #define LINK_SPEC "%{h*} %{version:-v} \ -diff -urN gcc-3.4.1-dist/gcc/config.gcc gcc-3.4.1/gcc/config.gcc ---- gcc-3.4.1-dist/gcc/config.gcc 2004-08-16 16:08:18.000000000 -0500 -+++ gcc-3.4.1/gcc/config.gcc 2004-08-16 16:03:25.000000000 -0500 -@@ -666,6 +666,11 @@ +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -678,6 +678,11 @@ arm*-*-netbsd*) ;; arm*-*-linux-uclibc*) # ARM GNU/Linux with ELF - uClibc tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h" diff --git a/toolchain/gcc/patches/3.4.6/920-no-usr-system-root.patch b/toolchain/gcc/patches/3.4.6/920-no-usr-system-root.patch new file mode 100644 index 0000000000..74326f845e --- /dev/null +++ b/toolchain/gcc/patches/3.4.6/920-no-usr-system-root.patch @@ -0,0 +1,22 @@ +--- a/gcc/configure ++++ b/gcc/configure +@@ -4766,7 +4766,7 @@ if test "${with_sysroot+set}" = set; the + esac + + TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' +- CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)' ++ CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)/include' + + if test "x$exec_prefix" = xNONE; then + if test "x$prefix" = xNONE; then +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -576,7 +576,7 @@ AC_ARG_WITH(sysroot, + esac + + TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' +- CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)' ++ CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)/include' + + if test "x$exec_prefix" = xNONE; then + if test "x$prefix" = xNONE; then