From 9005471b8382cc019ccd189b51ef7422027735f7 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Mon, 19 Jul 2010 09:11:12 +0000 Subject: allow darwin branch island control depening on system version * config/i386/darwin.h: Define darwin_emit_branch_islands. (TARGET_MACHO_BRANCH_ISLANDS): New. (FUNCTION_PROFILER): Use TARGET_MACHO_BRANCH_ISLANDS. * config/i386/i386.h (TARGET_MACHO_BRANCH_ISLANDS): Define a default value. * config/i386/i386.c (output_pic_addr_const): Do not emit branch islands unless TARGET_MACHO_BRANCH_ISLANDS is set. (x86_output_mi_thunk): Adjust symbol creation. * config/rs6000/darwin.h: Define darwin_emit_branch_islands. Remove out of date comment. * config/rs6000/rs6000.c (print_operand): Adjust symbol. DARWIN_LINKER_GENERATES_ISLANDS: Remove. DARWIN_GENERATE_ISLANDS: Ditto. (output_call): Do not emit branch islands unless darwin_emit_branch_islands is set. * config/darwin.c: Declare darwin_emit_branch_islands. (machopic_indirect_data_reference): Do not emit unless darwin_emit_branch_islands is set. (darwin_override_options): Set darwin_emit_branch_islands where it is needed. * config/darwin9.h DARWIN_LINKER_GENERATES_ISLANDS: Remove. From-SVN: r162299 --- gcc/ChangeLog | 25 +++++++++++++++++++++++++ gcc/config/darwin.c | 16 ++++++++++++++++ gcc/config/darwin9.h | 3 --- gcc/config/i386/darwin.h | 8 +++++++- gcc/config/i386/i386.c | 7 ++++--- gcc/config/i386/i386.h | 8 +++++++- gcc/config/rs6000/darwin.h | 5 +++-- gcc/config/rs6000/rs6000.c | 13 +++---------- 8 files changed, 65 insertions(+), 20 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0482650..3384d60 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,28 @@ +2010-07-19 Iain Sandoe + + * config/i386/darwin.h: Define darwin_emit_branch_islands. + (TARGET_MACHO_BRANCH_ISLANDS): New. + (FUNCTION_PROFILER): Use TARGET_MACHO_BRANCH_ISLANDS. + * config/i386/i386.h (TARGET_MACHO_BRANCH_ISLANDS): Define a + default value. + * config/i386/i386.c (output_pic_addr_const): Do not emit + branch islands unless TARGET_MACHO_BRANCH_ISLANDS is set. + (x86_output_mi_thunk): Adjust symbol creation. + * config/rs6000/darwin.h: Define darwin_emit_branch_islands. + Remove out of date comment. + * config/rs6000/rs6000.c (print_operand): Adjust symbol. + DARWIN_LINKER_GENERATES_ISLANDS: Remove. + DARWIN_GENERATE_ISLANDS: Ditto. + (output_call): Do not emit branch islands unless + darwin_emit_branch_islands is set. + * config/darwin.c: Declare darwin_emit_branch_islands. + (machopic_indirect_data_reference): Do not emit unless + darwin_emit_branch_islands is set. + (darwin_override_options): Set darwin_emit_branch_islands + where it is needed. + * config/darwin9.h + DARWIN_LINKER_GENERATES_ISLANDS: Remove. + 2010-07-19 Rainer Orth * doc/sourcebuild.texi (Effective-Target Keywords): Document diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 952539f..59c603f 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -79,6 +79,12 @@ 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; + /* Section names. */ section * darwin_sections[NUM_DARWIN_SECTIONS]; @@ -625,6 +631,9 @@ machopic_indirect_data_reference (rtx orig, rtx reg) rtx machopic_indirect_call_target (rtx target) { + if (! darwin_emit_branch_islands) + return target; + if (GET_CODE (target) != MEM) return target; @@ -1888,12 +1897,19 @@ darwin_override_options (void) flag_exceptions = 0; /* No -fnon-call-exceptions data in kexts. */ flag_non_call_exceptions = 0; + /* We still need to emit branch islands for kernel context. */ + darwin_emit_branch_islands = true; } if (flag_var_tracking && strverscmp (darwin_macosx_version_min, "10.5") >= 0 && debug_info_level >= DINFO_LEVEL_NORMAL && debug_hooks->var_location != do_nothing_debug_hooks.var_location) flag_var_tracking_uninit = 1; + + /* It is assumed that branch island stubs are needed for earlier systems. */ + if (darwin_macosx_version_min + && strverscmp (darwin_macosx_version_min, "10.5") < 0) + darwin_emit_branch_islands = true; } /* Add $LDBL128 suffix to long double builtins. */ diff --git a/gcc/config/darwin9.h b/gcc/config/darwin9.h index 7a07374..f152710 100644 --- a/gcc/config/darwin9.h +++ b/gcc/config/darwin9.h @@ -44,9 +44,6 @@ along with GCC; see the file COPYING3. If not see /* libSystem contains unwind information for signal frames. */ #define DARWIN_LIBSYSTEM_HAS_UNWIND -/* The linker can generate branch islands. */ -#define DARWIN_LINKER_GENERATES_ISLANDS 1 - #undef ASM_OUTPUT_ALIGNED_COMMON #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \ do { \ diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h index d26ef2d..7917f2fc 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -60,6 +60,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 + #undef MAX_BITS_PER_WORD #define MAX_BITS_PER_WORD 64 @@ -225,7 +231,7 @@ along with GCC; see the file COPYING3. If not see #undef FUNCTION_PROFILER #define FUNCTION_PROFILER(FILE, LABELNO) \ do { \ - if (MACHOPIC_INDIRECT && !TARGET_64BIT) \ + if (TARGET_MACHO_BRANCH_ISLANDS && MACHOPIC_INDIRECT && !TARGET_64BIT) \ { \ const char *name = machopic_mcount_stub_name (); \ fprintf (FILE, "\tcall %s\n", name+1); /* skip '&' */ \ diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index fdb4787..bb0b890 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -11513,7 +11513,7 @@ output_pic_addr_const (FILE *file, rtx x, int code) break; case SYMBOL_REF: - if (! TARGET_MACHO || TARGET_64BIT) + if (TARGET_64BIT || ! TARGET_MACHO_BRANCH_ISLANDS) output_addr_const (file, x); else { @@ -27233,10 +27233,11 @@ x86_output_mi_thunk (FILE *file, if (TARGET_MACHO) { rtx sym_ref = XEXP (DECL_RTL (function), 0); - tmp = (gen_rtx_SYMBOL_REF + if (TARGET_MACHO_BRANCH_ISLANDS) + sym_ref = (gen_rtx_SYMBOL_REF (Pmode, machopic_indirection_name (sym_ref, /*stub_p=*/true))); - tmp = gen_rtx_MEM (QImode, tmp); + tmp = gen_rtx_MEM (QImode, sym_ref); xops[0] = tmp; output_asm_insn ("jmp\t%0", xops); } diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index b5c6b9a..e153920 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -477,7 +477,13 @@ extern tree x86_mfence; redefines this to 1. */ #define TARGET_MACHO 0 -/* Likewise, for the Windows 64-bit ABI. */ +/* Branch island 'stubs' are emitted for earlier versions of darwin. + This provides a default (over-ridden in darwin.h.) */ +#ifndef TARGET_MACHO_BRANCH_ISLANDS +#define TARGET_MACHO_BRANCH_ISLANDS 0 +#endif + +/* For the Windows 64-bit ABI. */ #define TARGET_64BIT_MS_ABI (TARGET_64BIT && ix86_cfun_abi () == MS_ABI) /* Available call abi. */ diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index 98d44cf..810563e 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -65,6 +65,9 @@ } \ while (0) +/* Generate branch islands stubs if this is true. */ +extern int darwin_emit_branch_islands; + #define SUBTARGET_OVERRIDE_OPTIONS darwin_rs6000_override_options () #define C_COMMON_OVERRIDE_OPTIONS do { \ @@ -385,8 +388,6 @@ #define BLOCK_REG_PADDING(MODE, TYPE, FIRST) \ (!(FIRST) ? upward : FUNCTION_ARG_PADDING (MODE, TYPE)) -/* XXX: Darwin supports neither .quad, or .llong, but it also doesn't - support 64 bit PowerPC either, so this just keeps things happy. */ #define DOUBLE_INT_ASM_OP "\t.quad\t" /* For binary compatibility with 2.95; Darwin C APIs use bool from diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index d96c1d6..3a8c707 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -15392,7 +15392,8 @@ print_operand (FILE *file, rtx x, int code) { const char *name = XSTR (x, 0); #if TARGET_MACHO - if (MACHOPIC_INDIRECT + if (darwin_emit_branch_islands + && MACHOPIC_INDIRECT && machopic_classify_symbol (x) == MACHOPIC_UNDEFINED_FUNCTION) name = machopic_indirection_name (x, /*stub_p=*/true); #endif @@ -24482,14 +24483,6 @@ get_prev_label (tree function_name) return 0; } -#ifndef DARWIN_LINKER_GENERATES_ISLANDS -#define DARWIN_LINKER_GENERATES_ISLANDS 0 -#endif - -/* KEXTs still need branch islands. */ -#define DARWIN_GENERATE_ISLANDS (!DARWIN_LINKER_GENERATES_ISLANDS \ - || flag_mkernel || flag_apple_kext) - /* INSN is either a function call or a millicode call. It may have an unconditional jump in its delay slot. @@ -24500,7 +24493,7 @@ output_call (rtx insn, rtx *operands, int dest_operand_number, int cookie_operand_number) { static char buf[256]; - if (DARWIN_GENERATE_ISLANDS + if (darwin_emit_branch_islands && GET_CODE (operands[dest_operand_number]) == SYMBOL_REF && (INTVAL (operands[cookie_operand_number]) & CALL_LONG)) { -- cgit v1.1