summaryrefslogtreecommitdiff
path: root/ld/emultempl/solaris2.em
diff options
context:
space:
mode:
authorRainer Orth <ro@TechFak.Uni-Bielefeld.DE>2010-10-12 18:39:35 +0000
committerRainer Orth <ro@TechFak.Uni-Bielefeld.DE>2010-10-12 18:39:35 +0000
commit7485fee9e5f389f33ec3b5a110da6a2c093b4737 (patch)
tree25e710833cfe5b0b08e704524ea1b92698003c29 /ld/emultempl/solaris2.em
parentd7e9deda149e8023bcc47a2792a138919dce8053 (diff)
downloadbinutils-redhat-7485fee9e5f389f33ec3b5a110da6a2c093b4737.tar.gz
* emultempl/solaris2.em (elf_solaris2_before_allocation): Renamed
basever_syms to global_syms. Emit global_syms into .dynamic section for all executables and shared objects. (elf_solaris2_after_allocation): New function. (LDEMUL_AFTER_ALLOCATION): Use it. * emulparams/solaris2.sh: New file. * emulparams/elf32_sparc_sol2.sh: Use it. * emulparams/elf64_sparc_sol2.sh: Likewise. * emulparams/elf_i386_sol2.sh: Likewise. * emulparams/elf_x86_64_sol2.sh: Likewise. * Makefile.am (eelf32_sparc_sol2.c): Depend on $(srcdir)/emulparams/solaris2.sh. (eelf64_sparc_sol2.c): Likewise. (eelf_x86_64_sol2.c): Likewise. (eelf_i386_sol2.c): Likewise. * Makefile.in: Regenerate.
Diffstat (limited to 'ld/emultempl/solaris2.em')
-rw-r--r--ld/emultempl/solaris2.em72
1 files changed, 59 insertions, 13 deletions
diff --git a/ld/emultempl/solaris2.em b/ld/emultempl/solaris2.em
index aa578d21d0..0b773751ef 100644
--- a/ld/emultempl/solaris2.em
+++ b/ld/emultempl/solaris2.em
@@ -31,16 +31,17 @@ fragment <<EOF
#define TARGET_IS_${EMULATION_NAME}
-/* The Solaris 2 ABI requires some symbols to always be bound to the base
- version in a shared object.
+/* The Solaris 2 ABI requires some global symbols to be present in the
+ .dynsym table of executables and shared objects. If generating a
+ versioned shared object, they must always be bound to the base version.
Cf. Linker and Libraries Guide, Ch. 2, Link-Editor, Generating the Output
File, p.63. */
static void
elf_solaris2_before_allocation (void)
{
- /* Symbols required to be bound to the base version. */
- static const char *basever_syms[] = {
+ /* Global symbols required by the Solaris 2 ABI. */
+ static const char *global_syms[] = {
"_DYNAMIC",
"_GLOBAL_OFFSET_TABLE_",
"_PROCEDURE_LINKAGE_TABLE_",
@@ -51,6 +52,28 @@ elf_solaris2_before_allocation (void)
};
const char **sym;
+ /* Do this for both executables and shared objects. */
+ if (!link_info.relocatable)
+ {
+ for (sym = global_syms; *sym != NULL; sym++)
+ {
+ struct elf_link_hash_entry *h;
+
+ /* Lookup symbol. */
+ h = elf_link_hash_lookup (elf_hash_table (&link_info), *sym,
+ FALSE, FALSE, FALSE);
+ if (h == NULL)
+ continue;
+
+ /* Undo the hiding done by _bfd_elf_define_linkage_sym. */
+ h->forced_local = 0;
+ h->other &= ~STV_HIDDEN;
+
+ /* Emit it into the .dynamic section, too. */
+ bfd_elf_link_record_dynamic_symbol (&link_info, h);
+ }
+ }
+
/* Only do this if emitting a shared object and versioning is in place. */
if (link_info.shared
&& (lang_elf_version_info != NULL || link_info.create_default_symver))
@@ -59,7 +82,7 @@ elf_solaris2_before_allocation (void)
struct bfd_elf_version_tree *basever;
const char *soname;
- for (sym = basever_syms; *sym != NULL; sym++)
+ for (sym = global_syms; *sym != NULL; sym++)
{
/* Create a version pattern for this symbol. Some of them start
off as local, others as global, so try both. */
@@ -80,8 +103,32 @@ elf_solaris2_before_allocation (void)
lang_register_vers_node (soname, basever, NULL);
/* Enforce base version. The encoded vd_ndx is vernum + 1. */
basever->vernum = 0;
+ }
- for (sym = basever_syms; *sym != NULL; sym++)
+ gld${EMULATION_NAME}_before_allocation ();
+}
+
+/* The Solaris 2 ABI requires two local symbols to be emitted for every
+ executable and shared object.
+
+ Cf. Linker and Libraries Guide, Ch. 2, Link-Editor, Generating the Output
+ File, p.63. */
+static void
+elf_solaris2_after_allocation (void)
+{
+ /* Local symbols required by the Solaris 2 ABI. Already emitted by
+ emulparams/solaris2.sh. */
+ static const char *local_syms[] = {
+ "_START_",
+ "_END_",
+ NULL
+ };
+ const char **sym;
+
+ /* Do this for both executables and shared objects. */
+ if (!link_info.relocatable)
+ {
+ for (sym = local_syms; *sym != NULL; sym++)
{
struct elf_link_hash_entry *h;
@@ -91,18 +138,17 @@ elf_solaris2_before_allocation (void)
if (h == NULL)
continue;
- /* Undo the hiding done by _bfd_elf_define_linkage_sym. */
- h->forced_local = 0;
- h->other &= ~STV_HIDDEN;
-
- /* Emit it into the .dynamic section, too. */
- bfd_elf_link_record_dynamic_symbol (&link_info, h);
+ /* Turn it local. */
+ h->forced_local = 1;
+ /* Type should be STT_OBJECT, not STT_NOTYPE. */
+ h->type = STT_OBJECT;
}
}
- gld${EMULATION_NAME}_before_allocation ();
+ gld${EMULATION_NAME}_after_allocation ();
}
EOF
LDEMUL_BEFORE_ALLOCATION=elf_solaris2_before_allocation
+LDEMUL_AFTER_ALLOCATION=elf_solaris2_after_allocation