From 8d34b3a7a613635e812ba6bc7bea54bc689b9bb1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 15 May 2013 10:41:59 +0200 Subject: [PATCH] Revert "gcc: update to gcc-4.8.0" This reverts commit 415982d29ae0e8eba4987258ca79be9f760f865b. Conflicts: packages/toolchain/lang/gcc-core/build --- packages/toolchain/lang/gcc-final/build | 2 +- packages/toolchain/lang/gcc/meta | 2 +- .../gcc/patches/gcc-4.7.3-cloog-0.17.patch | 24 ++++ ...4.7.3-disable_multilib_i386_linux64.patch} | 8 +- .../patches/gcc-4.7.3-dynamic_linker.patch | 131 ++++++++++++++++++ ...ch => gcc-4.7.3-libstdc++-v3_config.patch} | 33 ++--- .../lang/gcc/patches/gcc-cloog-0.18.patch | 23 --- .../lang/gcc/patches/gcc-dynamic_linker.patch | 60 -------- 8 files changed, 176 insertions(+), 107 deletions(-) create mode 100644 packages/toolchain/lang/gcc/patches/gcc-4.7.3-cloog-0.17.patch rename packages/toolchain/lang/gcc/patches/{gcc-disable_multilib_i386_linux64.patch => gcc-4.7.3-disable_multilib_i386_linux64.patch} (77%) create mode 100644 packages/toolchain/lang/gcc/patches/gcc-4.7.3-dynamic_linker.patch rename packages/toolchain/lang/gcc/patches/{gcc-libstdc++-v3_config.patch => gcc-4.7.3-libstdc++-v3_config.patch} (78%) delete mode 100644 packages/toolchain/lang/gcc/patches/gcc-cloog-0.18.patch delete mode 100644 packages/toolchain/lang/gcc/patches/gcc-dynamic_linker.patch diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build index 5b505f1ba3..86e09441c5 100755 --- a/packages/toolchain/lang/gcc-final/build +++ b/packages/toolchain/lang/gcc-final/build @@ -46,9 +46,9 @@ mkdir -p objdir-$1 && cd objdir-$1 --disable-libada \ --enable-decimal-float \ --disable-libmudflap \ - --disable-libatomic \ --disable-libssp \ --disable-multilib \ + --disable-libatomic \ --enable-gold \ --enable-ld=default \ --enable-plugin \ diff --git a/packages/toolchain/lang/gcc/meta b/packages/toolchain/lang/gcc/meta index a7435277e6..64c2f0169f 100644 --- a/packages/toolchain/lang/gcc/meta +++ b/packages/toolchain/lang/gcc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="gcc" -PKG_VERSION="4.8.0" +PKG_VERSION="4.7.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/toolchain/lang/gcc/patches/gcc-4.7.3-cloog-0.17.patch b/packages/toolchain/lang/gcc/patches/gcc-4.7.3-cloog-0.17.patch new file mode 100644 index 0000000000..49d43f1a0e --- /dev/null +++ b/packages/toolchain/lang/gcc/patches/gcc-4.7.3-cloog-0.17.patch @@ -0,0 +1,24 @@ +diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure +--- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 ++++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 +@@ -6049,8 +6049,8 @@ + LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" + + if test "${cloog_org}" = yes ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 +-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18 of CLooG" >&5 ++$as_echo_n "checking for version 0.18 of CLooG... " >&6; } + if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +@@ -6061,8 +6061,7 @@ + main () + { + #if CLOOG_VERSION_MAJOR != 0 \ +- || CLOOG_VERSION_MINOR != 16 \ +- || CLOOG_VERSION_REVISION < 1 ++ || CLOOG_VERSION_MINOR != 18 + choke me + #endif + ; diff --git a/packages/toolchain/lang/gcc/patches/gcc-disable_multilib_i386_linux64.patch b/packages/toolchain/lang/gcc/patches/gcc-4.7.3-disable_multilib_i386_linux64.patch similarity index 77% rename from packages/toolchain/lang/gcc/patches/gcc-disable_multilib_i386_linux64.patch rename to packages/toolchain/lang/gcc/patches/gcc-4.7.3-disable_multilib_i386_linux64.patch index acad630fec..45b1a131b1 100644 --- a/packages/toolchain/lang/gcc/patches/gcc-disable_multilib_i386_linux64.patch +++ b/packages/toolchain/lang/gcc/patches/gcc-4.7.3-disable_multilib_i386_linux64.patch @@ -1,7 +1,7 @@ -diff -Naur gcc-4.8.0/gcc/config/i386/t-linux64 gcc-4.8.0.patch/gcc/config/i386/t-linux64 ---- gcc-4.8.0/gcc/config/i386/t-linux64 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.0.patch/gcc/config/i386/t-linux64 2013-03-23 00:31:07.427290350 +0100 -@@ -33,6 +33,6 @@ +diff -Naur gcc-4.7.3/gcc/config/i386/t-linux64 gcc-4.7.3.patch/gcc/config/i386/t-linux64 +--- gcc-4.7.3/gcc/config/i386/t-linux64 2013-01-14 17:32:37.000000000 +0100 ++++ gcc-4.7.3.patch/gcc/config/i386/t-linux64 2013-04-13 01:57:45.286907048 +0200 +@@ -34,6 +34,6 @@ comma=, MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) diff --git a/packages/toolchain/lang/gcc/patches/gcc-4.7.3-dynamic_linker.patch b/packages/toolchain/lang/gcc/patches/gcc-4.7.3-dynamic_linker.patch new file mode 100644 index 0000000000..2166ed9b2b --- /dev/null +++ b/packages/toolchain/lang/gcc/patches/gcc-4.7.3-dynamic_linker.patch @@ -0,0 +1,131 @@ +diff -Naur gcc-4.7.0-old/gcc/config/i386/linux64.h gcc-4.7.0-new/gcc/config/i386/linux64.h +--- gcc-4.7.0-old/gcc/config/i386/linux64.h 2011-07-07 08:38:34.000000000 -0700 ++++ gcc-4.7.0-new/gcc/config/i386/linux64.h 2012-04-23 21:03:08.000000000 -0700 +@@ -29,5 +29,5 @@ + #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" +-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-linux-x32.so.2" +diff -Naur gcc-4.7.0-old/gcc/config/mips/iris6.h gcc-4.7.0-new/gcc/config/mips/iris6.h +--- gcc-4.7.0-old/gcc/config/mips/iris6.h 2012-03-05 02:43:22.000000000 -0800 ++++ gcc-4.7.0-new/gcc/config/mips/iris6.h 2012-04-23 21:02:07.000000000 -0700 +@@ -256,27 +256,27 @@ + #define STARTFILE_SPEC \ + "%{!shared: \ + %{mabi=n32: \ +- %{mips4:%{pg:/usr/lib32/mips4/gcrt1.o%s} \ +- %{!pg:%{p:/usr/lib32/mips4/mcrt1.o%s /usr/lib32/mips4/libprof1.a%s} \ +- %{!p:/usr/lib32/mips4/crt1.o%s}}} \ +- %{!mips4:%{pg:/usr/lib32/mips3/gcrt1.o%s} \ +- %{!pg:%{p:/usr/lib32/mips3/mcrt1.o%s /usr/lib32/mips3/libprof1.a%s} \ +- %{!p:/usr/lib32/mips3/crt1.o%s}}}} \ ++ %{mips4:%{pg:/usr/lib/mips4/gcrt1.o%s} \ ++ %{!pg:%{p:/usr/lib/mips4/mcrt1.o%s /usr/lib/mips4/libprof1.a%s} \ ++ %{!p:/usr/lib/mips4/crt1.o%s}}} \ ++ %{!mips4:%{pg:/usr/lib/mips3/gcrt1.o%s} \ ++ %{!pg:%{p:/usr/lib/mips3/mcrt1.o%s /usr/lib/mips3/libprof1.a%s} \ ++ %{!p:/usr/lib/mips3/crt1.o%s}}}} \ + %{mabi=64: \ +- %{mips4:%{pg:/usr/lib64/mips4/gcrt1.o} \ +- %{!pg:%{p:/usr/lib64/mips4/mcrt1.o /usr/lib64/mips4/libprof1.a} \ +- %{!p:/usr/lib64/mips4/crt1.o}}} \ +- %{!mips4:%{pg:/usr/lib64/mips3/gcrt1.o} \ +- %{!pg:%{p:/usr/lib64/mips3/mcrt1.o /usr/lib64/mips3/libprof1.a} \ +- %{!p:/usr/lib64/mips3/crt1.o}}}}} \ ++ %{mips4:%{pg:/usr/lib/mips4/gcrt1.o} \ ++ %{!pg:%{p:/usr/lib/mips4/mcrt1.o /usr/lib/mips4/libprof1.a} \ ++ %{!p:/usr/lib/mips4/crt1.o}}} \ ++ %{!mips4:%{pg:/usr/lib/mips3/gcrt1.o} \ ++ %{!pg:%{p:/usr/lib/mips3/mcrt1.o /usr/lib/mips3/libprof1.a} \ ++ %{!p:/usr/lib/mips3/crt1.o}}}}} \ + irix-crti.o%s crtbegin.o%s" + + #undef LIB_SPEC + #define LIB_SPEC \ +- "%{mabi=n32: %{mips4:-L/usr/lib32/mips4} %{!mips4:-L/usr/lib32/mips3} \ +- -L/usr/lib32} \ +- %{mabi=64: %{mips4:-L/usr/lib64/mips4} %{!mips4:-L/usr/lib64/mips3} \ +- -L/usr/lib64} \ ++ "%{mabi=n32: %{mips4:-L/usr/lib/mips4} %{!mips4:-L/usr/lib/mips3} \ ++ -L/usr/lib} \ ++ %{mabi=64: %{mips4:-L/usr/lib/mips4} %{!mips4:-L/usr/lib/mips3} \ ++ -L/usr/lib} \ + %{!shared:" \ + SUBTARGET_DONT_WARN_UNUSED_SPEC \ + " %{pthread:-lpthread} %{p:libprof1.a%s}%{pg:libprof1.a%s} -lc " \ +@@ -293,10 +293,10 @@ + "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \ + crtend.o%s irix-crtn.o%s \ + %{!shared: \ +- %{mabi=n32:%{mips4:/usr/lib32/mips4/crtn.o%s}\ +- %{!mips4:/usr/lib32/mips3/crtn.o%s}}\ +- %{mabi=64:%{mips4:/usr/lib64/mips4/crtn.o%s}\ +- %{!mips4:/usr/lib64/mips3/crtn.o%s}}}" ++ %{mabi=n32:%{mips4:/usr/lib/mips4/crtn.o%s}\ ++ %{!mips4:/usr/lib/mips3/crtn.o%s}}\ ++ %{mabi=64:%{mips4:/usr/lib/mips4/crtn.o%s}\ ++ %{!mips4:/usr/lib/mips3/crtn.o%s}}}" + + /* Generic part of the LINK_SPEC. */ + #undef LINK_SPEC +diff -Naur gcc-4.7.0-old/gcc/config/mips/linux64.h gcc-4.7.0-new/gcc/config/mips/linux64.h +--- gcc-4.7.0-old/gcc/config/mips/linux64.h 2011-07-19 11:00:27.000000000 -0700 ++++ gcc-4.7.0-new/gcc/config/mips/linux64.h 2012-04-23 21:02:07.000000000 -0700 +@@ -24,9 +24,9 @@ + #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define GNU_USER_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +diff -Naur gcc-4.7.0-old/gcc/config/rs6000/linux64.h gcc-4.7.0-new/gcc/config/rs6000/linux64.h +--- gcc-4.7.0-old/gcc/config/rs6000/linux64.h 2012-03-12 09:16:51.000000000 -0700 ++++ gcc-4.7.0-new/gcc/config/rs6000/linux64.h 2012-04-23 21:02:07.000000000 -0700 +@@ -359,7 +359,7 @@ + #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC +diff -Naur gcc-4.7.0-old/gcc/config/sparc/linux64.h gcc-4.7.0-new/gcc/config/sparc/linux64.h +--- gcc-4.7.0-old/gcc/config/sparc/linux64.h 2011-11-11 17:05:07.000000000 -0800 ++++ gcc-4.7.0-new/gcc/config/sparc/linux64.h 2012-04-23 21:02:07.000000000 -0700 +@@ -94,7 +94,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" + + #ifdef SPARC_BI_ARCH + +@@ -113,7 +113,7 @@ + %{static:-static}} \ + " + +-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -202,7 +202,7 @@ + #else /* !SPARC_BI_ARCH */ + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ diff --git a/packages/toolchain/lang/gcc/patches/gcc-libstdc++-v3_config.patch b/packages/toolchain/lang/gcc/patches/gcc-4.7.3-libstdc++-v3_config.patch similarity index 78% rename from packages/toolchain/lang/gcc/patches/gcc-libstdc++-v3_config.patch rename to packages/toolchain/lang/gcc/patches/gcc-4.7.3-libstdc++-v3_config.patch index 3d68a4eae4..12a99c3e30 100644 --- a/packages/toolchain/lang/gcc/patches/gcc-libstdc++-v3_config.patch +++ b/packages/toolchain/lang/gcc/patches/gcc-4.7.3-libstdc++-v3_config.patch @@ -1,7 +1,7 @@ -diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/config.h.in ---- gcc-4.8.0/libstdc++-v3/config.h.in 2013-03-15 09:55:07.000000000 +0100 -+++ gcc-4.8.0.patch/libstdc++-v3/config.h.in 2013-03-23 00:45:05.553508113 +0100 -@@ -133,7 +133,7 @@ +diff -Naur gcc-4.7.0-old/libstdc++-v3/config.h.in gcc-4.7.0-new/libstdc++-v3/config.h.in +--- gcc-4.7.0-old/libstdc++-v3/config.h.in 2012-03-22 08:25:54.000000000 -0700 ++++ gcc-4.7.0-new/libstdc++-v3/config.h.in 2012-03-22 08:28:32.000000000 -0700 +@@ -130,7 +130,7 @@ #undef HAVE_FABSL /* Define to 1 if you have the header file. */ @@ -10,7 +10,7 @@ diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/confi /* Define to 1 if you have the `finite' function. */ #undef HAVE_FINITE -@@ -187,7 +187,7 @@ +@@ -184,7 +184,7 @@ #undef HAVE_HYPOTL /* Define if you have the iconv() function. */ @@ -19,7 +19,7 @@ diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/confi /* Define to 1 if you have the header file. */ #undef HAVE_IEEEFP_H -@@ -226,7 +226,7 @@ +@@ -223,7 +223,7 @@ #undef HAVE_ISWBLANK /* Define if LC_MESSAGES is available in . */ @@ -28,8 +28,8 @@ diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/confi /* Define to 1 if you have the `ldexpf' function. */ #undef HAVE_LDEXPF -@@ -310,7 +310,7 @@ - #undef HAVE_QUICK_EXIT +@@ -304,7 +304,7 @@ + #undef HAVE_QFPCLASS /* Define to 1 if you have the `setenv' function. */ -#undef HAVE_SETENV @@ -37,7 +37,7 @@ diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/confi /* Define to 1 if you have the `sincos' function. */ #undef HAVE_SINCOS -@@ -355,7 +355,7 @@ +@@ -346,7 +346,7 @@ #undef HAVE_STDLIB_H /* Define if strerror_l is available in . */ @@ -46,7 +46,7 @@ diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/confi /* Define if strerror_r is available in . */ #undef HAVE_STRERROR_R -@@ -386,7 +386,7 @@ +@@ -377,7 +377,7 @@ #undef HAVE_SYS_IOCTL_H /* Define to 1 if you have the header file. */ @@ -55,23 +55,20 @@ diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/confi /* Define to 1 if you have the header file. */ #undef HAVE_SYS_ISA_DEFS_H -@@ -398,13 +398,13 @@ +@@ -389,10 +389,10 @@ #undef HAVE_SYS_PARAM_H /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_RESOURCE_H +#define HAVE_SYS_RESOURCE_H 1 - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_SDT_H - /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SEM_H +#define HAVE_SYS_SEM_H 1 /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -@@ -413,7 +413,7 @@ +@@ -401,7 +401,7 @@ #undef HAVE_SYS_SYSINFO_H /* Define to 1 if you have the header file. */ @@ -80,7 +77,7 @@ diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/confi /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -@@ -443,7 +443,7 @@ +@@ -431,7 +431,7 @@ #undef HAVE_TGMATH_H /* Define to 1 if the target supports thread-local storage. */ @@ -89,8 +86,8 @@ diff -Naur gcc-4.8.0/libstdc++-v3/config.h.in gcc-4.8.0.patch/libstdc++-v3/confi /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -@@ -665,7 +665,7 @@ - #undef HAVE___CXA_THREAD_ATEXIT_IMPL +@@ -644,7 +644,7 @@ + #undef HAVE__TANL /* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST diff --git a/packages/toolchain/lang/gcc/patches/gcc-cloog-0.18.patch b/packages/toolchain/lang/gcc/patches/gcc-cloog-0.18.patch deleted file mode 100644 index 1d6b60a4dc..0000000000 --- a/packages/toolchain/lang/gcc/patches/gcc-cloog-0.18.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur gcc-4.8.0/configure gcc-4.8.0.patch/configure ---- gcc-4.8.0/configure 2013-02-15 18:45:54.000000000 +0100 -+++ gcc-4.8.0.patch/configure 2013-03-23 00:16:47.286139411 +0100 -@@ -6036,8 +6036,8 @@ - CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}" - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17.0 of CLooG" >&5 --$as_echo_n "checking for version 0.17.0 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18.0 of CLooG" >&5 -+$as_echo_n "checking for version 0.18.0 of CLooG... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include "cloog/version.h" -@@ -6045,7 +6045,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 17 \ -+ || CLOOG_VERSION_MINOR != 18 \ - || CLOOG_VERSION_REVISION < 0 - choke me - #endif diff --git a/packages/toolchain/lang/gcc/patches/gcc-dynamic_linker.patch b/packages/toolchain/lang/gcc/patches/gcc-dynamic_linker.patch deleted file mode 100644 index 3f7fad4df3..0000000000 --- a/packages/toolchain/lang/gcc/patches/gcc-dynamic_linker.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Naur gcc-4.8.0/gcc/config/i386/linux64.h gcc-4.8.0.patch/gcc/config/i386/linux64.h ---- gcc-4.8.0/gcc/config/i386/linux64.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.0.patch/gcc/config/i386/linux64.h 2013-03-23 00:58:11.397895910 +0100 -@@ -28,5 +28,5 @@ - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" --#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-linux-x32.so.2" -diff -Naur gcc-4.8.0/gcc/config/mips/linux64.h gcc-4.8.0.patch/gcc/config/mips/linux64.h ---- gcc-4.8.0/gcc/config/mips/linux64.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.0.patch/gcc/config/mips/linux64.h 2013-03-23 00:58:11.416895846 +0100 -@@ -23,9 +23,9 @@ - #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" --#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" --#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" -+#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" -+#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0" - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -diff -Naur gcc-4.8.0/gcc/config/rs6000/linux64.h gcc-4.8.0.patch/gcc/config/rs6000/linux64.h ---- gcc-4.8.0/gcc/config/rs6000/linux64.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.0.patch/gcc/config/rs6000/linux64.h 2013-03-23 00:58:11.432895793 +0100 -@@ -361,7 +361,7 @@ - #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" - #if DEFAULT_LIBC == LIBC_UCLIBC -diff -Naur gcc-4.8.0/gcc/config/sparc/linux64.h gcc-4.8.0.patch/gcc/config/sparc/linux64.h ---- gcc-4.8.0/gcc/config/sparc/linux64.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.0.patch/gcc/config/sparc/linux64.h 2013-03-23 00:58:11.442895760 +0100 -@@ -93,7 +93,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" - - #ifdef SPARC_BI_ARCH - -@@ -201,7 +201,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \