Browse Source
gcc: update to version 7.4.0, Add config options
for coping libc.a, libpthread.a and libstdc++ to target. Add config option to eliminate need for -lstdc++ and -lgcc_pic switches when linking statically Signed-off-by: Noble Pepper <noblepepper@gmail.com>lilik-openwrt-22.03
Noble Pepper
5 years ago
committed by
Rosen Penev
Rosen Penev
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
46 changed files with 644 additions and 1373 deletions
Split View
Diff Options
-
+34 -0devel/gcc/Config.in
-
+70 -27devel/gcc/Makefile
-
+3 -3devel/gcc/README
-
+13 -1devel/gcc/patches/001-revert_register_mode_search.patch
-
+10 -0devel/gcc/patches/002-case_insensitive.patch
-
+0 -38devel/gcc/patches/003-mpfr-longlong-mips.patch
-
+13 -1devel/gcc/patches/010-documentation.patch
-
+0 -28devel/gcc/patches/020-no-plt-backport.patch
-
+0 -23devel/gcc/patches/040-fix-mips-ICE-PR-68400.patch
-
+0 -33devel/gcc/patches/100-uclibc-conf.patch
-
+20 -0devel/gcc/patches/110-Fix-MIPS-PR-84790.patch
-
+0 -309devel/gcc/patches/200-musl_config.patch
-
+0 -43devel/gcc/patches/201-musl_arm.patch
-
+0 -35devel/gcc/patches/202-musl_mips.patch
-
+0 -209devel/gcc/patches/203-musl_powerpc.patch
-
+0 -39devel/gcc/patches/204-musl_sh.patch
-
+0 -41devel/gcc/patches/205-musl_x86.patch
-
+0 -31devel/gcc/patches/206-musl_aarch64.patch
-
+0 -30devel/gcc/patches/207-musl_fixincludes.patch
-
+0 -72devel/gcc/patches/209-musl_libstdc++.patch
-
+16 -1devel/gcc/patches/230-musl_libssp.patch
-
+0 -61devel/gcc/patches/240-musl-libitm-fixes.patch
-
+0 -120devel/gcc/patches/250-add-musl.patch
-
+0 -24devel/gcc/patches/270-musl-add-powerpc-softfloat-fix.patch
-
+10 -3devel/gcc/patches/300-mips_Os_cpu_rtx_cost_model.patch
-
+22 -1devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
-
+9 -1devel/gcc/patches/810-arm-softfloat-libgcc.patch
-
+12 -4devel/gcc/patches/820-libgcc_pic.patch
-
+0 -13devel/gcc/patches/830-arm_unbreak_armv4t.patch
-
+10 -1devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
-
+10 -3devel/gcc/patches/850-use_shared_libgcc.patch
-
+10 -0devel/gcc/patches/851-libgcc_no_compat.patch
-
+8 -1devel/gcc/patches/870-ppc_no_crtsavres.patch
-
+0 -11devel/gcc/patches/880-no_java_section.patch
-
+22 -0devel/gcc/patches/881-no_tm_section.patch
-
+21 -0devel/gcc/patches/900-bad-mips16-crt.patch
-
+19 -95devel/gcc/patches/910-mbsd_multi.patch
-
+11 -4devel/gcc/patches/920-specs_nonfatal_getenv.patch
-
+3 -3devel/gcc/patches/930-fix-mips-noexecstack.patch
-
+0 -13devel/gcc/patches/930-osdefines.patch
-
+175 -0devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch
-
+23 -1devel/gcc/patches/940-no-clobber-stamp-bits.patch
-
+27 -28devel/gcc/patches/950-cpp_file_path_translation.patch
-
+0 -11devel/gcc/patches/960-go_libm.patch
-
+73 -0devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch
-
+0 -11devel/gcc/patches/970-warn_bug.patch
+ 34
- 0
devel/gcc/Config.in
View File
| @ -0,0 +1,34 @@ | |||
| # gcc library configuration | |||
| menu "Libraries" | |||
| depends on PACKAGE_gcc | |||
| config INCLUDE_STATIC_LIBC | |||
| bool "Include static libc on target" | |||
| help | |||
| Copies libc.a to target device | |||
| Increases the size of an already | |||
| very large package | |||
| default n | |||
| config INCLUDE_STATIC_LIBPTHREAD | |||
| bool "Include static libptread on target" | |||
| help | |||
| Copies libpthread.a to target device | |||
| Increases the size of an already | |||
| very large package | |||
| default n | |||
| config INCLUDE_STATIC_LIBSTDC | |||
| bool "Include static libstdc++ on target" | |||
| help | |||
| Copies libstdc++.a to target device | |||
| Increases the size of an already | |||
| very large package | |||
| default n | |||
| config INCLUDE_STATIC_LINK_SPEC | |||
| depends on INCLUDE_STATIC_LIBSTDC | |||
| bool "Generate spec file for easy static c++ linking on target" | |||
| help | |||
| Creates a spec file for gcc to eliminate the need for | |||
| -lstdc++, libgcc_pic and -static-libstdc flags when | |||
| statically linking c++ programs | |||
| default n | |||
| endmenu | |||
+ 70
- 27
devel/gcc/Makefile
View File
+ 3
- 3
devel/gcc/README
View File
+ 13
- 1
devel/gcc/patches/001-revert_register_mode_search.patch
View File
+ 10
- 0
devel/gcc/patches/002-case_insensitive.patch
View File
+ 0
- 38
devel/gcc/patches/003-mpfr-longlong-mips.patch
View File
| @ -1,38 +0,0 @@ | |||
| diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h | |||
| --- -a/mpfr-2.4.2/mpfr-longlong.h 2009-11-30 02:43:08.000000000 +0000 | |||
| +++ -b/mpfr-2.4.2/mpfr-longlong.h 2009-12-18 12:04:29.000000000 +0000 | |||
| @@ -1011,7 +1011,15 @@ | |||
| #endif /* __m88000__ */ | |||
| #if defined (__mips) && W_TYPE_SIZE == 32 | |||
| -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | |||
| +#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) | |||
| +#define umul_ppmm(w1, w0, u, v) \ | |||
| + do { \ | |||
| + UDItype _r; \ | |||
| + _r = (UDItype) u * v; \ | |||
| + (w1) = _r >> 32; \ | |||
| + (w0) = (USItype) _r; \ | |||
| + } while (0) | |||
| +#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | |||
| #define umul_ppmm(w1, w0, u, v) \ | |||
| __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) | |||
| #else | |||
| @@ -1024,7 +1032,16 @@ | |||
| #endif /* __mips */ | |||
| #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 | |||
| -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | |||
| +#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) | |||
| +typedef unsigned int UTItype __attribute__ ((mode (TI))); | |||
| +#define umul_ppmm(w1, w0, u, v) \ | |||
| + do { \ | |||
| + UTItype _r; \ | |||
| + _r = (UTItype) u * v; \ | |||
| + (w1) = _r >> 64; \ | |||
| + (w0) = (UDItype) _r; \ | |||
| + } while (0) | |||
| +#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | |||
| #define umul_ppmm(w1, w0, u, v) \ | |||
| __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) | |||
| #else | |||
+ 13
- 1
devel/gcc/patches/010-documentation.patch
View File
+ 0
- 28
devel/gcc/patches/020-no-plt-backport.patch
View File
| @ -1,28 +0,0 @@ | |||
| --- a/gcc/calls.c | |||
| +++ b/gcc/calls.c | |||
| @@ -225,6 +225,12 @@ prepare_call_address (tree fndecl_or_typ | |||
| && targetm.small_register_classes_for_mode_p (FUNCTION_MODE)) | |||
| ? force_not_mem (memory_address (FUNCTION_MODE, funexp)) | |||
| : memory_address (FUNCTION_MODE, funexp)); | |||
| + else if (flag_pic && !flag_plt && fndecl_or_type | |||
| + && TREE_CODE (fndecl_or_type) == FUNCTION_DECL | |||
| + && !targetm.binds_local_p (fndecl_or_type)) | |||
| + { | |||
| + funexp = force_reg (Pmode, funexp); | |||
| + } | |||
| else if (! sibcallp) | |||
| { | |||
| #ifndef NO_FUNCTION_CSE | |||
| --- a/gcc/common.opt | |||
| +++ b/gcc/common.opt | |||
| @@ -1779,6 +1779,10 @@ fpie | |||
| Common Report Var(flag_pie,1) Negative(fPIC) | |||
| Generate position-independent code for executables if possible (small mode) | |||
| +fplt | |||
| +Common Report Var(flag_plt) Init(1) | |||
| +Use PLT for PIC calls (-fno-plt: load the address from GOT at call site) | |||
| + | |||
| fplugin= | |||
| Common Joined RejectNegative Var(common_deferred_options) Defer | |||
| Specify a plugin to load | |||
+ 0
- 23
devel/gcc/patches/040-fix-mips-ICE-PR-68400.patch
View File
| @ -1,23 +0,0 @@ | |||
| --- a/gcc/config/mips/mips.c | |||
| +++ b/gcc/config/mips/mips.c | |||
| @@ -8001,9 +8001,17 @@ mask_low_and_shift_p (machine_mode mode, | |||
| bool | |||
| and_operands_ok (machine_mode mode, rtx op1, rtx op2) | |||
| { | |||
| - return (memory_operand (op1, mode) | |||
| - ? and_load_operand (op2, mode) | |||
| - : and_reg_operand (op2, mode)); | |||
| + if (!memory_operand (op1, mode)) | |||
| + return and_reg_operand (op2, mode); | |||
| + | |||
| + if (!and_load_operand (op2, mode)) | |||
| + return false; | |||
| + | |||
| + if (!TARGET_MIPS16 || si_mask_operand(op2, mode)) | |||
| + return true; | |||
| + | |||
| + op1 = XEXP (op1, 0); | |||
| + return !(REG_P (op1) && REGNO (op1) == STACK_POINTER_REGNUM); | |||
| } | |||
| /* The canonical form of a mask-low-and-shift-left operation is | |||
+ 0
- 33
devel/gcc/patches/100-uclibc-conf.patch
View File
| @ -1,33 +0,0 @@ | |||
| --- a/contrib/regression/objs-gcc.sh | |||
| +++ b/contrib/regression/objs-gcc.sh | |||
| @@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H | |||
| then | |||
| make all-gdb all-dejagnu all-ld || exit 1 | |||
| make install-gdb install-dejagnu install-ld || exit 1 | |||
| +elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] | |||
| + then | |||
| + make all-gdb all-dejagnu all-ld || exit 1 | |||
| + make install-gdb install-dejagnu install-ld || exit 1 | |||
| elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then | |||
| make bootstrap || exit 1 | |||
| make install || exit 1 | |||
| --- a/libjava/classpath/ltconfig | |||
| +++ b/libjava/classpath/ltconfig | |||
| @@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- | |||
| # Transform linux* to *-*-linux-gnu*, to support old configure scripts. | |||
| case $host_os in | |||
| -linux-gnu*) ;; | |||
| +linux-gnu*|linux-uclibc*) ;; | |||
| linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` | |||
| esac | |||
| @@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux | |||
| ;; | |||
| # This must be Linux ELF. | |||
| -linux-gnu*) | |||
| +linux*) | |||
| version_type=linux | |||
| need_lib_prefix=no | |||
| need_version=no | |||
+ 20
- 0
devel/gcc/patches/110-Fix-MIPS-PR-84790.patch
View File
| @ -0,0 +1,20 @@ | |||
| Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84790. | |||
| MIPS16 functions have a static assembler prologue which clobbers | |||
| registers v0 and v1. Add these register clobbers to function call | |||
| instructions. | |||
| --- a/gcc/config/mips/mips.c | |||
| +++ b/gcc/config/mips/mips.c | |||
| @@ -3098,6 +3098,12 @@ mips_emit_call_insn (rtx pattern, rtx or | |||
| emit_insn (gen_update_got_version ()); | |||
| } | |||
| + if (TARGET_MIPS16 && TARGET_USE_GOT) | |||
| + { | |||
| + clobber_reg (&CALL_INSN_FUNCTION_USAGE (insn), MIPS16_PIC_TEMP); | |||
| + clobber_reg (&CALL_INSN_FUNCTION_USAGE (insn), MIPS_PROLOGUE_TEMP (word_mode)); | |||
| + } | |||
| + | |||
| if (TARGET_MIPS16 | |||
| && TARGET_EXPLICIT_RELOCS | |||
| && TARGET_CALL_CLOBBERED_GP) | |||
+ 0
- 309
devel/gcc/patches/200-musl_config.patch
View File
| @ -1,309 +0,0 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Fri, 8 May 2015 08:25:47 +0000 (+0000) | |||
| Subject: [PATCH 2/13] musl libc config | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a9173ceabaf29c16f8ef226fbf98af373a4b2ceb | |||
| [PATCH 2/13] musl libc config | |||
| 2015-05-08 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * config.gcc (LIBC_MUSL): New tm_defines macro. | |||
| * config/linux.h (OPTION_MUSL): Define. | |||
| (MUSL_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER32,) | |||
| (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32,) | |||
| (INCLUDE_DEFAULTS_MUSL_GPP, INCLUDE_DEFAULTS_MUSL_LOCAL,) | |||
| (INCLUDE_DEFAULTS_MUSL_PREFIX, INCLUDE_DEFAULTS_MUSL_CROSS,) | |||
| (INCLUDE_DEFAULTS_MUSL_TOOL, INCLUDE_DEFAULTS_MUSL_NATIVE): Define. | |||
| * config/linux.opt (mmusl): New option. | |||
| * doc/invoke.texi (GNU/Linux Options): Document -mmusl. | |||
| * configure.ac (gcc_cv_libc_provides_ssp): Add *-*-musl*. | |||
| (gcc_cv_target_dl_iterate_phdr): Add *-linux-musl*. | |||
| * configure: Regenerate. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/gcc/config.gcc | |||
| +++ b/gcc/config.gcc | |||
| @@ -575,7 +575,7 @@ case ${target} in | |||
| 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" | |||
| # 32-bit x86 processors supported by --with-arch=. Each processor | |||
| # MUST be separated by exactly one space. | |||
| @@ -720,6 +720,9 @@ case ${target} in | |||
| *-*-*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" | |||
| ;; | |||
| --- a/gcc/config/linux.h | |||
| +++ b/gcc/config/linux.h | |||
| @@ -32,10 +32,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) | |||
| +#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() \ | |||
| @@ -50,21 +52,25 @@ see the files COPYING3 and COPYING.RUNTI | |||
| } while (0) | |||
| /* Determine which dynamic linker to use depending on whether GLIBC or | |||
| - uClibc or Bionic is the default C library and whether | |||
| - -muclibc or -mglibc or -mbionic has been passed to change the default. */ | |||
| + uClibc or Bionic or musl is the default C library and whether | |||
| + -muclibc or -mglibc or -mbionic or -mmusl 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 */ | |||
| @@ -81,24 +87,100 @@ see the files COPYING3 and COPYING.RUNTI | |||
| #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" | |||
| #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" | |||
| #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" | |||
| +/* Should be redefined for each target that supports musl. */ | |||
| +#define MUSL_DYNAMIC_LINKER "/dev/null" | |||
| +#define MUSL_DYNAMIC_LINKER32 "/dev/null" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/dev/null" | |||
| +#define MUSL_DYNAMIC_LINKERX32 "/dev/null" | |||
| #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) | |||
| /* 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 | |||
| + | |||
| #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ | |||
| /* This is a *uclinux* target. We don't define below macros to normal linux | |||
| versions, because doing so would require *uclinux* targets to include | |||
| --- a/gcc/config/linux.opt | |||
| +++ b/gcc/config/linux.opt | |||
| @@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_l | |||
| Use GNU C library | |||
| muclibc | |||
| -Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) | |||
| +Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl) | |||
| Use uClibc C library | |||
| + | |||
| +mmusl | |||
| +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic) | |||
| +Use musl C library | |||
| --- a/gcc/configure | |||
| +++ b/gcc/configure | |||
| @@ -27833,6 +27833,9 @@ if test "${gcc_cv_libc_provides_ssp+set} | |||
| else | |||
| gcc_cv_libc_provides_ssp=no | |||
| case "$target" in | |||
| + *-*-musl*) | |||
| + # All versions of musl provide stack protector | |||
| + gcc_cv_libc_provides_ssp=yes;; | |||
| *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) | |||
| # glibc 2.4 and later provides __stack_chk_fail and | |||
| # either __stack_chk_guard, or TLS access to stack guard canary. | |||
| @@ -27865,6 +27868,7 @@ fi | |||
| # <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 | |||
| # realistically usable GNU/Hurd configurations. | |||
| + # All supported versions of musl provide it as well | |||
| gcc_cv_libc_provides_ssp=yes;; | |||
| *-*-darwin* | *-*-freebsd*) | |||
| ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail" | |||
| @@ -27961,6 +27965,9 @@ case "$target" in | |||
| 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 | |||
| --- a/gcc/configure.ac | |||
| +++ b/gcc/configure.ac | |||
| @@ -5287,6 +5287,9 @@ AC_CACHE_CHECK(__stack_chk_fail in targe | |||
| gcc_cv_libc_provides_ssp, | |||
| [gcc_cv_libc_provides_ssp=no | |||
| case "$target" in | |||
| + *-*-musl*) | |||
| + # All versions of musl provide stack protector | |||
| + gcc_cv_libc_provides_ssp=yes;; | |||
| *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) | |||
| # glibc 2.4 and later provides __stack_chk_fail and | |||
| # either __stack_chk_guard, or TLS access to stack guard canary. | |||
| @@ -5313,6 +5316,7 @@ AC_CACHE_CHECK(__stack_chk_fail in targe | |||
| # <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 | |||
| # realistically usable GNU/Hurd configurations. | |||
| + # All supported versions of musl provide it as well | |||
| gcc_cv_libc_provides_ssp=yes;; | |||
| *-*-darwin* | *-*-freebsd*) | |||
| AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], | |||
| @@ -5386,6 +5390,9 @@ case "$target" in | |||
| 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 | |||
| --- a/gcc/doc/invoke.texi | |||
| +++ b/gcc/doc/invoke.texi | |||
| @@ -667,7 +667,7 @@ Objective-C and Objective-C++ Dialects}. | |||
| -mcpu=@var{cpu}} | |||
| @emph{GNU/Linux Options} | |||
| -@gccoptlist{-mglibc -muclibc -mbionic -mandroid @gol | |||
| +@gccoptlist{-mglibc -muclibc -mmusl -mbionic -mandroid @gol | |||
| -tno-android-cc -tno-android-ld} | |||
| @emph{H8/300 Options} | |||
| @@ -15340,13 +15340,19 @@ These @samp{-m} options are defined for | |||
| @item -mglibc | |||
| @opindex mglibc | |||
| Use the GNU C library. This is the default except | |||
| -on @samp{*-*-linux-*uclibc*} and @samp{*-*-linux-*android*} targets. | |||
| +on @samp{*-*-linux-*uclibc*}, @samp{*-*-linux-*musl*} and | |||
| +@samp{*-*-linux-*android*} targets. | |||
| @item -muclibc | |||
| @opindex muclibc | |||
| Use uClibc C library. This is the default on | |||
| @samp{*-*-linux-*uclibc*} targets. | |||
| +@item -mmusl | |||
| +@opindex mmusl | |||
| +Use the musl C library. This is the default on | |||
| +@samp{*-*-linux-*musl*} targets. | |||
| + | |||
| @item -mbionic | |||
| @opindex mbionic | |||
| Use Bionic C library. This is the default on | |||
+ 0
- 43
devel/gcc/patches/201-musl_arm.patch
View File
| @ -1,43 +0,0 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Wed, 27 May 2015 13:17:11 +0000 (+0000) | |||
| Subject: [PATCH 4/13] arm musl support | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=de799bd087ab9a179768fea75bd195a31d3432a4 | |||
| [PATCH 4/13] arm musl support | |||
| On behalf of szabolcs.nagy@arm.com | |||
| 2015-05-27 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| * config/arm/linux-eabi.h (MUSL_DYNAMIC_LINKER): Define. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223749 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/gcc/config/arm/linux-eabi.h | |||
| +++ b/gcc/config/arm/linux-eabi.h | |||
| @@ -77,6 +77,23 @@ | |||
| %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ | |||
| %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" | |||
| +/* For ARM musl currently supports four 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 | |||
| + - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB | |||
| + - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB | |||
| + musl does not support the legacy OABI mode. | |||
| + All the dynamic linkers live in /lib. | |||
| + We default to soft-float, EL. */ | |||
| +#undef MUSL_DYNAMIC_LINKER | |||
| +#if TARGET_BIG_ENDIAN_DEFAULT | |||
| +#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" | |||
| +#else | |||
| +#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" | |||
| +#endif | |||
| +#define MUSL_DYNAMIC_LINKER \ | |||
| + "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" | |||
| + | |||
| /* 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 | |||
+ 0
- 35
devel/gcc/patches/202-musl_mips.patch
View File
| @ -1,35 +0,0 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Fri, 8 May 2015 15:16:50 +0000 (+0000) | |||
| Subject: [PATCH 6/13] mips musl support | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2550b6a866c887472b587bef87d433c51cf1ebc8 | |||
| [PATCH 6/13] mips musl support | |||
| 2015-05-08 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Define. | |||
| (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Define. | |||
| (GNU_USER_DYNAMIC_LINKERN32): Update. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222915 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/gcc/config/mips/linux.h | |||
| +++ b/gcc/config/mips/linux.h | |||
| @@ -37,7 +37,13 @@ along with GCC; see the file COPYING3. | |||
| #define UCLIBC_DYNAMIC_LINKERN32 \ | |||
| "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" | |||
| +#undef MUSL_DYNAMIC_LINKER32 | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" | |||
| +#undef MUSL_DYNAMIC_LINKER64 | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" | |||
| +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" | |||
| + | |||
| #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" | |||
| #define GNU_USER_DYNAMIC_LINKERN32 \ | |||
| CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ | |||
| - BIONIC_DYNAMIC_LINKERN32) | |||
| + BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) | |||
+ 0
- 209
devel/gcc/patches/203-musl_powerpc.patch
View File
| @ -1,209 +0,0 @@ | |||
| gcc/Changelog: | |||
| 2015-04-24 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * config.gcc (secure_plt): Add *-linux*-musl*. | |||
| * config/rs6000/linux64.h (MUSL_DYNAMIC_LINKER32): Define. | |||
| (MUSL_DYNAMIC_LINKER64): Define. | |||
| (GNU_USER_DYNAMIC_LINKER32): Update. | |||
| (GNU_USER_DYNAMIC_LINKER64): Update. | |||
| (CHOOSE_DYNAMIC_LINKER): Update. | |||
| * config/rs6000/secureplt.h (LINK_SECURE_PLT_DEFAULT_SPEC): Define. | |||
| * config/rs6000/sysv4.h (GNU_USER_DYNAMIC_LINKER): Update. | |||
| (MUSL_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER_E,) | |||
| (INCLUDE_DEFAULTS_MUSL_GPP, INCLUDE_DEFAULTS_MUSL_LOCAL,) | |||
| (INCLUDE_DEFAULTS_MUSL_PREFIX, INCLUDE_DEFAULTS_MUSL_CROSS,) | |||
| (INCLUDE_DEFAULTS_MUSL_TOOL, INCLUDE_DEFAULTS_MUSL_NATIVE): Define. | |||
| (LINK_SECURE_PLT_DEFAULT_SPEC): Define. | |||
| (CHOOSE_DYNAMIC_LINKER, LINK_TARGET_SPEC, LINK_OS_LINUX_SPEC): Update. | |||
| * config/rs6000/sysv4le.h (MUSL_DYNAMIC_LINKER_E): Define. | |||
| --- a/gcc/config/rs6000/linux64.h | |||
| +++ b/gcc/config/rs6000/linux64.h | |||
| @@ -365,17 +365,21 @@ extern int dot_symbols; | |||
| #endif | |||
| #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" MUSL_DYNAMIC_LINKER_E ".so.1" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E ".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) | |||
| #undef DEFAULT_ASM_ENDIAN | |||
| #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) | |||
| --- a/gcc/config/rs6000/secureplt.h | |||
| +++ b/gcc/config/rs6000/secureplt.h | |||
| @@ -18,3 +18,4 @@ along with GCC; see the file COPYING3. | |||
| <http://www.gnu.org/licenses/>. */ | |||
| #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" | |||
| +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" | |||
| --- a/gcc/config/rs6000/sysv4.h | |||
| +++ b/gcc/config/rs6000/sysv4.h | |||
| @@ -537,6 +537,9 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF | |||
| #ifndef CC1_SECURE_PLT_DEFAULT_SPEC | |||
| #define CC1_SECURE_PLT_DEFAULT_SPEC "" | |||
| #endif | |||
| +#ifndef LINK_SECURE_PLT_DEFAULT_SPEC | |||
| +#define LINK_SECURE_PLT_DEFAULT_SPEC "" | |||
| +#endif | |||
| /* Pass -G xxx to the compiler. */ | |||
| #undef CC1_SPEC | |||
| @@ -574,7 +577,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF | |||
| %{R*} \ | |||
| %(link_shlib) \ | |||
| %{!T*: %(link_start) } \ | |||
| -%(link_os)" | |||
| +%(link_os)" \ | |||
| +"%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" | |||
| /* Shared libraries are not default. */ | |||
| #define LINK_SHLIB_SPEC "\ | |||
| @@ -757,17 +761,22 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF | |||
| #define LINK_START_LINUX_SPEC "" | |||
| +#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","") | |||
| + | |||
| #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" MUSL_DYNAMIC_LINKER_E ".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} \ | |||
| @@ -889,6 +898,7 @@ ncrtn.o%s" | |||
| { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ | |||
| { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ | |||
| { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ | |||
| + { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ | |||
| { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ | |||
| { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ | |||
| { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ | |||
| @@ -943,3 +953,72 @@ ncrtn.o%s" | |||
| /* This target uses the sysv4.opt file. */ | |||
| #define TARGET_USES_SYSV4_OPT 1 | |||
| +/* Include order changes for musl, same as in generic linux.h. */ | |||
| +#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 | |||
| --- a/gcc/config/rs6000/sysv4le.h | |||
| +++ b/gcc/config/rs6000/sysv4le.h | |||
| @@ -31,3 +31,5 @@ | |||
| /* Little-endian PowerPC64 Linux uses the ELF v2 ABI by default. */ | |||
| #define LINUX64_DEFAULT_ABI_ELFv2 | |||
| +#undef MUSL_DYNAMIC_LINKER_E | |||
| +#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","le") | |||
| --- a/gcc/config.gcc | |||
| +++ b/gcc/config.gcc | |||
| @@ -2416,6 +2416,10 @@ powerpc*-*-linux*) | |||
| 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 | |||
+ 0
- 39
devel/gcc/patches/204-musl_sh.patch
View File
| @ -1,39 +0,0 @@ | |||
| gcc/Changelog: | |||
| 2015-04-27 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * config/sh/linux.h (MUSL_DYNAMIC_LINKER): Define. | |||
| (MUSL_DYNAMIC_LINKER_E, MUSL_DYNAMIC_LINKER_FP): Define. | |||
| --- a/gcc/config/sh/linux.h | |||
| +++ b/gcc/config/sh/linux.h | |||
| @@ -43,6 +43,28 @@ along with GCC; see the file COPYING3. | |||
| #define TARGET_ASM_FILE_END file_end_indicate_exec_stack | |||
| +#if TARGET_ENDIAN_DEFAULT == MASK_LITTLE_ENDIAN | |||
| +#define MUSL_DYNAMIC_LINKER_E "%{mb:eb}" | |||
| +#else | |||
| +#define MUSL_DYNAMIC_LINKER_E "%{!ml:eb}" | |||
| +#endif | |||
| + | |||
| +#if TARGET_CPU_DEFAULT & ( MASK_HARD_SH2A_DOUBLE | MASK_SH4 ) | |||
| +/* "-nofpu" if any nofpu option is specified */ | |||
| +#define MUSL_DYNAMIC_LINKER_FP \ | |||
| + "%{m1|m2|m2a-nofpu|m3|m4-nofpu|m4-100-nofpu|m4-200-nofpu|m4-300-nofpu|" \ | |||
| + "m4-340|m4-400|m4-500|m4al|m5-32media-nofpu|m5-64media-nofpu|" \ | |||
| + "m5-compact-nofpu:-nofpu}" | |||
| +#else | |||
| +/* "-nofpu" if none of the hard fpu options are specified */ | |||
| +#define MUSL_DYNAMIC_LINKER_FP \ | |||
| + "%{m2a|m4|m4-100|m4-200|m4-300|m4a|m5-32media|m5-64media|m5-compact:;:-nofpu}" | |||
| +#endif | |||
| + | |||
| +#undef MUSL_DYNAMIC_LINKER | |||
| +#define MUSL_DYNAMIC_LINKER \ | |||
| + "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP ".so.1" | |||
| + | |||
| #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | |||
| #undef SUBTARGET_LINK_EMUL_SUFFIX | |||
+ 0
- 41
devel/gcc/patches/205-musl_x86.patch
View File
| @ -1,41 +0,0 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Fri, 15 May 2015 13:20:01 +0000 (+0000) | |||
| Subject: [PATCH 9/13] x86 musl support | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=5551c8d927c17f60837f15f8dfe46f945ba3fa9c | |||
| [PATCH 9/13] x86 musl support | |||
| On behalf of Szabolcs Nagy. | |||
| 2015-05-15 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| * config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define. | |||
| * config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define. | |||
| (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/gcc/config/i386/linux.h | |||
| +++ b/gcc/config/i386/linux.h | |||
| @@ -21,3 +21,6 @@ along with GCC; see the file COPYING3. | |||
| #define GNU_USER_LINK_EMULATION "elf_i386" | |||
| #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | |||
| + | |||
| +#undef MUSL_DYNAMIC_LINKER | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" | |||
| --- a/gcc/config/i386/linux64.h | |||
| +++ b/gcc/config/i386/linux64.h | |||
| @@ -30,3 +30,10 @@ 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" | |||
| #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" | |||
| + | |||
| +#undef MUSL_DYNAMIC_LINKER32 | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" | |||
| +#undef MUSL_DYNAMIC_LINKER64 | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" | |||
| +#undef MUSL_DYNAMIC_LINKERX32 | |||
| +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" | |||
+ 0
- 31
devel/gcc/patches/206-musl_aarch64.patch
View File
| @ -1,31 +0,0 @@ | |||
| From: jgreenhalgh <jgreenhalgh@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Wed, 27 May 2015 16:46:39 +0000 (+0000) | |||
| Subject: [PATCH 3/13] aarch64 musl support | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=b3ff21cf0531be91bc3fb8200296a7633090ec78 | |||
| [PATCH 3/13] aarch64 musl support | |||
| gcc/Changelog: | |||
| 2015-05-27 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * config/aarch64/aarch64-linux.h (MUSL_DYNAMIC_LINKER): Define. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223766 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/gcc/config/aarch64/aarch64-linux.h | |||
| +++ b/gcc/config/aarch64/aarch64-linux.h | |||
| @@ -23,6 +23,9 @@ | |||
| #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | |||
| +#undef MUSL_DYNAMIC_LINKER | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" | |||
| + | |||
| #undef ASAN_CC1_SPEC | |||
| #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" | |||
+ 0
- 30
devel/gcc/patches/207-musl_fixincludes.patch
View File
| @ -1,30 +0,0 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Wed, 22 Apr 2015 14:18:16 +0000 (+0000) | |||
| Subject: fixincludes update for musl support | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2dc727de2e87c2756a514cbb43cea23c99deaa3d | |||
| fixincludes update for musl support | |||
| On behalf of Szabolcs.Nagy@arm.com | |||
| 2015-04-22 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| * mkfixinc.sh: Add *-musl* with no fixes. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222327 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/fixincludes/mkfixinc.sh | |||
| +++ b/fixincludes/mkfixinc.sh | |||
| @@ -19,7 +19,8 @@ case $machine in | |||
| 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} | |||
+ 0
- 72
devel/gcc/patches/209-musl_libstdc++.patch
View File
| @ -1,72 +0,0 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Wed, 22 Apr 2015 14:24:11 +0000 (+0000) | |||
| Subject: libstdc++, libgfortran gthr workaround for musl | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=1e5f711c11cb80ce609db9e9c1d8b2da0f7b5b61 | |||
| libstdc++, libgfortran gthr workaround for musl | |||
| On behalf of szabolcs.nagy@arm.com | |||
| [libstdc++-v3/] | |||
| 2015-04-22 Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * config/os/generic/os_defines.h (_GLIBCXX_GTHREAD_USE_WEAK): Define. | |||
| * configure.host (os_include_dir): Set to "os/generic" for linux-musl*. | |||
| [libgfortran/] | |||
| 2015-04-22 Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * acinclude.m4 (GTHREAD_USE_WEAK): Define as 0 for *-*-musl*. | |||
| * configure: Regenerate. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222329 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/libgfortran/acinclude.m4 | |||
| +++ b/libgfortran/acinclude.m4 | |||
| @@ -100,7 +100,7 @@ void foo (void); | |||
| [Define to 1 if the target supports #pragma weak]) | |||
| fi | |||
| case "$host" in | |||
| - *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) | |||
| + *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* ) | |||
| AC_DEFINE(GTHREAD_USE_WEAK, 0, | |||
| [Define to 0 if the target shouldn't use #pragma weak]) | |||
| ;; | |||
| --- a/libgfortran/configure | |||
| +++ b/libgfortran/configure | |||
| @@ -26456,7 +26456,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>con | |||
| fi | |||
| case "$host" in | |||
| - *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) | |||
| + *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* ) | |||
| $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h | |||
| --- a/libstdc++-v3/config/os/generic/os_defines.h | |||
| +++ b/libstdc++-v3/config/os/generic/os_defines.h | |||
| @@ -33,4 +33,9 @@ | |||
| // System-specific #define, typedefs, corrections, etc, go here. This | |||
| // file will come before all others. | |||
| +// Disable the weak reference logic in gthr.h for os/generic because it | |||
| +// is broken on every platform unless there is implementation specific | |||
| +// workaround in gthr-posix.h and at link-time for static linking. | |||
| +#define _GLIBCXX_GTHREAD_USE_WEAK 0 | |||
| + | |||
| #endif | |||
| --- a/libstdc++-v3/configure.host | |||
| +++ b/libstdc++-v3/configure.host | |||
| @@ -273,6 +273,9 @@ case "${host_os}" in | |||
| freebsd*) | |||
| os_include_dir="os/bsd/freebsd" | |||
| ;; | |||
| + linux-musl*) | |||
| + os_include_dir="os/generic" | |||
| + ;; | |||
| gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) | |||
| if [ "$uclibc" = "yes" ]; then | |||
| os_include_dir="os/uclibc" | |||
+ 16
- 1
devel/gcc/patches/230-musl_libssp.patch
View File
+ 0
- 61
devel/gcc/patches/240-musl-libitm-fixes.patch
View File
| @ -1,61 +0,0 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Wed, 22 Apr 2015 14:11:25 +0000 (+0000) | |||
| Subject: libitm fixes for musl support | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e53a4d49c3d03ab8eaddb073cf972c1c46d75338 | |||
| libitm fixes for musl support | |||
| On behalf of Szabolcs.Nagy@arm.com | |||
| 2015-04-22 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| * config/arm/hwcap.cc: Use fcntl.h instead of sys/fcntl.h. | |||
| * config/linux/x86/tls.h: Only use __GLIBC_PREREQ if defined. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/libitm/config/arm/hwcap.cc | |||
| +++ b/libitm/config/arm/hwcap.cc | |||
| @@ -40,7 +40,7 @@ int GTM_hwcap HIDDEN = 0 | |||
| #ifdef __linux__ | |||
| #include <unistd.h> | |||
| -#include <sys/fcntl.h> | |||
| +#include <fcntl.h> | |||
| #include <elf.h> | |||
| static void __attribute__((constructor)) | |||
| --- a/libitm/config/linux/x86/tls.h | |||
| +++ b/libitm/config/linux/x86/tls.h | |||
| @@ -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 @@ static inline void set_abi_disp(struct a | |||
| } // namespace GTM | |||
| #endif /* >= GLIBC 2.10 */ | |||
| +#endif | |||
| #endif // LIBITM_X86_TLS_H | |||
+ 0
- 120
devel/gcc/patches/250-add-musl.patch
View File
| @ -1,120 +0,0 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Fri, 8 May 2015 08:30:40 +0000 (+0000) | |||
| Subject: [PATCH 0/13] Add musl support to GCC | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=f2d678afa5b8385d763b93772d73d6bf80a9739e | |||
| [PATCH 0/13] Add musl support to GCC | |||
| 2015-05-08 Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * config/glibc-stdint.h (OPTION_MUSL): Define. | |||
| (INT_FAST16_TYPE, INT_FAST32_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE): | |||
| Change the definition based on OPTION_MUSL for 64 bit targets. | |||
| * config/linux.h (OPTION_MUSL): Redefine. | |||
| * config/alpha/linux.h (OPTION_MUSL): Redefine. | |||
| * config/rs6000/linux.h (OPTION_MUSL): Redefine. | |||
| * config/rs6000/linux64.h (OPTION_MUSL): Redefine. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222905 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/gcc/config/alpha/linux.h | |||
| +++ b/gcc/config/alpha/linux.h | |||
| @@ -61,10 +61,14 @@ along with GCC; see the file COPYING3. | |||
| #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) | |||
| #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) | |||
| #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) | |||
| +#undef OPTION_MUSL | |||
| +#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) | |||
| +#undef OPTION_MUSL | |||
| +#define OPTION_MUSL (linux_libc == LIBC_MUSL) | |||
| #endif | |||
| /* Determine what functions are present at the runtime; | |||
| --- a/gcc/config/glibc-stdint.h | |||
| +++ b/gcc/config/glibc-stdint.h | |||
| @@ -22,6 +22,12 @@ a copy of the GCC Runtime Library Except | |||
| see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | |||
| <http://www.gnu.org/licenses/>. */ | |||
| +/* Systems using musl libc should use this header and make sure | |||
| + OPTION_MUSL is defined correctly before using the TYPE macros. */ | |||
| +#ifndef OPTION_MUSL | |||
| +#define OPTION_MUSL 0 | |||
| +#endif | |||
| + | |||
| #define SIG_ATOMIC_TYPE "int" | |||
| #define INT8_TYPE "signed char" | |||
| @@ -43,12 +49,12 @@ see the files COPYING3 and COPYING.RUNTI | |||
| #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") | |||
| #define INT_FAST8_TYPE "signed char" | |||
| -#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") | |||
| -#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") | |||
| +#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int") | |||
| +#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int") | |||
| #define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int") | |||
| #define UINT_FAST8_TYPE "unsigned char" | |||
| -#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int") | |||
| -#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int") | |||
| +#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int") | |||
| +#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int") | |||
| #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") | |||
| #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") | |||
| --- a/gcc/config/linux.h | |||
| +++ b/gcc/config/linux.h | |||
| @@ -32,11 +32,13 @@ 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) | |||
| +#undef OPTION_MUSL | |||
| #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) | |||
| +#undef OPTION_MUSL | |||
| #define OPTION_MUSL (linux_libc == LIBC_MUSL) | |||
| #endif | |||
| --- a/gcc/config/rs6000/linux.h | |||
| +++ b/gcc/config/rs6000/linux.h | |||
| @@ -30,10 +30,14 @@ | |||
| #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) | |||
| #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) | |||
| #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) | |||
| +#undef OPTION_MUSL | |||
| +#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) | |||
| +#undef OPTION_MUSL | |||
| +#define OPTION_MUSL (linux_libc == LIBC_MUSL) | |||
| #endif | |||
| /* Determine what functions are present at the runtime; | |||
| --- a/gcc/config/rs6000/linux64.h | |||
| +++ b/gcc/config/rs6000/linux64.h | |||
| @@ -299,10 +299,14 @@ extern int dot_symbols; | |||
| #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) | |||
| #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) | |||
| #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) | |||
| +#undef OPTION_MUSL | |||
| +#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) | |||
| +#undef OPTION_MUSL | |||
| +#define OPTION_MUSL (linux_libc == LIBC_MUSL) | |||
| #endif | |||
| /* Determine what functions are present at the runtime; | |||
+ 0
- 24
devel/gcc/patches/270-musl-add-powerpc-softfloat-fix.patch
View File
| @ -1,24 +0,0 @@ | |||
| --- a/gcc/config/rs6000/linux64.h | |||
| +++ b/gcc/config/rs6000/linux64.h | |||
| @@ -369,8 +369,8 @@ extern int dot_symbols; | |||
| #endif | |||
| #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" MUSL_DYNAMIC_LINKER_E ".so.1" | |||
| -#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E ".so.1" | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" | |||
| #if DEFAULT_LIBC == LIBC_UCLIBC | |||
| #define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" | |||
| #elif DEFAULT_LIBC == LIBC_GLIBC | |||
| --- a/gcc/config/rs6000/sysv4.h | |||
| +++ b/gcc/config/rs6000/sysv4.h | |||
| @@ -765,7 +765,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF | |||
| #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" MUSL_DYNAMIC_LINKER_E ".so.1" | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" | |||
| #if DEFAULT_LIBC == LIBC_UCLIBC | |||
| #define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" | |||
| #elif DEFAULT_LIBC == LIBC_MUSL | |||
+ 10
- 3
devel/gcc/patches/300-mips_Os_cpu_rtx_cost_model.patch
View File
+ 22
- 1
devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
View File
+ 9
- 1
devel/gcc/patches/810-arm-softfloat-libgcc.patch
View File
+ 12
- 4
devel/gcc/patches/820-libgcc_pic.patch
View File
+ 0
- 13
devel/gcc/patches/830-arm_unbreak_armv4t.patch
View File
| @ -1,13 +0,0 @@ | |||
| http://sourceware.org/ml/crossgcc/2008-05/msg00009.html | |||
| --- a/gcc/config/arm/linux-eabi.h | |||
| +++ b/gcc/config/arm/linux-eabi.h | |||
| @@ -45,7 +45,7 @@ | |||
| The ARM10TDMI core is the default for armv5t, so set | |||
| SUBTARGET_CPU_DEFAULT to achieve this. */ | |||
| #undef SUBTARGET_CPU_DEFAULT | |||
| -#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi | |||
| +#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi | |||
| /* TARGET_BIG_ENDIAN_DEFAULT is set in | |||
| config.gcc for big endian configurations. */ | |||
+ 10
- 1
devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
View File
+ 10
- 3
devel/gcc/patches/850-use_shared_libgcc.patch
View File
+ 10
- 0
devel/gcc/patches/851-libgcc_no_compat.patch
View File
+ 8
- 1
devel/gcc/patches/870-ppc_no_crtsavres.patch
View File
+ 0
- 11
devel/gcc/patches/880-no_java_section.patch
View File
| @ -1,11 +0,0 @@ | |||
| --- a/gcc/defaults.h | |||
| +++ b/gcc/defaults.h | |||
| @@ -380,7 +380,7 @@ see the files COPYING3 and COPYING.RUNTI | |||
| /* If we have named section and we support weak symbols, then use the | |||
| .jcr section for recording java classes which need to be registered | |||
| at program start-up time. */ | |||
| -#if defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK | |||
| +#if 0 && defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK | |||
| #ifndef JCR_SECTION_NAME | |||
| #define JCR_SECTION_NAME ".jcr" | |||
| #endif | |||
+ 22
- 0
devel/gcc/patches/881-no_tm_section.patch
View File
| @ -0,0 +1,22 @@ | |||
| commit 565988ab47bd9b96b50608564aee2104aeb4b7ae | |||
| Author: Felix Fietkau <nbd@nbd.name> | |||
| Date: Tue Dec 13 14:20:49 2016 +0100 | |||
| gcc: rip out transactional memory related bloat from crtbegin | |||
| Slightly improves compression for each executable, saving about 4k from | |||
| the default ar71xx rootfs | |||
| Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||
| --- a/libgcc/crtstuff.c | |||
| +++ b/libgcc/crtstuff.c | |||
| @@ -152,7 +152,7 @@ call_ ## FUNC (void) \ | |||
| #endif | |||
| #if !defined(USE_TM_CLONE_REGISTRY) && defined(OBJECT_FORMAT_ELF) | |||
| -# define USE_TM_CLONE_REGISTRY 1 | |||
| +# define USE_TM_CLONE_REGISTRY 0 | |||
| #endif | |||
| /* We do not want to add the weak attribute to the declarations of these | |||
+ 21
- 0
devel/gcc/patches/900-bad-mips16-crt.patch
View File
+ 19
- 95
devel/gcc/patches/910-mbsd_multi.patch
View File
+ 11
- 4
devel/gcc/patches/920-specs_nonfatal_getenv.patch
View File
+ 3
- 3
devel/gcc/patches/930-fix-mips-noexecstack.patch
View File
+ 0
- 13
devel/gcc/patches/930-osdefines.patch
View File
| @ -1,13 +0,0 @@ | |||
| --- a/libstdc++-v3/config/os/gnu-linux/os_defines.h 2015-01-05 06:33:28.000000000 -0600 | |||
| +++ b/libstdc++-v3/config/os/gnu-linux/os_defines.h 2016-04-15 12:32:49.374356001 -0500 | |||
| @@ -41,8 +41,8 @@ | |||
| // Provide a declaration for the possibly deprecated gets function, as | |||
| // glibc 2.15 and later does not declare gets for ISO C11 when | |||
| // __GNU_SOURCE is defined. | |||
| -#if __GLIBC_PREREQ(2,15) && defined(_GNU_SOURCE) | |||
| +//#if __GLIBC_PREREQ(2,15) && defined(_GNU_SOURCE) | |||
| # undef _GLIBCXX_HAVE_GETS | |||
| -#endif | |||
| +//#endif | |||
| #endif | |||
+ 175
- 0
devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch
View File
| @ -0,0 +1,175 @@ | |||
| From c0c62fa4256f805389f16ebfc4a60cf789129b50 Mon Sep 17 00:00:00 2001 | |||
| From: BangLang Huang <banglang.huang@foxmail.com> | |||
| Date: Wed, 9 Nov 2016 10:36:49 +0800 | |||
| Subject: [PATCH] libffi: fix MIPS softfloat build issue | |||
| Backported from github.com/libffi/libffi#272 | |||
| Signed-off-by: BangLang Huang <banglang.huang@foxmail.com> | |||
| Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> | |||
| --- | |||
| libffi/src/mips/n32.S | 17 +++++++++++++++++ | |||
| libffi/src/mips/o32.S | 17 +++++++++++++++++ | |||
| 2 files changed, 34 insertions(+) | |||
| diff --git a/libffi/src/mips/n32.S b/libffi/src/mips/n32.S | |||
| index c6985d30a6f..8f25994773c 100644 | |||
| --- a/libffi/src/mips/n32.S | |||
| +++ b/libffi/src/mips/n32.S | |||
| @@ -107,6 +107,16 @@ loadregs: | |||
| REG_L t6, 3*FFI_SIZEOF_ARG($fp) # load the flags word into t6. | |||
| +#ifdef __mips_soft_float | |||
| + REG_L a0, 0*FFI_SIZEOF_ARG(t9) | |||
| + REG_L a1, 1*FFI_SIZEOF_ARG(t9) | |||
| + REG_L a2, 2*FFI_SIZEOF_ARG(t9) | |||
| + REG_L a3, 3*FFI_SIZEOF_ARG(t9) | |||
| + REG_L a4, 4*FFI_SIZEOF_ARG(t9) | |||
| + REG_L a5, 5*FFI_SIZEOF_ARG(t9) | |||
| + REG_L a6, 6*FFI_SIZEOF_ARG(t9) | |||
| + REG_L a7, 7*FFI_SIZEOF_ARG(t9) | |||
| +#else | |||
| and t4, t6, ((1<<FFI_FLAG_BITS)-1) | |||
| REG_L a0, 0*FFI_SIZEOF_ARG(t9) | |||
| beqz t4, arg1_next | |||
| @@ -193,6 +203,7 @@ arg7_next: | |||
| arg8_doublep: | |||
| l.d $f19, 7*FFI_SIZEOF_ARG(t9) | |||
| arg8_next: | |||
| +#endif | |||
| callit: | |||
| # Load the function pointer | |||
| @@ -214,6 +225,7 @@ retint: | |||
| b epilogue | |||
| retfloat: | |||
| +#ifndef __mips_soft_float | |||
| bne t6, FFI_TYPE_FLOAT, retdouble | |||
| jal t9 | |||
| REG_L t4, 4*FFI_SIZEOF_ARG($fp) | |||
| @@ -272,6 +284,7 @@ retstruct_f_d: | |||
| s.s $f0, 0(t4) | |||
| s.d $f2, 8(t4) | |||
| b epilogue | |||
| +#endif | |||
| retstruct_d_soft: | |||
| bne t6, FFI_TYPE_STRUCT_D_SOFT, retstruct_f_soft | |||
| @@ -429,6 +442,7 @@ ffi_closure_N32: | |||
| REG_S a6, A6_OFF2($sp) | |||
| REG_S a7, A7_OFF2($sp) | |||
| +#ifndef __mips_soft_float | |||
| # Store all possible float/double registers. | |||
| s.d $f12, F12_OFF2($sp) | |||
| s.d $f13, F13_OFF2($sp) | |||
| @@ -438,6 +452,7 @@ ffi_closure_N32: | |||
| s.d $f17, F17_OFF2($sp) | |||
| s.d $f18, F18_OFF2($sp) | |||
| s.d $f19, F19_OFF2($sp) | |||
| +#endif | |||
| # Call ffi_closure_mips_inner_N32 to do the real work. | |||
| LA t9, ffi_closure_mips_inner_N32 | |||
| @@ -458,6 +473,7 @@ cls_retint: | |||
| b cls_epilogue | |||
| cls_retfloat: | |||
| +#ifndef __mips_soft_float | |||
| bne v0, FFI_TYPE_FLOAT, cls_retdouble | |||
| l.s $f0, V0_OFF2($sp) | |||
| b cls_epilogue | |||
| @@ -500,6 +516,7 @@ cls_retstruct_f_d: | |||
| l.s $f0, V0_OFF2($sp) | |||
| l.d $f2, V1_OFF2($sp) | |||
| b cls_epilogue | |||
| +#endif | |||
| cls_retstruct_small2: | |||
| REG_L v0, V0_OFF2($sp) | |||
| diff --git a/libffi/src/mips/o32.S b/libffi/src/mips/o32.S | |||
| index eb279813a76..1aff4b14814 100644 | |||
| --- a/libffi/src/mips/o32.S | |||
| +++ b/libffi/src/mips/o32.S | |||
| @@ -82,13 +82,16 @@ sixteen: | |||
| ADDU $sp, 4 * FFI_SIZEOF_ARG # adjust $sp to new args | |||
| +#ifndef __mips_soft_float | |||
| bnez t0, pass_d # make it quick for int | |||
| +#endif | |||
| REG_L a0, 0*FFI_SIZEOF_ARG($sp) # just go ahead and load the | |||
| REG_L a1, 1*FFI_SIZEOF_ARG($sp) # four regs. | |||
| REG_L a2, 2*FFI_SIZEOF_ARG($sp) | |||
| REG_L a3, 3*FFI_SIZEOF_ARG($sp) | |||
| b call_it | |||
| +#ifndef __mips_soft_float | |||
| pass_d: | |||
| bne t0, FFI_ARGS_D, pass_f | |||
| l.d $f12, 0*FFI_SIZEOF_ARG($sp) # load $fp regs from args | |||
| @@ -130,6 +133,7 @@ pass_f_d: | |||
| # bne t0, FFI_ARGS_F_D, call_it | |||
| l.s $f12, 0*FFI_SIZEOF_ARG($sp) # load $fp regs from args | |||
| l.d $f14, 2*FFI_SIZEOF_ARG($sp) # passing double and float | |||
| +#endif | |||
| call_it: | |||
| # Load the function pointer | |||
| @@ -158,14 +162,23 @@ retfloat: | |||
| bne t2, FFI_TYPE_FLOAT, retdouble | |||
| jalr t9 | |||
| REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp) | |||
| +#ifndef __mips_soft_float | |||
| s.s $f0, 0(t0) | |||
| +#else | |||
| + REG_S v0, 0(t0) | |||
| +#endif | |||
| b epilogue | |||
| retdouble: | |||
| bne t2, FFI_TYPE_DOUBLE, noretval | |||
| jalr t9 | |||
| REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp) | |||
| +#ifndef __mips_soft_float | |||
| s.d $f0, 0(t0) | |||
| +#else | |||
| + REG_S v1, 4(t0) | |||
| + REG_S v0, 0(t0) | |||
| +#endif | |||
| b epilogue | |||
| noretval: | |||
| @@ -261,9 +274,11 @@ $LCFI7: | |||
| li $13, 1 # FFI_O32 | |||
| bne $16, $13, 1f # Skip fp save if FFI_O32_SOFT_FLOAT | |||
| +#ifndef __mips_soft_float | |||
| # Store all possible float/double registers. | |||
| s.d $f12, FA_0_0_OFF2($fp) | |||
| s.d $f14, FA_1_0_OFF2($fp) | |||
| +#endif | |||
| 1: | |||
| # Call ffi_closure_mips_inner_O32 to do the work. | |||
| la t9, ffi_closure_mips_inner_O32 | |||
| @@ -281,6 +296,7 @@ $LCFI7: | |||
| li $13, 1 # FFI_O32 | |||
| bne $16, $13, 1f # Skip fp restore if FFI_O32_SOFT_FLOAT | |||
| +#ifndef __mips_soft_float | |||
| li $9, FFI_TYPE_FLOAT | |||
| l.s $f0, V0_OFF2($fp) | |||
| beq $8, $9, closure_done | |||
| @@ -288,6 +304,7 @@ $LCFI7: | |||
| li $9, FFI_TYPE_DOUBLE | |||
| l.d $f0, V0_OFF2($fp) | |||
| beq $8, $9, closure_done | |||
| +#endif | |||
| 1: | |||
| REG_L $3, V1_OFF2($fp) | |||
| REG_L $2, V0_OFF2($fp) | |||
| -- | |||
| 2.16.3 | |||
+ 23
- 1
devel/gcc/patches/940-no-clobber-stamp-bits.patch
View File
+ 27
- 28
devel/gcc/patches/950-cpp_file_path_translation.patch
View File
+ 0
- 11
devel/gcc/patches/960-go_libm.patch
View File
| @ -1,11 +0,0 @@ | |||
| --- a/gcc/go/Make-lang.in | |||
| +++ b/gcc/go/Make-lang.in | |||
| @@ -74,7 +74,7 @@ go_OBJS = $(GO_OBJS) go/gospec.o | |||
| go1$(exeext): $(GO_OBJS) attribs.o $(BACKEND) $(LIBDEPS) | |||
| +$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ | |||
| - $(GO_OBJS) attribs.o $(BACKEND) $(LIBS) $(BACKENDLIBS) | |||
| + $(GO_OBJS) attribs.o $(BACKEND) $(LIBS) $(BACKENDLIBS) -lm | |||
| # Documentation. | |||
+ 73
- 0
devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch
View File
| @ -0,0 +1,73 @@ | |||
| From dda6b050cd74a352670787a294596a9c56c21327 Mon Sep 17 00:00:00 2001 | |||
| From: Yousong Zhou <yszhou4tech@gmail.com> | |||
| Date: Fri, 4 May 2018 18:20:53 +0800 | |||
| Subject: [PATCH] gotools: fix compilation when making cross compiler | |||
| libgo is "the runtime support library for the Go programming language. | |||
| This library is intended for use with the Go frontend." | |||
| gccgo will link target files with libgo.so which depends on libgcc_s.so.1, but | |||
| the linker will complain that it cannot find it. That's because shared libgcc | |||
| is not present in the install directory yet. libgo.so was made without problem | |||
| because gcc will emit -lgcc_s when compiled with -shared option. When gotools | |||
| were being made, it was supplied with -static-libgcc thus no link option was | |||
| provided. Check LIBGO in gcc/go/gcc-spec.c for how gccgo make a builtin spec | |||
| for linking with libgo.so | |||
| - GccgoCrossCompilation, https://github.com/golang/go/wiki/GccgoCrossCompilation | |||
| - Cross-building instructions, http://www.eglibc.org/archives/patches/msg00078.html | |||
| When 3-pass GCC compilation is used, shared libgcc runtime libraries will be | |||
| available after gcc pass2 completed and will meet the gotools link requirement | |||
| at gcc pass3 | |||
| --- | |||
| gotools/Makefile.am | 4 +++- | |||
| gotools/Makefile.in | 4 +++- | |||
| 2 files changed, 6 insertions(+), 2 deletions(-) | |||
| diff --git a/gotools/Makefile.am b/gotools/Makefile.am | |||
| index 5f3940a278b..9c22f5df103 100644 | |||
| --- a/gotools/Makefile.am | |||
| +++ b/gotools/Makefile.am | |||
| @@ -26,6 +26,7 @@ PWD_COMMAND = $${PWDCMD-pwd} | |||
| STAMP = echo timestamp > | |||
| libgodir = ../$(target_noncanonical)/libgo | |||
| +libgccdir = ../$(target_noncanonical)/libgcc | |||
| LIBGODEP = $(libgodir)/libgo.la | |||
| if NATIVE | |||
| @@ -38,7 +39,8 @@ endif | |||
| GOCFLAGS = $(CFLAGS_FOR_TARGET) | |||
| GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS) | |||
| -AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs | |||
| +AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs \ | |||
| + -L $(libgccdir) -L $(libgccdir)/.libs -lgcc_s | |||
| GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ | |||
| cmdsrcdir = $(srcdir)/../libgo/go/cmd | |||
| diff --git a/gotools/Makefile.in b/gotools/Makefile.in | |||
| index 4386576b011..0bdd9290e01 100644 | |||
| --- a/gotools/Makefile.in | |||
| +++ b/gotools/Makefile.in | |||
| @@ -252,13 +252,15 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs | |||
| PWD_COMMAND = $${PWDCMD-pwd} | |||
| STAMP = echo timestamp > | |||
| libgodir = ../$(target_noncanonical)/libgo | |||
| +libgccdir = ../$(target_noncanonical)/libgcc | |||
| LIBGODEP = $(libgodir)/libgo.la | |||
| @NATIVE_FALSE@GOCOMPILER = $(GOC) | |||
| # Use the compiler we just built. | |||
| @NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) | |||
| GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS) | |||
| -AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs | |||
| +AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs \ | |||
| + -L $(libgccdir) -L $(libgccdir)/.libs -lgcc_s | |||
| GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ | |||
| cmdsrcdir = $(srcdir)/../libgo/go/cmd | |||
| go_cmd_go_files = \ | |||
| -- | |||
| 2.16.3 | |||
+ 0
- 11
devel/gcc/patches/970-warn_bug.patch
View File
| @ -1,11 +0,0 @@ | |||
| --- a/libgo/runtime/mprof.goc | |||
| +++ b/libgo/runtime/mprof.goc | |||
| @@ -403,7 +403,7 @@ func ThreadCreateProfile(p Slice) (n int | |||
| func Stack(b Slice, all bool) (n int) { | |||
| byte *pc, *sp; | |||
| - bool enablegc; | |||
| + bool enablegc = false; /* workaround GCC bug #36550 */ | |||
| sp = runtime_getcallersp(&b); | |||
| pc = (byte*)(uintptr)runtime_getcallerpc(&b); | |||