diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 742640f02902..89bb8c550ffe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,20 @@ +2019-06-16 Iain Sandoe + + * config/darwin.c (machopic_indirect_call_target): Use renamed + darwin_picsymbol_stubs to decide on output. + (darwin_override_options): Handle darwin_picsymbol_stubs. + * config/darwin.h (MIN_LD64_OMIT_STUBS): New. + (LD64_VERSION): Revise default. + * config/darwin.opt: (mpic-symbol-stubs): New option. + (darwin_picsymbol_stubs): New variable. + * config/i386/darwin.h (TARGET_MACHO_BRANCH_ISLANDS): + rename to TARGET_MACHO_PICSYM_STUBS. + * config/i386/i386.c (output_pic_addr_const): Likewise. + * config/i386/i386.h Likewise. + * config/rs6000/darwin.h: Likewise. + * config/rs6000/rs6000.c (rs6000_call_darwin_1): Use renamed + darwin_picsymbol_stubs. + 2019-06-16 Iain Sandoe * config/darwin.opt (prebind, noprebind, seglinkedit, diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 17e1801d2ebe..00fa65278c0a 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -78,12 +78,6 @@ along with GCC; see the file COPYING3. If not see of MACHO_SYMBOL_STATIC for the code that handles @code{static} symbol indirection. */ -/* For darwin >= 9 (OSX 10.5) the linker is capable of making the necessary - branch islands and we no longer need to emit darwin stubs. - However, if we are generating code for earlier systems (or for use in the - kernel) the stubs might still be required, and this will be set true. */ -int darwin_emit_branch_islands = false; - typedef struct GTY(()) cdtor_record { rtx symbol; int priority; /* [con/de]structor priority */ @@ -790,7 +784,7 @@ machopic_indirect_data_reference (rtx orig, rtx reg) rtx machopic_indirect_call_target (rtx target) { - if (! darwin_emit_branch_islands) + if (! darwin_picsymbol_stubs) return target; if (GET_CODE (target) != MEM) @@ -3235,7 +3229,7 @@ darwin_override_options (void) flag_unwind_tables = 0; flag_asynchronous_unwind_tables = 0; /* We still need to emit branch islands for kernel context. */ - darwin_emit_branch_islands = true; + darwin_picsymbol_stubs = true; } if (flag_var_tracking_uninit == 0 @@ -3259,11 +3253,31 @@ darwin_override_options (void) flag_pic = 2; } - /* It is assumed that branch island stubs are needed for earlier systems. */ - if (generating_for_darwin_version < 9) - darwin_emit_branch_islands = true; - else - emit_aligned_common = true; /* Later systems can support aligned common. */ + /* Linkers >= ld64-62.1 (at least) are capable of making the necessary PIC + indirections and we no longer need to emit pic symbol stubs. + However, if we are generating code for earlier ones (or for use in the + kernel) the stubs might still be required, and this will be set true. + If the user sets it on or off - then that takes precedence. */ + + if (!global_options_set.x_darwin_picsymbol_stubs) + { + if (darwin_target_linker) { + if (strverscmp (darwin_target_linker, MIN_LD64_OMIT_STUBS) < 0) + darwin_picsymbol_stubs = true; + } else if (generating_for_darwin_version < 9) + /* We know no better than to assume the use of an earlier linker. */ + darwin_picsymbol_stubs = true; + } + else if (DARWIN_X86 && darwin_picsymbol_stubs && TARGET_64BIT) + { + inform (input_location, + "%<-mpic-symbol-stubs%> is not required for 64b code (ignored)"); + darwin_picsymbol_stubs = false; + } + + if (generating_for_darwin_version >= 9) + /* Later systems can support aligned common. */ + emit_aligned_common = true; /* The c_dialect...() macros are not available to us here. */ darwin_running_cxx = (strstr (lang_hooks.name, "C++") != 0); diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 0e253cb0dfa2..bf44b1069405 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -969,8 +969,12 @@ extern void darwin_driver_init (unsigned int *,struct cl_decoded_option **); _tested_ version known to support this so far. */ #define MIN_LD64_NO_COAL_SECTS "236.4" +/* From at least version 62.1, ld64 can build PIC indirection stubs as + needed, and there is no need for the compiler to emit them. */ +#define MIN_LD64_OMIT_STUBS "85.2" + #ifndef LD64_VERSION -#define LD64_VERSION "85.2" +#define LD64_VERSION "62.1" #else #define DEF_LD64 LD64_VERSION #endif diff --git a/gcc/config/darwin.opt b/gcc/config/darwin.opt index 3f04375e6330..d7e5e7bfcab9 100644 --- a/gcc/config/darwin.opt +++ b/gcc/config/darwin.opt @@ -75,6 +75,10 @@ mone-byte-bool Target RejectNegative Report Var(darwin_one_byte_bool) Set sizeof(bool) to 1. +mpic-symbol-stubs +Target Report Var(darwin_picsymbol_stubs) Init(0) +Force generation of PIC symbol stubs. + ; Some code-gen may be improved / adjusted if the linker is sufficiently modern. mtarget-linker= Target RejectNegative Joined Report Alias(mtarget-linker) diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h index 46fa329f622a..93bd5588b887 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -89,14 +89,12 @@ along with GCC; see the file COPYING3. If not see #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE 32 -/* Generate branch islands stubs if this is true. */ -extern int darwin_emit_branch_islands; - -#undef TARGET_MACHO_BRANCH_ISLANDS -#define TARGET_MACHO_BRANCH_ISLANDS darwin_emit_branch_islands +/* Generate pic symbol indirection stubs if this is true. */ +#undef TARGET_MACHO_PICSYM_STUBS +#define TARGET_MACHO_PICSYM_STUBS (darwin_picsymbol_stubs) /* For compatibility with OSX system tools, use the new style of pic stub - if this is set. */ + if this is set (default). */ #undef MACHOPIC_ATT_STUB #define MACHOPIC_ATT_STUB (darwin_macho_att_stub) @@ -244,7 +242,7 @@ extern int darwin_emit_branch_islands; #undef FUNCTION_PROFILER #define FUNCTION_PROFILER(FILE, LABELNO) \ do { \ - if (TARGET_MACHO_BRANCH_ISLANDS \ + if (TARGET_MACHO_PICSYM_STUBS \ && MACHOPIC_INDIRECT && !TARGET_64BIT) \ { \ const char *name = machopic_mcount_stub_name (); \ diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 941e208bcf08..76ac5bb7310a 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -11463,7 +11463,7 @@ output_pic_addr_const (FILE *file, rtx x, int code) break; case SYMBOL_REF: - if (TARGET_64BIT || ! TARGET_MACHO_BRANCH_ISLANDS) + if (TARGET_64BIT || ! TARGET_MACHO_PICSYM_STUBS) output_addr_const (file, x); else { diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 0ac5d6518239..04cf7a77877f 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -645,7 +645,7 @@ extern tree x86_mfence; /* Replace MACH-O, ifdefs by in-line tests, where possible. (a) Macros defined in config/i386/darwin.h */ #define TARGET_MACHO 0 -#define TARGET_MACHO_BRANCH_ISLANDS 0 +#define TARGET_MACHO_PICSYM_STUBS 0 #define MACHOPIC_ATT_STUB 0 /* (b) Macros defined in config/darwin.h */ #define MACHO_DYNAMIC_NO_PIC_P 0 diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index 4774d1db23f2..ee949f2da40a 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -61,8 +61,8 @@ } \ while (0) -/* Generate branch islands stubs if this is true. */ -extern int darwin_emit_branch_islands; +/* Generate pic symbol stubs if this is true. */ +extern int darwin_emit_picsym_stub; #define SUBTARGET_OVERRIDE_OPTIONS darwin_rs6000_override_options () diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index f17faebff6a7..657720c186f4 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -20893,7 +20893,7 @@ print_operand (FILE *file, rtx x, int code) { const char *name = XSTR (x, 0); #if TARGET_MACHO - if (darwin_emit_branch_islands + if (darwin_picsymbol_stubs && MACHOPIC_INDIRECT && machopic_classify_symbol (x) == MACHOPIC_UNDEFINED_FUNCTION) name = machopic_indirection_name (x, /*stub_p=*/true); @@ -38151,7 +38151,8 @@ rs6000_call_darwin_1 (rtx value, rtx func_desc, rtx tlsarg, if ((cookie_val & CALL_LONG) != 0 && GET_CODE (func_desc) == SYMBOL_REF) { - if (darwin_emit_branch_islands && TARGET_32BIT) + /* FIXME: the longcall opt should not hang off picsymbol stubs. */ + if (darwin_picsymbol_stubs && TARGET_32BIT) make_island = true; /* Do nothing yet, retain the CALL_LONG flag. */ else {