PR target/65248: Copy relocation against protected symbol doesn't work

Message ID	20150306134217.GA21141@intel.com
State	New
Headers	show Return-Path: <gcc-patches-return-393125-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=oQLSqFMNCYw37Oej7 6BgNAoBzVRlYTSahYHg24m1PVNZs8jf1hPyQ4DyGVVw5aLqfZKgFif8hS14YJ/sf 0r4pAChc850tc0cCiY2szOkdQkF0Uhy0wQiFHGBa+3M2y4ku/3/KvtWPmRzUlFzD aOLuLFQJPCIdEEyWrFp9aIO1KU= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org Date: Fri, 6 Mar 2015 05:42:17 -0800 From: "H.J. Lu" <hongjiu.lu@intel.com> To: Uros Bizjak <ubizjak@gmail.com> Cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] PR target/65248: Copy relocation against protected symbol doesn't work Message-ID: <20150306134217.GA21141@intel.com> Reply-To: "H.J. Lu" <hjl.tools@gmail.com> References: <20150306013151.GA19444@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150306013151.GA19444@intel.com> User-Agent: Mutt/1.5.23 (2014-03-12)

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index ab8f03a..41a487a 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -51878,6 +51878,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 217d979..53e47d0 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/gcc.target/i386/pr65248-1.c b/gcc/testsuite/gcc.target/i386/pr65248-1.c new file mode 100644 index 0000000..7b0d2af --- /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 "movl\[ \t\]xxx\\(%rip\\), %eax" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler "xxx@GOTPCREL" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler-not "movl\[ \t\]xxx@GOTOFF\\(%\[^,\]*\\), %eax" { target ia32 } } } */ +/* { dg-final { scan-assembler "movl\[ \t\]xxx@GOT\\(%\[^,\]*\\), %eax" { 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 0000000..78efa34 --- /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 "movl\[ \t\]xxx\\(%rip\\), %eax" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler "xxx@GOTPCREL" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler-not "movl\[ \t\]xxx@GOTOFF\\(%\[^,\]*\\), %eax" { target ia32 } } } */ +/* { dg-final { scan-assembler "movl\[ \t\]xxx@GOT\\(%\[^,\]*\\), %eax" { 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 0000000..a126a26 --- /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 "movl\[ \t\]xxx\\(%rip\\), %eax" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler "xxx@GOTPCREL" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler-not "movl\[ \t\]xxx@GOTOFF\\(%\[^,\]*\\), %eax" { target ia32 } } } */ +/* { dg-final { scan-assembler "movl\[ \t\]xxx@GOT\\(%\[^,\]*\\), %eax" { 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 0000000..ab730f7 --- /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 "movl\[ \t\]xxx\\(%rip\\), %eax" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler "xxx@GOTPCREL" { target { ! ia32 } } } } */ +/* { dg-final { scan-assembler-not "movl\[ \t\]xxx@GOTOFF\\(%\[^,\]*\\), %eax" { target ia32 } } } */ +/* { dg-final { scan-assembler "movl\[ \t\]xxx@GOT\\(%\[^,\]*\\), %eax" { target ia32 } } } */ diff --git a/gcc/varasm.c b/gcc/varasm.c index 8173207..87ac646 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -6803,7 +6803,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)) @@ -6849,6 +6850,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; @@ -6884,13 +6888,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

PR target/65248: Copy relocation against protected symbol doesn't work

Commit Message

Comments

Patch