From 8f7b453b71eb66200b3db4ebdf6b948714c2838c Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 26 Feb 2013 16:39:54 +0000 Subject: toolchain/gcc: refresh patches Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35808 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/gcc/patches/4.6-linaro/200-musl.patch | 48 ++++++++----------------- 1 file changed, 14 insertions(+), 34 deletions(-) (limited to 'toolchain/gcc/patches/4.6-linaro/200-musl.patch') diff --git a/toolchain/gcc/patches/4.6-linaro/200-musl.patch b/toolchain/gcc/patches/4.6-linaro/200-musl.patch index 86a225cf9..f861e0b51 100644 --- a/toolchain/gcc/patches/4.6-linaro/200-musl.patch +++ b/toolchain/gcc/patches/4.6-linaro/200-musl.patch @@ -1,4 +1,3 @@ -diff --git a/config.sub b/config.sub --- a/config.sub +++ b/config.sub @@ -125,6 +125,7 @@ esac @@ -9,18 +8,9 @@ diff --git a/config.sub b/config.sub linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ -@@ -1310,6 +1311,7 @@ case $os in - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ -+ | -linux-musl* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -diff --git a/gcc/config.gcc b/gcc/config.gcc --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -478,7 +478,7 @@ case ${target} in +@@ -485,7 +485,7 @@ case ${target} in esac # Common C libraries. @@ -29,7 +19,7 @@ diff --git a/gcc/config.gcc b/gcc/config.gcc # Common parts for widely ported systems. case ${target} in -@@ -591,6 +591,9 @@ case ${target} in +@@ -598,6 +598,9 @@ case ${target} in *-*-*uclibc*) tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" ;; @@ -39,12 +29,11 @@ diff --git a/gcc/config.gcc b/gcc/config.gcc *) tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" ;; -diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h --- a/gcc/config/arm/linux-eabi.h +++ b/gcc/config/arm/linux-eabi.h -@@ -64,6 +64,10 @@ - #undef GLIBC_DYNAMIC_LINKER - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" +@@ -78,6 +78,10 @@ + %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ + %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" +/* musl has no "classic" (i.e. broken) mode */ +#undef MUSL_DYNAMIC_LINKER @@ -53,10 +42,9 @@ diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to use the GNU/Linux version, not the generic BPABI version. */ #undef LINK_SPEC -diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h -@@ -93,6 +93,7 @@ along with GCC; see the file COPYING3. If not see +@@ -93,6 +93,7 @@ along with GCC; see the file COPYING3. /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */ #define LINK_EMULATION "elf_i386" #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" @@ -64,10 +52,9 @@ diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h #undef ASM_SPEC #define ASM_SPEC \ -diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h -@@ -65,6 +65,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -65,6 +65,9 @@ see the files COPYING3 and COPYING.RUNTI #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" @@ -77,10 +64,9 @@ diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h #if TARGET_64BIT_DEFAULT #define SPEC_32 "m32" #define SPEC_64 "!m32" -diff --git a/gcc/config/linux.h b/gcc/config/linux.h --- a/gcc/config/linux.h +++ b/gcc/config/linux.h -@@ -33,10 +33,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -33,10 +33,12 @@ see the files COPYING3 and COPYING.RUNTI #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) @@ -93,7 +79,7 @@ diff --git a/gcc/config/linux.h b/gcc/config/linux.h #endif #define LINUX_TARGET_OS_CPP_BUILTINS() \ -@@ -54,18 +56,21 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -54,18 +56,21 @@ see the files COPYING3 and COPYING.RUNTI uClibc or Bionic is the default C library and whether -muclibc or -mglibc or -mbionic has been passed to change the default. */ @@ -123,7 +109,7 @@ diff --git a/gcc/config/linux.h b/gcc/config/linux.h #else #error "Unsupported DEFAULT_LIBC" #endif /* DEFAULT_LIBC */ -@@ -83,13 +88,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -83,13 +88,13 @@ see the files COPYING3 and COPYING.RUNTI #define LINUX_DYNAMIC_LINKER \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ @@ -140,7 +126,6 @@ diff --git a/gcc/config/linux.h b/gcc/config/linux.h /* Determine whether the entire c99 runtime is present in the runtime library. */ -diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt --- a/gcc/config/linux.opt +++ b/gcc/config/linux.opt @@ -30,3 +30,7 @@ Use GNU C library @@ -151,10 +136,9 @@ diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt +mmusl +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) +Use musl C library -diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h -@@ -63,6 +63,8 @@ along with GCC; see the file COPYING3. If not see +@@ -63,6 +63,8 @@ along with GCC; see the file COPYING3. #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" @@ -163,7 +147,6 @@ diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h /* Borrowed from sparc/linux.h */ #undef LINK_SPEC #define LINK_SPEC \ -diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h --- a/gcc/ginclude/stddef.h +++ b/gcc/ginclude/stddef.h @@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; @@ -190,7 +173,6 @@ diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h #endif /* __size_t */ #endif /* _SIZET_ */ #endif /* _GCC_SIZE_T */ -diff --git a/libgomp/config/posix/time.c b/libgomp/config/posix/time.c --- a/libgomp/config/posix/time.c +++ b/libgomp/config/posix/time.c @@ -28,6 +28,8 @@ @@ -202,7 +184,6 @@ diff --git a/libgomp/config/posix/time.c b/libgomp/config/posix/time.c #include "libgomp.h" #include #if TIME_WITH_SYS_TIME -diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host --- a/libstdc++-v3/configure.host +++ b/libstdc++-v3/configure.host @@ -237,6 +237,13 @@ case "${host_os}" in @@ -229,10 +210,9 @@ diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host hpux*) os_include_dir="os/hpux" ;; -diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h ---- a/gcc/config/mips/linux64.h 2012-11-12 15:28:31.000000000 +0100 -+++ b/gcc/config/mips/linux64.h 2012-11-29 15:11:14.006324944 +0100 -@@ -40,9 +40,12 @@ +--- a/gcc/config/mips/linux64.h ++++ b/gcc/config/mips/linux64.h +@@ -40,9 +40,12 @@ along with GCC; see the file COPYING3. #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" -- cgit v1.2.3