+2015-04-11 H.J. Lu <hongjiu.lu@intel.com>
+
+ * elf32-i386.c (elf_i386_relocate_section): Replace SYMBOLIC_BIND
+ with SYMBOL_REFERENCES_LOCAL when checking R_386_GOTOFF against
+ protected data symbol when building shared library.
+ * elf64-x86-64.c (elf_x86_64_relocate_section): Check
+ R_X86_64_GOTOFF64 against undefined symbol and replace
+ SYMBOLIC_BIND with SYMBOL_REFERENCES_LOCAL when checking
+ R_X86_64_GOTOFF64 against protected data symbol when building
+ shared library.
+
2015-04-10 H.J. Lu <hongjiu.lu@intel.com>
PR ld/pr17709
/* Check to make sure it isn't a protected function or data
symbol for shared library since it may not be local when
used as function address or with copy relocation. We also
- need to make sure that a symbol is defined locally. */
+ need to make sure that a symbol is referenced locally. */
if (info->shared && h)
{
if (!h->def_regular)
return FALSE;
}
else if (!info->executable
- && !SYMBOLIC_BIND (info, h)
+ && !SYMBOL_REFERENCES_LOCAL (info, h)
&& (h->type == STT_FUNC
|| h->type == STT_OBJECT)
&& ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
/* Check to make sure it isn't a protected function or data
symbol for shared library since it may not be local when
- used as function address or with copy relocation. */
- if (!info->executable
- && h
- && !SYMBOLIC_BIND (info, h)
- && h->def_regular
- && (h->type == STT_FUNC
- || h->type == STT_OBJECT)
- && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
+ used as function address or with copy relocation. We also
+ need to make sure that a symbol is referenced locally. */
+ if (info->shared && h)
{
- (*_bfd_error_handler)
- (_("%B: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used when making a shared object"),
- input_bfd,
- h->type == STT_FUNC ? "function" : "data",
- h->root.root.string);
- bfd_set_error (bfd_error_bad_value);
+ if (!h->def_regular)
+ {
+ const char *v;
+
+ switch (ELF_ST_VISIBILITY (h->other))
+ {
+ case STV_HIDDEN:
+ v = _("hidden symbol");
+ break;
+ case STV_INTERNAL:
+ v = _("internal symbol");
+ break;
+ case STV_PROTECTED:
+ v = _("protected symbol");
+ break;
+ default:
+ v = _("symbol");
+ break;
+ }
+
+ (*_bfd_error_handler)
+ (_("%B: relocation R_X86_64_GOTOFF64 against undefined %s `%s' can not be used when making a shared object"),
+ input_bfd, v, h->root.root.string);
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+ else if (!info->executable
+ && !SYMBOL_REFERENCES_LOCAL (info, h)
+ && (h->type == STT_FUNC
+ || h->type == STT_OBJECT)
+ && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
+ {
+ (*_bfd_error_handler)
+ (_("%B: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used when making a shared object"),
+ input_bfd,
+ h->type == STT_FUNC ? "function" : "data",
+ h->root.root.string);
+ bfd_set_error (bfd_error_bad_value);
return FALSE;
+ }
}
/* Note that sgot is not involved in this
+2015-04-11 H.J. Lu <hongjiu.lu@intel.com>
+
+ * ld-i386/i386.exp: Run protected6a.
+ * ld-i386/protected6.d: Renamed to ...
+ * ld-i386/protected6a.d: This.
+ * ld-x86-64/hidden4.d: New file.
+ * ld-x86-64/hidden4.s: Likewise.
+ * ld-x86-64/hidden5.d: Likewise.
+ * ld-x86-64/hidden5.s: Likewise.
+ * ld-x86-64/protected6.d: Renamed to ...
+ * ld-x86-64/protected6a.d: This.
+ * ld-x86-64/x86-64.exp: Run hidden4, hidden5, protected6a,
+ protected7a and protected7b.
+
2015-04-10 H.J. Lu <hongjiu.lu@intel.com>
PR ld/pr17709
run_dump_test "protected3"
run_dump_test "protected4"
run_dump_test "protected5"
-run_dump_test "protected6"
+run_dump_test "protected6a"
run_dump_test "tlspie1"
run_dump_test "tlspie2"
run_dump_test "nogot1"
+#source: protected6.s
#as: --32
#ld: -shared -melf_i386
#error: .*relocation R_386_GOTOFF against protected data `foo' can not be used when making a shared object
--- /dev/null
+#as: --64
+#ld: -shared -melf_x86_64
+#error: .*relocation R_X86_64_GOTOFF64 against undefined hidden symbol `foo' can not be used when making a shared object
--- /dev/null
+ .text
+.globl bar
+ .type bar, @function
+bar:
+ movabsq $foo@GOTOFF, %rax
+ .size bar, .-bar
+ .weak foo
+ .hidden foo
--- /dev/null
+#as: --64
+#ld: -shared -melf_x86_64
+#error: .*relocation R_X86_64_GOTOFF64 against undefined hidden symbol `foo' can not be used when making a shared object
--- /dev/null
+ .text
+.globl bar
+ .type bar, @function
+bar:
+ movabsq $foo@GOTOFF, %rax
+ .size bar, .-bar
+ .hidden foo
+#source: protected6.s
#as: --64
#ld: -shared -melf_x86_64
#error: .*relocation R_X86_64_GOTOFF64 against protected data `foo' can not be used when making a shared object
run_dump_test "hidden1"
run_dump_test "hidden2"
run_dump_test "hidden3"
+run_dump_test "hidden4"
+run_dump_test "hidden5"
run_dump_test "protected1"
run_dump_test "protected2"
run_dump_test "protected2-l1om"
run_dump_test "protected3-l1om"
run_dump_test "protected4"
run_dump_test "protected5"
-run_dump_test "protected6"
+run_dump_test "protected6a"
run_dump_test "protected7a"
run_dump_test "protected7b"
run_dump_test "tlsle1"