Browse Source
Merge pull request #3229 from noblepepper/gcc5
gcc: update to version 5.xlilik-openwrt-22.03
Hannu Nyman
8 years ago
committed by
GitHub
GitHub
40 changed files with 1667 additions and 488 deletions
Split View
Diff Options
-
+66 -17devel/gcc/Makefile
-
+65 -0devel/gcc/patches/001-revert_register_mode_search.patch
-
+14 -0devel/gcc/patches/002-case_insensitive.patch
-
+4 -5devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
-
+1 -1devel/gcc/patches/010-documentation.patch
-
+0 -45devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch
-
+28 -0devel/gcc/patches/020-no-plt-backport.patch
-
+23 -0devel/gcc/patches/040-fix-mips-ICE-PR-68400.patch
-
+0 -321devel/gcc/patches/200-musl.patch
-
+309 -0devel/gcc/patches/200-musl_config.patch
-
+43 -0devel/gcc/patches/201-musl_arm.patch
-
+35 -0devel/gcc/patches/202-musl_mips.patch
-
+209 -0devel/gcc/patches/203-musl_powerpc.patch
-
+39 -0devel/gcc/patches/204-musl_sh.patch
-
+41 -0devel/gcc/patches/205-musl_x86.patch
-
+31 -0devel/gcc/patches/206-musl_aarch64.patch
-
+30 -0devel/gcc/patches/207-musl_fixincludes.patch
-
+72 -0devel/gcc/patches/209-musl_libstdc++.patch
-
+13 -0devel/gcc/patches/230-musl_libssp.patch
-
+61 -0devel/gcc/patches/240-musl-libitm-fixes.patch
-
+120 -0devel/gcc/patches/250-add-musl.patch
-
+34 -0devel/gcc/patches/260-musl-add-unwind-fix.patch
-
+24 -0devel/gcc/patches/270-musl-add-powerpc-softfloat-fix.patch
-
+14 -0devel/gcc/patches/300-mips_Os_cpu_rtx_cost_model.patch
-
+2 -2devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
-
+1 -1devel/gcc/patches/810-arm-softfloat-libgcc.patch
-
+3 -3devel/gcc/patches/820-libgcc_pic.patch
-
+5 -5devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
-
+7 -7devel/gcc/patches/850-use_shared_libgcc.patch
-
+12 -0devel/gcc/patches/851-libgcc_no_compat.patch
-
+0 -29devel/gcc/patches/860-uclibc_use_eh_frame.patch
-
+1 -1devel/gcc/patches/870-ppc_no_crtsavres.patch
-
+17 -48devel/gcc/patches/910-mbsd_multi.patch
-
+4 -3devel/gcc/patches/920-specs_nonfatal_getenv.patch
-
+111 -0devel/gcc/patches/930-fix-mips-noexecstack.patch
-
+13 -0devel/gcc/patches/930-osdefines.patch
-
+11 -0devel/gcc/patches/940-no-clobber-stamp-bits.patch
-
+182 -0devel/gcc/patches/950-cpp_file_path_translation.patch
-
+11 -0devel/gcc/patches/960-go_libm.patch
-
+11 -0devel/gcc/patches/970-warn_bug.patch
+ 66
- 17
devel/gcc/Makefile
View File
+ 65
- 0
devel/gcc/patches/001-revert_register_mode_search.patch
View File
| @ -0,0 +1,65 @@ | |||
| Revert of: | |||
| commit 275035b56823b26d5fb7e90fad945b998648edf2 | |||
| Author: bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Thu Sep 5 14:09:07 2013 +0000 | |||
| PR target/58139 | |||
| * reginfo.c (choose_hard_reg_mode): Scan through all mode classes | |||
| looking for widest mode. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202286 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- a/gcc/reginfo.c | |||
| +++ b/gcc/reginfo.c | |||
| @@ -665,35 +665,40 @@ choose_hard_reg_mode (unsigned int regno | |||
| mode = GET_MODE_WIDER_MODE (mode)) | |||
| if ((unsigned) hard_regno_nregs[regno][mode] == nregs | |||
| && HARD_REGNO_MODE_OK (regno, mode) | |||
| - && (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)) | |||
| - && GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode)) | |||
| + && (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))) | |||
| found_mode = mode; | |||
| + if (found_mode != VOIDmode) | |||
| + return found_mode; | |||
| + | |||
| for (mode = GET_CLASS_NARROWEST_MODE (MODE_FLOAT); | |||
| mode != VOIDmode; | |||
| mode = GET_MODE_WIDER_MODE (mode)) | |||
| if ((unsigned) hard_regno_nregs[regno][mode] == nregs | |||
| && HARD_REGNO_MODE_OK (regno, mode) | |||
| - && (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)) | |||
| - && GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode)) | |||
| + && (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))) | |||
| found_mode = mode; | |||
| + if (found_mode != VOIDmode) | |||
| + return found_mode; | |||
| + | |||
| for (mode = GET_CLASS_NARROWEST_MODE (MODE_VECTOR_FLOAT); | |||
| mode != VOIDmode; | |||
| mode = GET_MODE_WIDER_MODE (mode)) | |||
| if ((unsigned) hard_regno_nregs[regno][mode] == nregs | |||
| && HARD_REGNO_MODE_OK (regno, mode) | |||
| - && (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)) | |||
| - && GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode)) | |||
| + && (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))) | |||
| found_mode = mode; | |||
| + if (found_mode != VOIDmode) | |||
| + return found_mode; | |||
| + | |||
| for (mode = GET_CLASS_NARROWEST_MODE (MODE_VECTOR_INT); | |||
| mode != VOIDmode; | |||
| mode = GET_MODE_WIDER_MODE (mode)) | |||
| if ((unsigned) hard_regno_nregs[regno][mode] == nregs | |||
| && HARD_REGNO_MODE_OK (regno, mode) | |||
| - && (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)) | |||
| - && GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode)) | |||
| + && (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))) | |||
| found_mode = mode; | |||
| if (found_mode != VOIDmode) | |||
+ 14
- 0
devel/gcc/patches/002-case_insensitive.patch
View File
| @ -0,0 +1,14 @@ | |||
| --- a/include/filenames.h | |||
| +++ b/include/filenames.h | |||
| @@ -43,11 +43,6 @@ extern "C" { | |||
| # define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c) | |||
| # define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f) | |||
| #else /* not DOSish */ | |||
| -# if defined(__APPLE__) | |||
| -# ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM | |||
| -# define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1 | |||
| -# endif | |||
| -# endif /* __APPLE__ */ | |||
| # define HAS_DRIVE_SPEC(f) (0) | |||
| # define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c) | |||
| # define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f) | |||
+ 4
- 5
devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
View File
| @ -1,15 +1,14 @@ | |||
| diff --git a/gcc/real.h b/gcc/real.h | |||
| index 2ff84f6..fbb4b0e 100644 | |||
| --- a/gcc/real.h | |||
| +++ b/gcc/real.h | |||
| @@ -72,8 +72,10 @@ struct GTY(()) real_value { | |||
| @@ -75,9 +75,10 @@ | |||
| + (REAL_VALUE_TYPE_SIZE%HOST_BITS_PER_WIDE_INT ? 1 : 0)) /* round up */ | |||
| /* Verify the guess. */ | |||
| +#ifndef __LP64__ | |||
| extern char test_real_width | |||
| [sizeof(REAL_VALUE_TYPE) <= REAL_WIDTH*sizeof(HOST_WIDE_INT) ? 1 : -1]; | |||
| [sizeof (REAL_VALUE_TYPE) <= REAL_WIDTH * sizeof (HOST_WIDE_INT) ? 1 : -1]; | |||
| - | |||
| +#endif | |||
| /* Calculate the format for CONST_DOUBLE. We need as many slots as | |||
| are necessary to overlay a REAL_VALUE_TYPE on them. This could be | |||
| as many as four (32-bit HOST_WIDE_INT, 128-bit REAL_VALUE_TYPE). | |||
+ 1
- 1
devel/gcc/patches/010-documentation.patch
View File
+ 0
- 45
devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch
View File
| @ -1,45 +0,0 @@ | |||
| diff --git a/gcc/configure b/gcc/configure | |||
| index 3793681..bcda752 100755 | |||
| --- a/gcc/configure | |||
| +++ b/gcc/configure | |||
| @@ -26876,19 +26876,6 @@ $as_echo "#define TARGET_LIBC_PROVIDES_SSP 1" >>confdefs.h | |||
| fi | |||
| -# Test for <sys/sdt.h> on the target. | |||
| - | |||
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 | |||
| -$as_echo_n "checking sys/sdt.h in the target C library... " >&6; } | |||
| -have_sys_sdt_h=no | |||
| -if test -f $target_header_dir/sys/sdt.h; then | |||
| - have_sys_sdt_h=yes | |||
| - | |||
| -$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h | |||
| - | |||
| -fi | |||
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 | |||
| -$as_echo "$have_sys_sdt_h" >&6; } | |||
| # Check if TFmode long double should be used by default or not. | |||
| # Some glibc targets used DFmode long double, but with glibc 2.4 | |||
| diff --git a/gcc/configure.ac b/gcc/configure.ac | |||
| index 3ee1d67..e321218 100644 | |||
| --- a/gcc/configure.ac | |||
| +++ b/gcc/configure.ac | |||
| @@ -4796,16 +4796,6 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then | |||
| [Define if your target C library provides stack protector support]) | |||
| fi | |||
| -# Test for <sys/sdt.h> on the target. | |||
| -GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) | |||
| -AC_MSG_CHECKING(sys/sdt.h in the target C library) | |||
| -have_sys_sdt_h=no | |||
| -if test -f $target_header_dir/sys/sdt.h; then | |||
| - have_sys_sdt_h=yes | |||
| - AC_DEFINE(HAVE_SYS_SDT_H, 1, | |||
| - [Define if your target C library provides sys/sdt.h]) | |||
| -fi | |||
| -AC_MSG_RESULT($have_sys_sdt_h) | |||
| # Check if TFmode long double should be used by default or not. | |||
| # Some glibc targets used DFmode long double, but with glibc 2.4 | |||
+ 28
- 0
devel/gcc/patches/020-no-plt-backport.patch
View File
| @ -0,0 +1,28 @@ | |||
| --- 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 | |||
+ 23
- 0
devel/gcc/patches/040-fix-mips-ICE-PR-68400.patch
View File
| @ -0,0 +1,23 @@ | |||
| --- 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
- 321
devel/gcc/patches/200-musl.patch
View File
| @ -1,321 +0,0 @@ | |||
| --- a/gcc/config.gcc | |||
| +++ b/gcc/config.gcc | |||
| @@ -549,7 +549,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" | |||
| # Common parts for widely ported systems. | |||
| case ${target} in | |||
| @@ -652,6 +652,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/arm/linux-eabi.h | |||
| +++ b/gcc/config/arm/linux-eabi.h | |||
| @@ -77,6 +77,10 @@ | |||
| %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ | |||
| %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" | |||
| +/* musl has no "classic" (i.e. broken) mode */ | |||
| +#undef MUSL_DYNAMIC_LINKER | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.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 | |||
| --- a/gcc/config/i386/linux.h | |||
| +++ b/gcc/config/i386/linux.h | |||
| @@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. | |||
| #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" | |||
| --- a/gcc/config/i386/linux64.h | |||
| +++ b/gcc/config/i386/linux64.h | |||
| @@ -30,3 +30,7 @@ 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" | |||
| + | |||
| +#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" | |||
| --- 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() \ | |||
| @@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI | |||
| uClibc or Bionic is the default C library and whether | |||
| -muclibc or -mglibc or -mbionic has been passed to change the default. */ | |||
| -#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 */ | |||
| @@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTI | |||
| #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. */ | |||
| --- a/gcc/config/linux.opt | |||
| +++ b/gcc/config/linux.opt | |||
| @@ -30,3 +30,7 @@ Use GNU C library | |||
| 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 | |||
| --- a/gcc/config/mips/linux.h | |||
| +++ b/gcc/config/mips/linux.h | |||
| @@ -18,3 +18,5 @@ along with GCC; see the file COPYING3. | |||
| <http://www.gnu.org/licenses/>. */ | |||
| #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | |||
| + | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1" | |||
| --- a/gcc/config/rs6000/linux64.h | |||
| +++ b/gcc/config/rs6000/linux64.h | |||
| @@ -364,17 +364,21 @@ extern int dot_symbols; | |||
| #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: \ | |||
| --- a/gcc/config/rs6000/sysv4.h | |||
| +++ b/gcc/config/rs6000/sysv4.h | |||
| @@ -789,15 +789,18 @@ extern int fixuplabelno; | |||
| #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} \ | |||
| --- a/gcc/ginclude/stddef.h | |||
| +++ b/gcc/ginclude/stddef.h | |||
| @@ -181,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; | |||
| #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 | |||
| @@ -197,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; | |||
| #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. */ | |||
| @@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t; | |||
| 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 */ | |||
| --- a/libgomp/config/posix/time.c | |||
| +++ b/libgomp/config/posix/time.c | |||
| @@ -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 | |||
| --- a/libitm/config/arm/hwcap.cc | |||
| +++ b/libitm/config/arm/hwcap.cc | |||
| @@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0 | |||
| #ifdef __linux__ | |||
| #include <unistd.h> | |||
| +#ifdef __GLIBC__ | |||
| #include <sys/fcntl.h> | |||
| +#else | |||
| +#include <fcntl.h> | |||
| +#endif | |||
| #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 | |||
| --- a/libstdc++-v3/configure.host | |||
| +++ b/libstdc++-v3/configure.host | |||
| @@ -264,6 +264,13 @@ case "${host_os}" in | |||
| 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 | |||
| @@ -272,6 +279,9 @@ case "${host_os}" in | |||
| os_include_dir="os/gnu-linux" | |||
| fi | |||
| ;; | |||
| + | |||
| + esac | |||
| + ;; | |||
| hpux*) | |||
| os_include_dir="os/hpux" | |||
| ;; | |||
| --- a/gcc/config/mips/linux64.h | |||
| +++ b/gcc/config/mips/linux64.h | |||
| @@ -27,6 +27,9 @@ along with GCC; see the file COPYING3. | |||
| #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" | |||
| #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" | |||
| #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" | |||
| +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1" | |||
| #define GNU_USER_DYNAMIC_LINKERN32 \ | |||
| CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ | |||
| - BIONIC_DYNAMIC_LINKERN32) | |||
| + BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) | |||
| --- a/gcc/config/sparc/linux64.h 2013-09-10 10:02:45.663973856 +0100 | |||
| +++ b/gcc/config/sparc/linux64.h 2013-09-10 10:03:17.871972435 +0100 | |||
| @@ -104,6 +104,9 @@ | |||
| #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | |||
| #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1" | |||
| + | |||
| #ifdef SPARC_BI_ARCH | |||
| #undef SUBTARGET_EXTRA_SPECS | |||
+ 309
- 0
devel/gcc/patches/200-musl_config.patch
View File
| @ -0,0 +1,309 @@ | |||
| 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 | |||
+ 43
- 0
devel/gcc/patches/201-musl_arm.patch
View File
| @ -0,0 +1,43 @@ | |||
| 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 | |||
+ 35
- 0
devel/gcc/patches/202-musl_mips.patch
View File
| @ -0,0 +1,35 @@ | |||
| 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) | |||
+ 209
- 0
devel/gcc/patches/203-musl_powerpc.patch
View File
| @ -0,0 +1,209 @@ | |||
| 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 | |||
+ 39
- 0
devel/gcc/patches/204-musl_sh.patch
View File
| @ -0,0 +1,39 @@ | |||
| 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 | |||
+ 41
- 0
devel/gcc/patches/205-musl_x86.patch
View File
| @ -0,0 +1,41 @@ | |||
| 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" | |||
+ 31
- 0
devel/gcc/patches/206-musl_aarch64.patch
View File
| @ -0,0 +1,31 @@ | |||
| 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}" | |||
+ 30
- 0
devel/gcc/patches/207-musl_fixincludes.patch
View File
| @ -0,0 +1,30 @@ | |||
| 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} | |||
+ 72
- 0
devel/gcc/patches/209-musl_libstdc++.patch
View File
| @ -0,0 +1,72 @@ | |||
| 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" | |||
+ 13
- 0
devel/gcc/patches/230-musl_libssp.patch
View File
| @ -0,0 +1,13 @@ | |||
| --- a/gcc/gcc.c | |||
| +++ b/gcc/gcc.c | |||
| @@ -727,7 +727,9 @@ proper position among the other output f | |||
| #endif | |||
| #ifndef LINK_SSP_SPEC | |||
| -#ifdef TARGET_LIBC_PROVIDES_SSP | |||
| +#if DEFAULT_LIBC == LIBC_MUSL | |||
| +#define LINK_SSP_SPEC "-lssp_nonshared" | |||
| +#elif defined(TARGET_LIBC_PROVIDES_SSP) | |||
| #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ | |||
| "|fstack-protector-strong|fstack-protector-explicit:}" | |||
| #else | |||
+ 61
- 0
devel/gcc/patches/240-musl-libitm-fixes.patch
View File
| @ -0,0 +1,61 @@ | |||
| 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 | |||
+ 120
- 0
devel/gcc/patches/250-add-musl.patch
View File
| @ -0,0 +1,120 @@ | |||
| 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; | |||
+ 34
- 0
devel/gcc/patches/260-musl-add-unwind-fix.patch
View File
| @ -0,0 +1,34 @@ | |||
| From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | |||
| Date: Wed, 22 Apr 2015 14:20:01 +0000 (+0000) | |||
| Subject: unwind fix for musl | |||
| X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a2e31d0681d8a47389b8a3552622fbd9827bcef4 | |||
| unwind fix for musl | |||
| On behalf of szabolcs.nagy@arm.com | |||
| 2015-04-22 Gregor Richards <gregor.richards@uwaterloo.ca> | |||
| Szabolcs Nagy <szabolcs.nagy@arm.com> | |||
| * unwind-dw2-fde-dip.c (USE_PT_GNU_EH_FRAME): Define it on | |||
| Linux if target provides dl_iterate_phdr. | |||
| git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4 | |||
| --- | |||
| --- a/libgcc/unwind-dw2-fde-dip.c | |||
| +++ b/libgcc/unwind-dw2-fde-dip.c | |||
| @@ -59,6 +59,12 @@ | |||
| #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ | |||
| && defined(TARGET_DL_ITERATE_PHDR) \ | |||
| + && defined(__linux__) | |||
| +# define USE_PT_GNU_EH_FRAME | |||
| +#endif | |||
| + | |||
| +#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ | |||
| + && defined(TARGET_DL_ITERATE_PHDR) \ | |||
| && (defined(__DragonFly__) || defined(__FreeBSD__)) | |||
| # define ElfW __ElfN | |||
| # define USE_PT_GNU_EH_FRAME | |||
+ 24
- 0
devel/gcc/patches/270-musl-add-powerpc-softfloat-fix.patch
View File
| @ -0,0 +1,24 @@ | |||
| --- 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 | |||
+ 14
- 0
devel/gcc/patches/300-mips_Os_cpu_rtx_cost_model.patch
View File
| @ -0,0 +1,14 @@ | |||
| Use the proper rtx cost model for the selected CPU, even when optimizing | |||
| for size. This generates better code. | |||
| --- a/gcc/config/mips/mips.c | |||
| +++ b/gcc/config/mips/mips.c | |||
| @@ -17483,7 +17483,7 @@ mips_option_override (void) | |||
| flag_pcc_struct_return = 0; | |||
| /* Decide which rtx_costs structure to use. */ | |||
| - if (optimize_size) | |||
| + if (0 && optimize_size) | |||
| mips_cost = &mips_rtx_cost_optimize_size; | |||
| else | |||
| mips_cost = &mips_rtx_cost_data[mips_tune]; | |||
+ 2
- 2
devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
View File
+ 1
- 1
devel/gcc/patches/810-arm-softfloat-libgcc.patch
View File
+ 3
- 3
devel/gcc/patches/820-libgcc_pic.patch
View File
+ 5
- 5
devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
View File
+ 7
- 7
devel/gcc/patches/850-use_shared_libgcc.patch
View File
+ 12
- 0
devel/gcc/patches/851-libgcc_no_compat.patch
View File
| @ -0,0 +1,12 @@ | |||
| --- a/libgcc/config/t-libunwind | |||
| +++ b/libgcc/config/t-libunwind | |||
| @@ -2,8 +2,7 @@ | |||
| HOST_LIBGCC2_CFLAGS += -DUSE_GAS_SYMVER | |||
| -LIB2ADDEH = $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c \ | |||
| - $(srcdir)/unwind-compat.c $(srcdir)/unwind-dw2-fde-compat.c | |||
| +LIB2ADDEH = $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c | |||
| LIB2ADDEHSTATIC = $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c | |||
| # Override the default value from t-slibgcc-elf-ver and mention -lunwind | |||
+ 0
- 29
devel/gcc/patches/860-uclibc_use_eh_frame.patch
View File
| @ -1,29 +0,0 @@ | |||
| --- a/libgcc/crtstuff.c | |||
| +++ b/libgcc/crtstuff.c | |||
| @@ -100,15 +100,20 @@ call_ ## FUNC (void) \ | |||
| #if defined(OBJECT_FORMAT_ELF) \ | |||
| && !defined(OBJECT_FORMAT_FLAT) \ | |||
| && defined(HAVE_LD_EH_FRAME_HDR) \ | |||
| - && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \ | |||
| - && defined(__GLIBC__) && __GLIBC__ >= 2 | |||
| + && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) | |||
| #include <link.h> | |||
| /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h. | |||
| But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */ | |||
| -# if !defined(__UCLIBC__) \ | |||
| - && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ | |||
| - || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) | |||
| -# define USE_PT_GNU_EH_FRAME | |||
| +# if defined(__UCLIBC__) | |||
| +# if (__UCLIBC_MAJOR__ > 0 || __UCLIBC_MINOR__ > 9 || \ | |||
| + (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 33)) | |||
| +# define USE_PT_GNU_EH_FRAME | |||
| +# endif | |||
| +# elif defined(__GLIBC__) | |||
| +# if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ | |||
| + || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) | |||
| +# define USE_PT_GNU_EH_FRAME | |||
| +# endif | |||
| # endif | |||
| #endif | |||
+ 1
- 1
devel/gcc/patches/870-ppc_no_crtsavres.patch
View File
+ 17
- 48
devel/gcc/patches/910-mbsd_multi.patch
View File
+ 4
- 3
devel/gcc/patches/920-specs_nonfatal_getenv.patch
View File
+ 111
- 0
devel/gcc/patches/930-fix-mips-noexecstack.patch
View File
| @ -0,0 +1,111 @@ | |||
| From da45b3fde60095756f5f6030f6012c23a3d34429 Mon Sep 17 00:00:00 2001 | |||
| From: Andrew McDonnell <bugs@andrewmcdonnell.net> | |||
| Date: Fri, 3 Oct 2014 19:09:00 +0930 | |||
| Subject: Add .note.GNU-stack section | |||
| See http://lists.busybox.net/pipermail/uclibc/2014-October/048671.html | |||
| Below copied from https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02430.html | |||
| Re: [Patch, MIPS] Add .note.GNU-stack section | |||
| From: Steve Ellcey <sellcey at mips dot com> | |||
| On Wed, 2014-09-10 at 10:15 -0700, Eric Christopher wrote: | |||
| > | |||
| > | |||
| > On Wed, Sep 10, 2014 at 9:27 AM, <pinskia@gmail.com> wrote: | |||
| > This works except you did not update the assembly files in | |||
| > libgcc or glibc. We (Cavium) have the same patch in our tree | |||
| > for a few released versions. | |||
| > Mind just checking yours in then Andrew? | |||
| > Thanks! | |||
| > -eric | |||
| I talked to Andrew about what files he changed in GCC and created and | |||
| tested this new patch. Andrew also mentioned changing some assembly | |||
| files in glibc but I don't see any use of '.section .note.GNU-stack' in | |||
| any assembly files in glibc (for any platform) so I wasn't planning on | |||
| creating a glibc to add them to mips glibc assembly language files. | |||
| OK to check in this patch? | |||
| Steve Ellcey | |||
| sellcey@mips.com | |||
| 2014-09-26 Steve Ellcey <sellcey@mips.com> | |||
| --- | |||
| gcc/config/mips/mips.c | 3 +++ | |||
| libgcc/config/mips/crti.S | 4 ++++ | |||
| libgcc/config/mips/crtn.S | 3 +++ | |||
| libgcc/config/mips/mips16.S | 4 ++++ | |||
| libgcc/config/mips/vr4120-div.S | 4 ++++ | |||
| 5 files changed, 18 insertions(+) | |||
| --- a/gcc/config/mips/mips.c | |||
| +++ b/gcc/config/mips/mips.c | |||
| @@ -19629,6 +19629,9 @@ mips_lra_p (void) | |||
| #undef TARGET_LRA_P | |||
| #define TARGET_LRA_P mips_lra_p | |||
| +#undef TARGET_ASM_FILE_END | |||
| +#define TARGET_ASM_FILE_END file_end_indicate_exec_stack | |||
| + | |||
| struct gcc_target targetm = TARGET_INITIALIZER; | |||
| #include "gt-mips.h" | |||
| --- a/libgcc/config/mips/crti.S | |||
| +++ b/libgcc/config/mips/crti.S | |||
| @@ -21,6 +21,10 @@ a copy of the GCC Runtime Library Except | |||
| see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | |||
| <http://www.gnu.org/licenses/>. */ | |||
| + | |||
| +/* An executable stack is *not* required for these functions. */ | |||
| + .section .note.GNU-stack,"",%progbits | |||
| + | |||
| /* 4 slots for argument spill area. 1 for cpreturn, 1 for stack. | |||
| Return spill offset of 40 and 20. Aligned to 16 bytes for n32. */ | |||
| --- a/libgcc/config/mips/crtn.S | |||
| +++ b/libgcc/config/mips/crtn.S | |||
| @@ -21,6 +21,9 @@ a copy of the GCC Runtime Library Except | |||
| see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | |||
| <http://www.gnu.org/licenses/>. */ | |||
| +/* An executable stack is *not* required for these functions. */ | |||
| + .section .note.GNU-stack,"",%progbits | |||
| + | |||
| /* 4 slots for argument spill area. 1 for cpreturn, 1 for stack. | |||
| Return spill offset of 40 and 20. Aligned to 16 bytes for n32. */ | |||
| --- a/libgcc/config/mips/mips16.S | |||
| +++ b/libgcc/config/mips/mips16.S | |||
| @@ -48,6 +48,10 @@ see the files COPYING3 and COPYING.RUNTI | |||
| values using the soft-float calling convention, but do the actual | |||
| operation using the hard floating point instructions. */ | |||
| +/* An executable stack is *not* required for these functions. */ | |||
| + .section .note.GNU-stack,"",%progbits | |||
| + .previous | |||
| + | |||
| #if defined _MIPS_SIM && (_MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIO64) | |||
| /* This file contains 32-bit assembly code. */ | |||
| --- a/libgcc/config/mips/vr4120-div.S | |||
| +++ b/libgcc/config/mips/vr4120-div.S | |||
| @@ -26,6 +26,10 @@ see the files COPYING3 and COPYING.RUNTI | |||
| -mfix-vr4120. div and ddiv do not give the correct result when one | |||
| of the operands is negative. */ | |||
| +/* An executable stack is *not* required for these functions. */ | |||
| + .section .note.GNU-stack,"",%progbits | |||
| + .previous | |||
| + | |||
| .set nomips16 | |||
| #define DIV \ | |||
+ 13
- 0
devel/gcc/patches/930-osdefines.patch
View File
| @ -0,0 +1,13 @@ | |||
| --- 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 | |||
+ 11
- 0
devel/gcc/patches/940-no-clobber-stamp-bits.patch
View File
| @ -0,0 +1,11 @@ | |||
| --- a/libstdc++-v3/include/Makefile.in | |||
| +++ b/libstdc++-v3/include/Makefile.in | |||
| @@ -1421,7 +1421,7 @@ stamp-bits: ${bits_headers} | |||
| @$(STAMP) stamp-bits | |||
| stamp-bits-sup: stamp-bits ${bits_sup_headers} | |||
| - @-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null | |||
| + @-cd ${bits_builddir} && $(LN_S) $(filter-out stamp-bits,$?) . 2>/dev/null | |||
| @$(STAMP) stamp-bits-sup | |||
| stamp-c_base: ${c_base_headers} | |||
+ 182
- 0
devel/gcc/patches/950-cpp_file_path_translation.patch
View File
| @ -0,0 +1,182 @@ | |||
| Forward ported from attachment to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47047 | |||
| --- a/gcc/c-family/c-opts.c | |||
| +++ b/gcc/c-family/c-opts.c | |||
| @@ -581,6 +581,10 @@ c_common_handle_option (size_t scode, co | |||
| add_path (xstrdup (arg), SYSTEM, 0, true); | |||
| break; | |||
| + case OPT_iremap: | |||
| + add_cpp_remap_path (arg); | |||
| + break; | |||
| + | |||
| case OPT_iwithprefix: | |||
| add_prefixed_path (arg, SYSTEM); | |||
| break; | |||
| --- a/gcc/c-family/c.opt | |||
| +++ b/gcc/c-family/c.opt | |||
| @@ -1528,6 +1528,10 @@ iquote | |||
| C ObjC C++ ObjC++ Joined Separate MissingArgError(missing path after %qs) | |||
| -iquote <dir> Add <dir> to the end of the quote include path | |||
| +iremap | |||
| +C ObjC C++ ObjC++ Joined Separate | |||
| +-iremap <src:dst> Convert <src> to <dst> if it occurs as prefix in __FILE__. | |||
| + | |||
| iwithprefix | |||
| C ObjC C++ ObjC++ Joined Separate | |||
| -iwithprefix <dir> Add <dir> to the end of the system include path | |||
| --- a/gcc/doc/cpp.texi | |||
| +++ b/gcc/doc/cpp.texi | |||
| @@ -4441,6 +4441,7 @@ without notice. | |||
| @c man begin SYNOPSIS | |||
| cpp [@option{-D}@var{macro}[=@var{defn}]@dots{}] [@option{-U}@var{macro}] | |||
| [@option{-I}@var{dir}@dots{}] [@option{-iquote}@var{dir}@dots{}] | |||
| + [@option{-iremap}@var{src}:@var{dst}] | |||
| [@option{-W}@var{warn}@dots{}] | |||
| [@option{-M}|@option{-MM}] [@option{-MG}] [@option{-MF} @var{filename}] | |||
| [@option{-MP}] [@option{-MQ} @var{target}@dots{}] | |||
| --- a/gcc/doc/cppopts.texi | |||
| +++ b/gcc/doc/cppopts.texi | |||
| @@ -532,6 +532,12 @@ Search @var{dir} only for header files r | |||
| If @var{dir} begins with @code{=}, then the @code{=} will be replaced | |||
| by the sysroot prefix; see @option{--sysroot} and @option{-isysroot}. | |||
| +@item -iremap @var{src}:@var{dst} | |||
| +@opindex iremap | |||
| +Replace the prefix @var{src} in __FILE__ with @var{dst} at expansion time. | |||
| +This option can be specified more than once. Processing stops at the first | |||
| +match. | |||
| + | |||
| @item -fdirectives-only | |||
| @opindex fdirectives-only | |||
| When preprocessing, handle directives, but do not expand macros. | |||
| --- a/gcc/doc/invoke.texi | |||
| +++ b/gcc/doc/invoke.texi | |||
| @@ -494,8 +494,8 @@ Objective-C and Objective-C++ Dialects}. | |||
| @item Directory Options | |||
| @xref{Directory Options,,Options for Directory Search}. | |||
| @gccoptlist{-B@var{prefix} -I@var{dir} -iplugindir=@var{dir} @gol | |||
| --iquote@var{dir} -L@var{dir} -specs=@var{file} -I- @gol | |||
| ---sysroot=@var{dir} --no-sysroot-suffix} | |||
| +-iquote@var{dir} -iremap@var{src}:@var{dst} -L@var{dir} -specs=@var{file} @gol | |||
| +-I- --sysroot=@var{dir} --no-sysroot-suffix} | |||
| @item Machine Dependent Options | |||
| @xref{Submodel Options,,Hardware Models and Configurations}. | |||
| @@ -11479,6 +11479,12 @@ be searched for header files only for th | |||
| "@var{file}"}; they are not searched for @code{#include <@var{file}>}, | |||
| otherwise just like @option{-I}. | |||
| +@item -iremap @var{src}:@var{dst} | |||
| +@opindex iremap | |||
| +Replace the prefix @var{src} in __FILE__ with @var{dst} at expansion time. | |||
| +This option can be specified more than once. Processing stops at the first | |||
| +match. | |||
| + | |||
| @item -L@var{dir} | |||
| @opindex L | |||
| Add directory @var{dir} to the list of directories to be searched | |||
| --- a/libcpp/include/cpplib.h | |||
| +++ b/libcpp/include/cpplib.h | |||
| @@ -751,6 +751,9 @@ extern void cpp_set_lang (cpp_reader *, | |||
| /* Set the include paths. */ | |||
| extern void cpp_set_include_chains (cpp_reader *, cpp_dir *, cpp_dir *, int); | |||
| +/* Provide src:dst pair for __FILE__ remapping. */ | |||
| +extern void add_cpp_remap_path (const char *); | |||
| + | |||
| /* Call these to get pointers to the options, callback, and deps | |||
| structures for a given reader. These pointers are good until you | |||
| call cpp_finish on that reader. You can either edit the callbacks | |||
| --- a/libcpp/macro.c | |||
| +++ b/libcpp/macro.c | |||
| @@ -224,6 +224,64 @@ static const char * const monthnames[] = | |||
| "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" | |||
| }; | |||
| +static size_t remap_pairs; | |||
| +static char **remap_src; | |||
| +static char **remap_dst; | |||
| + | |||
| +void | |||
| +add_cpp_remap_path (const char *arg) | |||
| +{ | |||
| + const char *arg_dst; | |||
| + size_t len; | |||
| + | |||
| + arg_dst = strchr(arg, ':'); | |||
| + if (arg_dst == NULL) | |||
| + { | |||
| + fprintf(stderr, "Invalid argument for -iremap\n"); | |||
| + exit(1); | |||
| + } | |||
| + | |||
| + len = arg_dst - arg; | |||
| + ++arg_dst; | |||
| + | |||
| + remap_src = (char **) xrealloc(remap_src, sizeof(char *) * (remap_pairs + 1)); | |||
| + remap_dst = (char **) xrealloc(remap_dst, sizeof(char *) * (remap_pairs + 1)); | |||
| + | |||
| + remap_src[remap_pairs] = (char *) xmalloc(len + 1); | |||
| + memcpy(remap_src[remap_pairs], arg, len); | |||
| + remap_src[remap_pairs][len] = '\0'; | |||
| + remap_dst[remap_pairs] = xstrdup(arg_dst); | |||
| + ++remap_pairs; | |||
| +} | |||
| + | |||
| +static const char * | |||
| +cpp_remap_file (const char *arg, char **tmp_name) | |||
| +{ | |||
| + char *result; | |||
| + size_t i, len; | |||
| + | |||
| + for (i = 0; i < remap_pairs; ++i) | |||
| + { | |||
| + len = strlen (remap_src[i]); | |||
| + if (strncmp (remap_src[i], arg, len)) | |||
| + continue; | |||
| + if (arg[len] == '\0') | |||
| + return xstrdup (remap_dst[i]); | |||
| + if (arg[len] != '/') | |||
| + continue; | |||
| + arg += len; | |||
| + len = strlen (remap_dst[i]); | |||
| + result = (char *) xmalloc (len + strlen (arg) + 1); | |||
| + memcpy(result, remap_dst[i], len); | |||
| + strcpy(result + len, arg); | |||
| + *tmp_name = result; | |||
| + | |||
| + return result; | |||
| + } | |||
| + | |||
| + return arg; | |||
| +} | |||
| + | |||
| /* Helper function for builtin_macro. Returns the text generated by | |||
| a builtin macro. */ | |||
| const uchar * | |||
| @@ -286,6 +344,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi | |||
| { | |||
| unsigned int len; | |||
| const char *name; | |||
| + char *tmp_name = NULL; | |||
| uchar *buf; | |||
| if (node->value.builtin == BT_FILE) | |||
| @@ -297,6 +356,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi | |||
| if (!name) | |||
| abort (); | |||
| } | |||
| + name = cpp_remap_file (name, &tmp_name); | |||
| len = strlen (name); | |||
| buf = _cpp_unaligned_alloc (pfile, len * 2 + 3); | |||
| result = buf; | |||
| @@ -304,6 +364,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi | |||
| buf = cpp_quote_string (buf + 1, (const unsigned char *) name, len); | |||
| *buf++ = '"'; | |||
| *buf = '\0'; | |||
| + free (tmp_name); | |||
| } | |||
| break; | |||
+ 11
- 0
devel/gcc/patches/960-go_libm.patch
View File
| @ -0,0 +1,11 @@ | |||
| --- 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. | |||
+ 11
- 0
devel/gcc/patches/970-warn_bug.patch
View File
| @ -0,0 +1,11 @@ | |||
| --- 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); | |||