From: H.J. Lu Date: Fri, 27 Mar 2015 18:11:00 +0000 (+0000) Subject: Add default_binds_local_p_2 and use it for x86 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5eef8e9b024741b8d661c628643a9850616b813;p=gcc.git Add default_binds_local_p_2 and use it for x86 Protected data symbol means that it can't be pre-emptied. It doesn't mean its address won't be external. This is true for pointer to protected function. With copy relocation, address of protected data defined in the shared library may also be external. We only know that for sure at run-time. TARGET_BINDS_LOCAL_P should return false on protected data symbol. gcc/ PR target/65248 * output.h (default_binds_local_p_2): New. * varasm.c (default_binds_local_p_2): Renamed to ... (default_binds_local_p_3): This. Don't return true on protected data symbol if protected data may be external. (default_binds_local_p): Use default_binds_local_p_3. (default_binds_local_p_1): Likewise. (default_binds_local_p_2): New. * config/i386/i386.c (TARGET_BINDS_LOCAL_P): Set to default_binds_local_p_2 if TARGET_MACHO is undefined. gcc/testsuite/ PR target/65248 * gcc.target/i386/pr65248-1.c: New file. * gcc.target/i386/pr65248-2.c: Likewise. * gcc.target/i386/pr65248-3.c: Likewise. * gcc.target/i386/pr65248-4.c: Likewise. From-SVN: r221742 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0fb06d645b8..d8221f371d9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2015-03-27 H.J. Lu + + PR target/65248 + * output.h (default_binds_local_p_2): New. + * varasm.c (default_binds_local_p_2): Renamed to ... + (default_binds_local_p_3): This. Don't return true on protected + data symbol if protected data may be external. + (default_binds_local_p): Use default_binds_local_p_3. + (default_binds_local_p_1): Likewise. + (default_binds_local_p_2): New. + * config/i386/i386.c (TARGET_BINDS_LOCAL_P): Set to + default_binds_local_p_2 if TARGET_MACHO is undefined. + 2015-03-27 Jakub Jelinek PR target/65593 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 862bda529b8..744642c7e36 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -51900,6 +51900,9 @@ ix86_initialize_bounds (tree var, tree lb, tree ub, tree *stmts) #if TARGET_MACHO #undef TARGET_BINDS_LOCAL_P #define TARGET_BINDS_LOCAL_P darwin_binds_local_p +#else +#undef TARGET_BINDS_LOCAL_P +#define TARGET_BINDS_LOCAL_P default_binds_local_p_2 #endif #if TARGET_DLLIMPORT_DECL_ATTRIBUTES #undef TARGET_BINDS_LOCAL_P diff --git a/gcc/output.h b/gcc/output.h index 217d979e5de..53e47d03b3a 100644 --- a/gcc/output.h +++ b/gcc/output.h @@ -586,6 +586,7 @@ extern void default_asm_output_anchor (rtx); extern bool default_use_anchors_for_symbol_p (const_rtx); extern bool default_binds_local_p (const_tree); extern bool default_binds_local_p_1 (const_tree, int); +extern bool default_binds_local_p_2 (const_tree); extern void default_globalize_label (FILE *, const char *); extern void default_globalize_decl_name (FILE *, tree); extern void default_emit_unwind_label (FILE *, tree, int, int); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4fb0e221e83..de043af08ed 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2015-03-27 H.J. Lu + + PR target/65248 + * gcc.target/i386/pr65248-1.c: New file. + * gcc.target/i386/pr65248-2.c: Likewise. + * gcc.target/i386/pr65248-3.c: Likewise. + * gcc.target/i386/pr65248-4.c: Likewise. + 2015-03-27 Jakub Jelinek PR target/65593 diff --git a/gcc/testsuite/gcc.target/i386/pr65248-1.c b/gcc/testsuite/gcc.target/i386/pr65248-1.c new file mode 100644 index 00000000000..735adde9337 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr65248-1.c @@ -0,0 +1,17 @@ +/* { dg-do compile { target *-*-linux* } } */ +/* { dg-options "-O2 -fpic" } */ + +/* Common symbol with -fpic. */ +__attribute__((visibility("protected"))) +int xxx; + +int +foo () +{ + return xxx; +} + +/* { dg-final { scan-assembler-not "xxx\\(%rip\\)" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler "xxx@GOTPCREL" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler-not "xxx@GOTOFF" { target ia32 } } } */ +/* { dg-final { scan-assembler "xxx@GOT\\(" { target ia32 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr65248-2.c b/gcc/testsuite/gcc.target/i386/pr65248-2.c new file mode 100644 index 00000000000..af264f36a14 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr65248-2.c @@ -0,0 +1,17 @@ +/* { dg-do compile { target *-*-linux* } } */ +/* { dg-options "-O2 -fpic" } */ + +/* Weak common symbol with -fpic. */ +__attribute__((weak, visibility("protected"))) +int xxx; + +int +foo () +{ + return xxx; +} + +/* { dg-final { scan-assembler-not "xxx\\(%rip\\)" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler "xxx@GOTPCREL" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler-not "xxx@GOTOFF" { target ia32 } } } */ +/* { dg-final { scan-assembler "xxx@GOT\\(" { target ia32 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr65248-3.c b/gcc/testsuite/gcc.target/i386/pr65248-3.c new file mode 100644 index 00000000000..e7a05eac6e6 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr65248-3.c @@ -0,0 +1,17 @@ +/* { dg-do compile { target *-*-linux* } } */ +/* { dg-options "-O2 -fpic" } */ + +/* Initialized symbol with -fpic. */ +__attribute__((visibility("protected"))) +int xxx = -1; + +int +foo () +{ + return xxx; +} + +/* { dg-final { scan-assembler-not "xxx\\(%rip\\)" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler "xxx@GOTPCREL" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler-not "xxx@GOTOFF" { target ia32 } } } */ +/* { dg-final { scan-assembler "xxx@GOT\\(" { target ia32 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr65248-4.c b/gcc/testsuite/gcc.target/i386/pr65248-4.c new file mode 100644 index 00000000000..db818fc1f78 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr65248-4.c @@ -0,0 +1,17 @@ +/* { dg-do compile { target *-*-linux* } } */ +/* { dg-options "-O2 -fpic" } */ + +/* Weak initialized symbol with -fpic. */ +__attribute__((weak, visibility("protected"))) +int xxx = -1; + +int +foo () +{ + return xxx; +} + +/* { dg-final { scan-assembler-not "xxx\\(%rip\\)" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler "xxx@GOTPCREL" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler-not "xxx@GOTOFF" { target ia32 } } } */ +/* { dg-final { scan-assembler "xxx@GOT\\(" { target ia32 } } } */ diff --git a/gcc/varasm.c b/gcc/varasm.c index 752dccf935d..537a64d347a 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -6809,7 +6809,8 @@ resolution_local_p (enum ld_plugin_symbol_resolution resolution) } static bool -default_binds_local_p_2 (const_tree exp, bool shlib, bool weak_dominate) +default_binds_local_p_3 (const_tree exp, bool shlib, bool weak_dominate, + bool extern_protected_data) { /* A non-decl is an entry in the constant pool. */ if (!DECL_P (exp)) @@ -6855,6 +6856,9 @@ default_binds_local_p_2 (const_tree exp, bool shlib, bool weak_dominate) or if we have a definition for the symbol. We cannot infer visibility for undefined symbols. */ if (DECL_VISIBILITY (exp) != VISIBILITY_DEFAULT + && (TREE_CODE (exp) == FUNCTION_DECL + || !extern_protected_data + || DECL_VISIBILITY (exp) != VISIBILITY_PROTECTED) && (DECL_VISIBILITY_SPECIFIED (exp) || defined_locally)) return true; @@ -6890,13 +6894,21 @@ default_binds_local_p_2 (const_tree exp, bool shlib, bool weak_dominate) bool default_binds_local_p (const_tree exp) { - return default_binds_local_p_2 (exp, flag_shlib != 0, true); + return default_binds_local_p_3 (exp, flag_shlib != 0, true, false); +} + +/* Similar to default_binds_local_p, but protected data may be + external. */ +bool +default_binds_local_p_2 (const_tree exp) +{ + return default_binds_local_p_3 (exp, flag_shlib != 0, true, true); } bool default_binds_local_p_1 (const_tree exp, int shlib) { - return default_binds_local_p_2 (exp, shlib != 0, false); + return default_binds_local_p_3 (exp, shlib != 0, false, false); } /* Return true when references to DECL must bind to current definition in