123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825 |
- diff -Nur gcc-4.7.3.orig/config.sub gcc-4.7.3/config.sub
- --- gcc-4.7.3.orig/config.sub 2012-08-06 16:34:27.000000000 +0200
- +++ gcc-4.7.3/config.sub 2013-09-16 15:39:42.000000000 +0200
- @@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- # 2011 Free Software Foundation, Inc.
-
- -timestamp='2011-10-29'
- +timestamp='2011-03-23'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
- @@ -125,6 +125,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- + linux-musl* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- @@ -251,17 +252,13 @@
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- - | be32 | be64 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
- - | epiphany \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- - | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- - | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
- @@ -295,7 +292,7 @@
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
- - | rl78 | rx \
- + | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- @@ -304,7 +301,7 @@
- | spu \
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- + | v850 | v850e \
- | we32k \
- | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- @@ -361,7 +358,6 @@
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- - | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
- @@ -370,10 +366,8 @@
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- - | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- - | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- @@ -407,7 +401,7 @@
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
- - | rl78-* | romp-* | rs6000-* | rx-* \
- + | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- @@ -415,11 +409,10 @@
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
- | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- - | tile*-* \
- + | tile-* | tilegx-* \
- | tron-* \
- | ubicom32-* \
- - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- - | vax-* \
- + | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- @@ -820,10 +813,6 @@
- basic_machine=i370-ibm
- os=-mvs
- ;;
- - nacl)
- - basic_machine=le32-unknown
- - os=-nacl
- - ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- @@ -1132,8 +1121,13 @@
- basic_machine=t90-cray
- os=-unicos
- ;;
- + # This must be matched before tile*.
- + tilegx*)
- + basic_machine=tilegx-unknown
- + os=-linux-gnu
- + ;;
- tile*)
- - basic_machine=$basic_machine-unknown
- + basic_machine=tile-unknown
- os=-linux-gnu
- ;;
- tx39)
- @@ -1346,6 +1340,7 @@
- | -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 -Nur gcc-4.7.3.orig/fixincludes/mkfixinc.sh gcc-4.7.3/fixincludes/mkfixinc.sh
- --- gcc-4.7.3.orig/fixincludes/mkfixinc.sh 2011-09-22 16:00:17.000000000 +0200
- +++ gcc-4.7.3/fixincludes/mkfixinc.sh 2013-09-16 15:39:42.000000000 +0200
- @@ -20,7 +20,8 @@
- powerpc-*-eabi* | \
- powerpc-*-rtems* | \
- powerpcle-*-eabisim* | \
- - powerpcle-*-eabi* )
- + powerpcle-*-eabi* | \
- + *-musl* )
- # IF there is no include fixing,
- # THEN create a no-op fixer and exit
- (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
- diff -Nur gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h gcc-4.7.3/gcc/config/arm/linux-eabi.h
- --- gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h 2011-11-02 16:03:19.000000000 +0100
- +++ gcc-4.7.3/gcc/config/arm/linux-eabi.h 2013-09-16 15:39:42.000000000 +0200
- @@ -64,6 +64,23 @@
- #undef GLIBC_DYNAMIC_LINKER
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
-
- +/* For ARM musl currently supports two dynamic linkers:
- + - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
- + - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI.
- + musl does not support the legacy OABI (i.e. broken) mode.
- + All the dynamic linkers live in /lib.
- + We default to soft-float, but this can be overridden by changing both
- + MUSL_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
- +#undef MUSL_DYNAMIC_LINKER
- +#define MUSL_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-musl-arm.so.1"
- +#define MUSL_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-musl-armhf.so.1"
- +#define MUSL_DYNAMIC_LINKER_DEFAULT MUSL_DYNAMIC_LINKER_SOFT_FLOAT
- +
- +#define MUSL_DYNAMIC_LINKER \
- + "%{mfloat-abi=hard:" MUSL_DYNAMIC_LINKER_HARD_FLOAT "} \
- + %{mfloat-abi=soft*:" MUSL_DYNAMIC_LINKER_SOFT_FLOAT "} \
- + %{!mfloat-abi=*:" MUSL_DYNAMIC_LINKER_DEFAULT "}"
- +
- /* 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 -Nur gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h
- --- gcc-4.7.3.orig/gcc/config/i386/linux64.h 2011-07-07 17:38:34.000000000 +0200
- +++ gcc-4.7.3/gcc/config/i386/linux64.h 2013-09-16 15:39:42.000000000 +0200
- @@ -31,3 +31,7 @@
- #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 MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
- +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
- +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
- diff -Nur gcc-4.7.3.orig/gcc/config/i386/linux.h gcc-4.7.3/gcc/config/i386/linux.h
- --- gcc-4.7.3.orig/gcc/config/i386/linux.h 2011-06-03 20:30:39.000000000 +0200
- +++ gcc-4.7.3/gcc/config/i386/linux.h 2013-09-16 15:39:42.000000000 +0200
- @@ -22,3 +22,4 @@
-
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
- diff -Nur gcc-4.7.3.orig/gcc/config/linux.h gcc-4.7.3/gcc/config/linux.h
- --- gcc-4.7.3.orig/gcc/config/linux.h 2012-08-14 15:59:04.000000000 +0200
- +++ gcc-4.7.3/gcc/config/linux.h 2013-09-16 15:39:42.000000000 +0200
- @@ -33,10 +33,12 @@
- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
- +#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
- +#define OPTION_MUSL (linux_libc == LIBC_MUSL)
- #endif
-
- #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
- @@ -54,18 +56,21 @@
- uClibc or Bionic is the default C library and whether
- -muclibc or -mglibc or -mbionic has been passed to change the default. */
-
- -#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
- - "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
- +#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
- + "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
-
- #if DEFAULT_LIBC == LIBC_GLIBC
- -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
- - CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
- +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
- + CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
- -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
- - CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
- +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
- + CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
- -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
- - CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
- +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
- + CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
- +#elif DEFAULT_LIBC == LIBC_MUSL
- +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
- + CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
- @@ -85,21 +90,21 @@
-
- #define GNU_USER_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
- - BIONIC_DYNAMIC_LINKER)
- + BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
- - BIONIC_DYNAMIC_LINKER32)
- + BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
- - BIONIC_DYNAMIC_LINKER64)
- + BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
- - BIONIC_DYNAMIC_LINKERX32)
- + BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
-
- /* Determine whether the entire c99 runtime
- is present in the runtime library. */
- #undef TARGET_C99_FUNCTIONS
- -#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
- +#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
-
- /* Whether we have sincos that follows the GNU extension. */
- #undef TARGET_HAS_SINCOS
- @@ -108,3 +113,74 @@
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
- +
- +/* musl avoids problematic includes by rearranging the include directories.
- + * Unfortunately, this is mostly duplicated from cppdefault.c */
- +#if DEFAULT_LIBC == LIBC_MUSL
- +#define INCLUDE_DEFAULTS_MUSL_GPP \
- + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
- + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
- + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
- + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
- + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
- + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
- +
- +#ifdef LOCAL_INCLUDE_DIR
- +#define INCLUDE_DEFAULTS_MUSL_LOCAL \
- + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
- + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_LOCAL
- +#endif
- +
- +#ifdef PREFIX_INCLUDE_DIR
- +#define INCLUDE_DEFAULTS_MUSL_PREFIX \
- + { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_PREFIX
- +#endif
- +
- +#ifdef CROSS_INCLUDE_DIR
- +#define INCLUDE_DEFAULTS_MUSL_CROSS \
- + { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_CROSS
- +#endif
- +
- +#ifdef TOOL_INCLUDE_DIR
- +#define INCLUDE_DEFAULTS_MUSL_TOOL \
- + { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_TOOL
- +#endif
- +
- +#ifdef NATIVE_SYSTEM_HEADER_DIR
- +#define INCLUDE_DEFAULTS_MUSL_NATIVE \
- + { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
- + { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
- +#else
- +#define INCLUDE_DEFAULTS_MUSL_NATIVE
- +#endif
- +
- +#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
- +# undef INCLUDE_DEFAULTS_MUSL_LOCAL
- +# define INCLUDE_DEFAULTS_MUSL_LOCAL
- +# undef INCLUDE_DEFAULTS_MUSL_NATIVE
- +# define INCLUDE_DEFAULTS_MUSL_NATIVE
- +#else
- +# undef INCLUDE_DEFAULTS_MUSL_CROSS
- +# define INCLUDE_DEFAULTS_MUSL_CROSS
- +#endif
- +
- +#undef INCLUDE_DEFAULTS
- +#define INCLUDE_DEFAULTS \
- + { \
- + INCLUDE_DEFAULTS_MUSL_GPP \
- + INCLUDE_DEFAULTS_MUSL_PREFIX \
- + INCLUDE_DEFAULTS_MUSL_CROSS \
- + INCLUDE_DEFAULTS_MUSL_TOOL \
- + INCLUDE_DEFAULTS_MUSL_NATIVE \
- + { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
- + { 0, 0, 0, 0, 0, 0 } \
- + }
- +#endif
- diff -Nur gcc-4.7.3.orig/gcc/config/linux.opt gcc-4.7.3/gcc/config/linux.opt
- --- gcc-4.7.3.orig/gcc/config/linux.opt 2010-09-29 16:51:52.000000000 +0200
- +++ gcc-4.7.3/gcc/config/linux.opt 2013-09-16 15:39:42.000000000 +0200
- @@ -30,3 +30,7 @@
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
- +
- +mmusl
- +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
- +Use musl C library
- diff -Nur gcc-4.7.3.orig/gcc/config/mips/linux.h gcc-4.7.3/gcc/config/mips/linux.h
- --- gcc-4.7.3.orig/gcc/config/mips/linux.h 2011-07-19 20:00:27.000000000 +0200
- +++ gcc-4.7.3/gcc/config/mips/linux.h 2013-09-16 15:39:43.000000000 +0200
- @@ -19,3 +19,5 @@
- <http://www.gnu.org/licenses/>. */
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- +
- +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
- diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/linux64.h gcc-4.7.3/gcc/config/rs6000/linux64.h
- --- gcc-4.7.3.orig/gcc/config/rs6000/linux64.h 2012-03-12 17:16:51.000000000 +0100
- +++ gcc-4.7.3/gcc/config/rs6000/linux64.h 2013-09-16 15:39:43.000000000 +0200
- @@ -362,17 +362,21 @@
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
- +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
- +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
- -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
- +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- +#elif DEFAULT_LIBC == LIBC_MUSL
- +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
- - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
- + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
- - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
-
-
- #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
- diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/sysv4.h gcc-4.7.3/gcc/config/rs6000/sysv4.h
- --- gcc-4.7.3.orig/gcc/config/rs6000/sysv4.h 2012-04-30 19:39:01.000000000 +0200
- +++ gcc-4.7.3/gcc/config/rs6000/sysv4.h 2013-09-16 15:39:43.000000000 +0200
- @@ -804,15 +808,18 @@
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
- +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
- +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- +#elif DEFAULT_LIBC == LIBC_MUSL
- +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
- -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
- +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
- - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
-
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- diff -Nur gcc-4.7.3.orig/gcc/config.gcc gcc-4.7.3/gcc/config.gcc
- --- gcc-4.7.3.orig/gcc/config.gcc 2013-03-06 23:54:11.000000000 +0100
- +++ gcc-4.7.3/gcc/config.gcc 2013-09-16 15:39:43.000000000 +0200
- @@ -522,7 +522,7 @@
- esac
-
- # Common C libraries.
- -tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
- +tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
-
- # Common parts for widely ported systems.
- case ${target} in
- @@ -625,6 +625,9 @@
- *-*-*uclibc*)
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
- ;;
- + *-*-*musl*)
- + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
- + ;;
- *)
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
- ;;
- @@ -2092,6 +2095,10 @@
- powerpc*-*-linux*paired*)
- tm_file="${tm_file} rs6000/750cl.h" ;;
- esac
- + case ${target} in
- + *-linux*-musl*)
- + enable_secureplt=yes ;;
- + esac
- if test x${enable_secureplt} = xyes; then
- tm_file="rs6000/secureplt.h ${tm_file}"
- fi
- diff -Nur gcc-4.7.3.orig/gcc/configure gcc-4.7.3/gcc/configure
- --- gcc-4.7.3.orig/gcc/configure 2013-02-06 16:23:55.000000000 +0100
- +++ gcc-4.7.3/gcc/configure 2013-09-16 15:39:43.000000000 +0200
- @@ -26815,7 +26815,8 @@
- gcc_cv_libc_provides_ssp=yes
- fi
- ;;
- - *-*-gnu*)
- + *-*-gnu* | \
- + *-linux-musl*)
- # Avoid complicated tests (see
- # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
- # simply assert that glibc does provide this, which is true for all
- @@ -26902,6 +26903,9 @@
- gcc_cv_target_dl_iterate_phdr=no
- fi
- ;;
- + *-linux-musl*)
- + gcc_cv_target_dl_iterate_phdr=yes
- + ;;
- esac
-
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
- diff -Nur gcc-4.7.3.orig/gcc/configure.ac gcc-4.7.3/gcc/configure.ac
- --- gcc-4.7.3.orig/gcc/configure.ac 2013-02-06 16:23:55.000000000 +0100
- +++ gcc-4.7.3/gcc/configure.ac 2013-09-16 15:39:43.000000000 +0200
- @@ -4692,7 +4692,8 @@
- gcc_cv_libc_provides_ssp=yes
- fi]
- ;;
- - *-*-gnu*)
- + *-*-gnu* | \
- + *-linux-musl*)
- # Avoid complicated tests (see
- # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
- # simply assert that glibc does provide this, which is true for all
- @@ -4762,6 +4763,9 @@
- gcc_cv_target_dl_iterate_phdr=no
- fi
- ;;
- + *-linux-musl*)
- + gcc_cv_target_dl_iterate_phdr=yes
- + ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
- diff -Nur gcc-4.7.3.orig/gcc/ginclude/stddef.h gcc-4.7.3/gcc/ginclude/stddef.h
- --- gcc-4.7.3.orig/gcc/ginclude/stddef.h 2012-02-12 02:06:04.000000000 +0100
- +++ gcc-4.7.3/gcc/ginclude/stddef.h 2013-09-16 15:39:43.000000000 +0200
- @@ -184,6 +184,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
- +#ifndef __DEFINED_size_t /* musl */
- #define __size_t__ /* BeOS */
- #define __SIZE_T__ /* Cray Unicos/Mk */
- #define _SIZE_T
- @@ -200,6 +201,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
- +#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
- || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
- @@ -215,6 +217,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
- +#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
- diff -Nur gcc-4.7.3.orig/libgcc/unwind-dw2-fde-dip.c gcc-4.7.3/libgcc/unwind-dw2-fde-dip.c
- --- gcc-4.7.3.orig/libgcc/unwind-dw2-fde-dip.c 2012-10-06 23:55:06.000000000 +0200
- +++ gcc-4.7.3/libgcc/unwind-dw2-fde-dip.c 2013-09-16 15:39:43.000000000 +0200
- @@ -47,28 +47,13 @@
- #include "unwind-compat.h"
- #include "gthr.h"
-
- -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
- - && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
- - || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
- -# define USE_PT_GNU_EH_FRAME
- -#endif
- -
- -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
- - && defined(__FreeBSD__) && __FreeBSD__ >= 7
- -# define ElfW __ElfN
- -# define USE_PT_GNU_EH_FRAME
- -#endif
- -
- -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
- - && defined(__OpenBSD__)
- -# define ElfW(type) Elf_##type
- -# define USE_PT_GNU_EH_FRAME
- -#endif
- -
- -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
- - && defined(TARGET_DL_ITERATE_PHDR) \
- - && defined(__sun__) && defined(__svr4__)
- +#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
- # define USE_PT_GNU_EH_FRAME
- +# ifdef __OpenBSD__
- +# define ElfW(type) Elf_##typ
- +# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
- +# define ElfW __ElfN
- +# endif
- #endif
-
- #if defined(USE_PT_GNU_EH_FRAME)
- diff -Nur gcc-4.7.3.orig/libgomp/config/posix/time.c gcc-4.7.3/libgomp/config/posix/time.c
- --- gcc-4.7.3.orig/libgomp/config/posix/time.c 2009-04-09 17:00:19.000000000 +0200
- +++ gcc-4.7.3/libgomp/config/posix/time.c 2013-09-16 15:39:43.000000000 +0200
- @@ -28,6 +28,8 @@
- The following implementation uses the most simple POSIX routines.
- If present, POSIX 4 clocks should be used instead. */
-
- +#define _POSIX_C_SOURCE 199309L /* for clocks */
- +
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
- diff -Nur gcc-4.7.3.orig/libitm/config/arm/hwcap.cc gcc-4.7.3/libitm/config/arm/hwcap.cc
- --- gcc-4.7.3.orig/libitm/config/arm/hwcap.cc 2011-12-15 04:24:05.000000000 +0100
- +++ gcc-4.7.3/libitm/config/arm/hwcap.cc 2013-09-16 15:39:43.000000000 +0200
- @@ -40,7 +40,11 @@
-
- #ifdef __linux__
- #include <unistd.h>
- +#ifdef __GLIBC__
- #include <sys/fcntl.h>
- +#else
- +#include <fcntl.h>
- +#endif
- #include <elf.h>
-
- static void __attribute__((constructor))
- diff -Nur gcc-4.7.3.orig/libitm/config/linux/x86/tls.h gcc-4.7.3/libitm/config/linux/x86/tls.h
- --- gcc-4.7.3.orig/libitm/config/linux/x86/tls.h 2011-11-08 12:13:41.000000000 +0100
- +++ gcc-4.7.3/libitm/config/linux/x86/tls.h 2013-09-16 15:39:43.000000000 +0200
- @@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
-
- -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
- +#if defined(__GLIBC_PREREQ)
- +#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
- GLIBC has reserved words 10 through 13 for TM. */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
- +#endif
-
- #include "config/generic/tls.h"
-
- -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
- +#if defined(__GLIBC_PREREQ)
- +#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
-
- #ifdef __x86_64__
- @@ -101,5 +104,6 @@
-
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
- +#endif
-
- #endif // LIBITM_X86_TLS_H
- diff -Nur gcc-4.7.3.orig/libssp/configure gcc-4.7.3/libssp/configure
- --- gcc-4.7.3.orig/libssp/configure 2012-08-06 16:34:27.000000000 +0200
- +++ gcc-4.7.3/libssp/configure 2013-09-16 15:39:43.000000000 +0200
- @@ -626,6 +626,8 @@
- ssp_have_usable_vsnprintf
- EGREP
- GREP
- +LIBSSP_IN_LIBC_FALSE
- +LIBSSP_IN_LIBC_TRUE
- LIBSSP_USE_SYMVER_SUN_FALSE
- LIBSSP_USE_SYMVER_SUN_TRUE
- LIBSSP_USE_SYMVER_GNU_FALSE
- @@ -735,6 +737,7 @@
- enable_multilib
- enable_dependency_tracking
- enable_symvers
- +enable_ssp_in_libc
- enable_shared
- enable_static
- with_pic
- @@ -1374,6 +1377,7 @@
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
- --disable-symvers disable symbol versioning for libssp
- + --enable-ssp-in-libc do not build SSP, as it is in libc
- --enable-shared[=PKGS] build shared libraries [default=yes]
- --enable-static[=PKGS] build static libraries [default=yes]
- --enable-fast-install[=PKGS]
- @@ -4206,6 +4210,36 @@
- fi
-
-
- +# musl provides libssp in libc
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libssp is provided in libc" >&5
- +$as_echo_n "checking whether libssp is provided in libc... " >&6; }
- +# Check whether --enable-ssp_in_libc was given.
- +if test "${enable_ssp_in_libc+set}" = set; then :
- + enableval=$enable_ssp_in_libc; ssp_in_libc=$enableval
- +else
- + ssp_in_libc=check
- +fi
- +
- +if test "x$ssp_in_libc" = "xcheck"; then
- + case "$host" in
- + *-musl*)
- + ssp_in_libc=yes
- + ;;
- +
- + *)
- + ssp_in_libc=no
- + ;;
- + esac
- +fi
- + if test "x$ssp_in_libc" = xyes; then
- + LIBSSP_IN_LIBC_TRUE=
- + LIBSSP_IN_LIBC_FALSE='#'
- +else
- + LIBSSP_IN_LIBC_TRUE='#'
- + LIBSSP_IN_LIBC_FALSE=
- +fi
- +
- +
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
- @@ -10650,7 +10684,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10653 "configure"
- +#line 10687 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10756,7 +10790,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10759 "configure"
- +#line 10793 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -11185,6 +11219,10 @@
- as_fn_error "conditional \"LIBSSP_USE_SYMVER_SUN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- +if test -z "${LIBSSP_IN_LIBC_TRUE}" && test -z "${LIBSSP_IN_LIBC_FALSE}"; then
- + as_fn_error "conditional \"LIBSSP_IN_LIBC\" was never defined.
- +Usually this means the macro was only invoked conditionally." "$LINENO" 5
- +fi
-
- : ${CONFIG_STATUS=./config.status}
- ac_write_fail=0
- diff -Nur gcc-4.7.3.orig/libssp/configure.ac gcc-4.7.3/libssp/configure.ac
- --- gcc-4.7.3.orig/libssp/configure.ac 2012-05-31 20:59:34.000000000 +0200
- +++ gcc-4.7.3/libssp/configure.ac 2013-09-16 15:39:43.000000000 +0200
- @@ -114,6 +114,26 @@
- AM_CONDITIONAL(LIBSSP_USE_SYMVER_GNU, [test "x$ssp_use_symver" = xgnu])
- AM_CONDITIONAL(LIBSSP_USE_SYMVER_SUN, [test "x$ssp_use_symver" = xsun])
-
- +# musl provides libssp in libc
- +AC_MSG_CHECKING([whether libssp is provided in libc])
- +AC_ARG_ENABLE(ssp_in_libc,
- +AC_HELP_STRING([--enable-ssp-in-libc],
- + [do not build SSP, as it is in libc]),
- +ssp_in_libc=$enableval,
- +ssp_in_libc=check)
- +if test "x$ssp_in_libc" = "xcheck"; then
- + case "$host" in
- + *-musl*)
- + ssp_in_libc=yes
- + ;;
- +
- + *)
- + ssp_in_libc=no
- + ;;
- + esac
- +fi
- +AM_CONDITIONAL(LIBSSP_IN_LIBC, [test "x$ssp_in_libc" = xyes])
- +
- AC_CHECK_HEADERS(alloca.h malloc.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h)
-
- if test x$gcc_no_link = xyes; then
- diff -Nur gcc-4.7.3.orig/libssp/Makefile.am gcc-4.7.3/libssp/Makefile.am
- --- gcc-4.7.3.orig/libssp/Makefile.am 2010-12-06 01:50:04.000000000 +0100
- +++ gcc-4.7.3/libssp/Makefile.am 2013-09-16 15:39:43.000000000 +0200
- @@ -36,7 +36,11 @@
-
- AM_CFLAGS = -Wall
-
- +if LIBSSP_IN_LIBC
- +toolexeclib_LTLIBRARIES = libssp_nonshared.la
- +else
- toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
- +endif
-
- target_noncanonical = @target_noncanonical@
- libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
- diff -Nur gcc-4.7.3.orig/libssp/Makefile.in gcc-4.7.3/libssp/Makefile.in
- --- gcc-4.7.3.orig/libssp/Makefile.in 2011-02-13 12:45:53.000000000 +0100
- +++ gcc-4.7.3/libssp/Makefile.in 2013-09-16 15:39:43.000000000 +0200
- @@ -93,12 +93,17 @@
- libssp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libssp_la_LDFLAGS) $(LDFLAGS) -o $@
- +@LIBSSP_IN_LIBC_FALSE@am_libssp_la_rpath = -rpath $(toolexeclibdir)
- am_libssp_nonshared_la_OBJECTS = libssp_nonshared_la-ssp-local.lo
- libssp_nonshared_la_OBJECTS = $(am_libssp_nonshared_la_OBJECTS)
- libssp_nonshared_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(libssp_nonshared_la_CFLAGS) $(CFLAGS) \
- $(libssp_nonshared_la_LDFLAGS) $(LDFLAGS) -o $@
- +@LIBSSP_IN_LIBC_FALSE@am_libssp_nonshared_la_rpath = -rpath \
- +@LIBSSP_IN_LIBC_FALSE@ $(toolexeclibdir)
- +@LIBSSP_IN_LIBC_TRUE@am_libssp_nonshared_la_rpath = -rpath \
- +@LIBSSP_IN_LIBC_TRUE@ $(toolexeclibdir)
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/../depcomp
- am__depfiles_maybe = depfiles
- @@ -258,7 +263,8 @@
- @LIBSSP_USE_SYMVER_GNU_TRUE@@LIBSSP_USE_SYMVER_TRUE@version_dep = $(srcdir)/ssp.map
- @LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@version_dep = ssp.map-sun
- AM_CFLAGS = -Wall
- -toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
- +@LIBSSP_IN_LIBC_FALSE@toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
- +@LIBSSP_IN_LIBC_TRUE@toolexeclib_LTLIBRARIES = libssp_nonshared.la
- libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
- nobase_libsubinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
- libssp_la_SOURCES = \
- @@ -414,9 +420,9 @@
- rm -f "$${dir}/so_locations"; \
- done
- libssp.la: $(libssp_la_OBJECTS) $(libssp_la_DEPENDENCIES)
- - $(libssp_la_LINK) -rpath $(toolexeclibdir) $(libssp_la_OBJECTS) $(libssp_la_LIBADD) $(LIBS)
- + $(libssp_la_LINK) $(am_libssp_la_rpath) $(libssp_la_OBJECTS) $(libssp_la_LIBADD) $(LIBS)
- libssp_nonshared.la: $(libssp_nonshared_la_OBJECTS) $(libssp_nonshared_la_DEPENDENCIES)
- - $(libssp_nonshared_la_LINK) -rpath $(toolexeclibdir) $(libssp_nonshared_la_OBJECTS) $(libssp_nonshared_la_LIBADD) $(LIBS)
- + $(libssp_nonshared_la_LINK) $(am_libssp_nonshared_la_rpath) $(libssp_nonshared_la_OBJECTS) $(libssp_nonshared_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
- diff -Nur gcc-4.7.3.orig/libstdc++-v3/configure.host gcc-4.7.3/libstdc++-v3/configure.host
- --- gcc-4.7.3.orig/libstdc++-v3/configure.host 2012-12-18 15:27:14.000000000 +0100
- +++ gcc-4.7.3/libstdc++-v3/configure.host 2013-09-16 15:39:43.000000000 +0200
- @@ -243,6 +243,13 @@
- os_include_dir="os/bsd/freebsd"
- ;;
- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
- + # check for musl by target
- + case "${host_os}" in
- + *-musl*)
- + os_include_dir="os/generic"
- + ;;
- + *)
- +
- if [ "$uclibc" = "yes" ]; then
- os_include_dir="os/uclibc"
- elif [ "$bionic" = "yes" ]; then
- @@ -251,6 +258,9 @@
- os_include_dir="os/gnu-linux"
- fi
- ;;
- +
- + esac
- + ;;
- hpux*)
- os_include_dir="os/hpux"
- ;;
|