diff options
author | Alan Modra <amodra@gmail.com> | 2008-11-26 01:04:17 +0000 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2008-11-26 01:04:17 +0000 |
commit | ae5a359786fb21bf95678a4e9eebf2ff90114c7a (patch) | |
tree | 553563478a9db484d0305122e3f15748073bfb1d /ld | |
parent | 6cf7d91b7e79070a10ad6012559ac9adac60499a (diff) | |
download | binutils-ae5a359786fb21bf95678a4e9eebf2ff90114c7a.zip binutils-ae5a359786fb21bf95678a4e9eebf2ff90114c7a.tar.gz binutils-ae5a359786fb21bf95678a4e9eebf2ff90114c7a.tar.bz2 |
include/
PR 7047
* bfdlink.h (struct bfd_elf_version_expr): Delete "symbol".
Add "literal".
bfd/
PR 7047
* configure.in: Bump version.
* configure: Regenerate.
* elflink.c (_bfd_elf_link_assign_sym_version): Continue matching
against version nodes when a global match is a wildcard. Similarly
continue matching on local wildcard matches, rather than only
continuing for "*". Have any global wildcard match override a
local wildcard match. Correct logic hiding unversioned symbol.
(bfd_elf_size_dynamic_sections): Update for changes to struct
bfd_elf_version_expr.
ld/
PR 7047
* emultempl/ppc64elf.em (gld${EMULATION_NAME}_new_vers_pattern): Update
for changes to struct bfd_elf_version_expr.
* ldlang.c (lang_vers_match, version_expr_head_hash): Likewise.
(version_expr_head_eq, lang_finalize_version_expr_head): Likewise.
(lang_register_vers_node): Likewise.
(lang_new_vers_pattern): Likewise. Ensure "literal" is set when
no glob chars found in "pattern".
(realsymbol): Correct backslash quote logic.
* ld.texinfo (VERSION): Warn about global wildcards.
Diffstat (limited to 'ld')
-rw-r--r-- | ld/ChangeLog | 13 | ||||
-rw-r--r-- | ld/emultempl/ppc64elf.em | 25 | ||||
-rw-r--r-- | ld/ld.texinfo | 6 | ||||
-rw-r--r-- | ld/ldlang.c | 73 |
4 files changed, 65 insertions, 52 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 4e93eb2..e9cf92d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,16 @@ +2008-11-26 Alan Modra <amodra@bigpond.net.au> + + PR 7047 + * emultempl/ppc64elf.em (gld${EMULATION_NAME}_new_vers_pattern): Update + for changes to struct bfd_elf_version_expr. + * ldlang.c (lang_vers_match, version_expr_head_hash): Likewise. + (version_expr_head_eq, lang_finalize_version_expr_head): Likewise. + (lang_register_vers_node): Likewise. + (lang_new_vers_pattern): Likewise. Ensure "literal" is set when + no glob chars found in "pattern". + (realsymbol): Correct backslash quote logic. + * ld.texinfo (VERSION): Warn about global wildcards. + 2008-11-24 Alan Modra <amodra@bigpond.net.au> * ldlang.c (lang_record_phdrs): Don't add orphans to PT_INTERP header. diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em index 9a49fa5..eff8dff 100644 --- a/ld/emultempl/ppc64elf.em +++ b/ld/emultempl/ppc64elf.em @@ -416,29 +416,18 @@ gld${EMULATION_NAME}_new_vers_pattern (struct bfd_elf_version_expr *entry) char *dot_pat; if (!dotsyms - || (entry->pattern != NULL - && (entry->pattern[0] == '*' || entry->pattern[0] == '.'))) + || entry->pattern[0] == '.' + || (!entry->literal && entry->pattern[0] == '*')) return entry; dot_entry = xmalloc (sizeof *dot_entry); *dot_entry = *entry; dot_entry->next = entry; - if (entry->pattern != NULL) - { - len = strlen (entry->pattern) + 2; - dot_pat = xmalloc (len); - dot_pat[0] = '.'; - memcpy (dot_pat + 1, entry->pattern, len - 1); - dot_entry->pattern = dot_pat; - } - if (entry->symbol != NULL) - { - len = strlen (entry->symbol) + 2; - dot_pat = xmalloc (len); - dot_pat[0] = '.'; - memcpy (dot_pat + 1, entry->symbol, len - 1); - dot_entry->symbol = dot_pat; - } + len = strlen (entry->pattern) + 2; + dot_pat = xmalloc (len); + dot_pat[0] = '.'; + memcpy (dot_pat + 1, entry->pattern, len - 1); + dot_entry->pattern = dot_pat; return dot_entry; } diff --git a/ld/ld.texinfo b/ld/ld.texinfo index 83c8ac4..4e8cf8a 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -4561,7 +4561,11 @@ When the linker finds a symbol defined in a library which is not specifically bound to a version node, it will effectively bind it to an unspecified base version of the library. You can bind all otherwise unspecified symbols to a given version node by using @samp{global: *;} -somewhere in the version script. +somewhere in the version script. Note that it's slightly crazy to use +wildcards in a global spec except on the last version node. Global +wildcards elsewhere run the risk of accidentally adding symbols to the +set exported for an old version. That's wrong since older versions +ought to have a fixed set of symbols. The names of the version nodes have no specific meaning other than what they might suggest to the person reading them. The @samp{2.0} version diff --git a/ld/ldlang.c b/ld/ldlang.c index 6668c59..855e795 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -6989,7 +6989,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, java_sym = sym; } - if (head->htab && (prev == NULL || prev->symbol)) + if (head->htab && (prev == NULL || prev->literal)) { struct bfd_elf_version_expr e; @@ -6998,9 +6998,9 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, case 0: if (head->mask & BFD_ELF_VERSION_C_TYPE) { - e.symbol = sym; + e.pattern = sym; expr = htab_find (head->htab, &e); - while (expr && strcmp (expr->symbol, sym) == 0) + while (expr && strcmp (expr->pattern, sym) == 0) if (expr->mask == BFD_ELF_VERSION_C_TYPE) goto out_ret; else @@ -7010,9 +7010,9 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, case BFD_ELF_VERSION_C_TYPE: if (head->mask & BFD_ELF_VERSION_CXX_TYPE) { - e.symbol = cxx_sym; + e.pattern = cxx_sym; expr = htab_find (head->htab, &e); - while (expr && strcmp (expr->symbol, cxx_sym) == 0) + while (expr && strcmp (expr->pattern, cxx_sym) == 0) if (expr->mask == BFD_ELF_VERSION_CXX_TYPE) goto out_ret; else @@ -7022,9 +7022,9 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, case BFD_ELF_VERSION_CXX_TYPE: if (head->mask & BFD_ELF_VERSION_JAVA_TYPE) { - e.symbol = java_sym; + e.pattern = java_sym; expr = htab_find (head->htab, &e); - while (expr && strcmp (expr->symbol, java_sym) == 0) + while (expr && strcmp (expr->pattern, java_sym) == 0) if (expr->mask == BFD_ELF_VERSION_JAVA_TYPE) goto out_ret; else @@ -7037,7 +7037,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, } /* Finally, try the wildcards. */ - if (prev == NULL || prev->symbol) + if (prev == NULL || prev->literal) expr = head->remaining; else expr = prev->next; @@ -7070,7 +7070,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, } /* Return NULL if the PATTERN argument is a glob pattern, otherwise, - return a string pointing to the symbol name. */ + return a pointer to the symbol name with any backslash quotes removed. */ static const char * realsymbol (const char *pattern) @@ -7083,22 +7083,24 @@ realsymbol (const char *pattern) { /* It is a glob pattern only if there is no preceding backslash. */ - if (! backslash && (*p == '?' || *p == '*' || *p == '[')) - { - free (symbol); - return NULL; - } - if (backslash) { /* Remove the preceding backslash. */ *(s - 1) = *p; + backslash = FALSE; changed = TRUE; } else - *s++ = *p; + { + if (*p == '?' || *p == '*' || *p == '[') + { + free (symbol); + return NULL; + } - backslash = *p == '\\'; + *s++ = *p; + backslash = *p == '\\'; + } } if (changed) @@ -7127,10 +7129,15 @@ lang_new_vers_pattern (struct bfd_elf_version_expr *orig, ret = xmalloc (sizeof *ret); ret->next = orig; - ret->pattern = literal_p ? NULL : new; ret->symver = 0; ret->script = 0; - ret->symbol = literal_p ? new : realsymbol (new); + ret->literal = TRUE; + ret->pattern = literal_p ? new : realsymbol (new); + if (ret->pattern == NULL) + { + ret->pattern = new; + ret->literal = FALSE; + } if (lang == NULL || strcasecmp (lang, "C") == 0) ret->mask = BFD_ELF_VERSION_C_TYPE; @@ -7174,7 +7181,7 @@ version_expr_head_hash (const void *p) { const struct bfd_elf_version_expr *e = p; - return htab_hash_string (e->symbol); + return htab_hash_string (e->pattern); } static int @@ -7183,7 +7190,7 @@ version_expr_head_eq (const void *p1, const void *p2) const struct bfd_elf_version_expr *e1 = p1; const struct bfd_elf_version_expr *e2 = p2; - return strcmp (e1->symbol, e2->symbol) == 0; + return strcmp (e1->pattern, e2->pattern) == 0; } static void @@ -7195,7 +7202,7 @@ lang_finalize_version_expr_head (struct bfd_elf_version_expr_head *head) for (e = head->list; e; e = e->next) { - if (e->symbol) + if (e->literal) count++; head->mask |= e->mask; } @@ -7209,7 +7216,7 @@ lang_finalize_version_expr_head (struct bfd_elf_version_expr_head *head) for (e = head->list; e; e = next) { next = e->next; - if (!e->symbol) + if (!e->literal) { *remaining_loc = e; remaining_loc = &e->next; @@ -7234,14 +7241,14 @@ lang_finalize_version_expr_head (struct bfd_elf_version_expr_head *head) last = e1; e1 = e1->next; } - while (e1 && strcmp (e1->symbol, e->symbol) == 0); + while (e1 && strcmp (e1->pattern, e->pattern) == 0); if (last == NULL) { /* This is a duplicate. */ /* FIXME: Memory leak. Sometimes pattern is not xmalloced alone, but in larger chunk of memory. */ - /* free (e->symbol); */ + /* free (e->pattern); */ free (e); } else @@ -7305,18 +7312,18 @@ lang_register_vers_node (const char *name, { struct bfd_elf_version_expr *e2; - if (t->locals.htab && e1->symbol) + if (t->locals.htab && e1->literal) { e2 = htab_find (t->locals.htab, e1); - while (e2 && strcmp (e1->symbol, e2->symbol) == 0) + while (e2 && strcmp (e1->pattern, e2->pattern) == 0) { if (e1->mask == e2->mask) einfo (_("%X%P: duplicate expression `%s'" - " in version information\n"), e1->symbol); + " in version information\n"), e1->pattern); e2 = e2->next; } } - else if (!e1->symbol) + else if (!e1->literal) for (e2 = t->locals.remaining; e2 != NULL; e2 = e2->next) if (strcmp (e1->pattern, e2->pattern) == 0 && e1->mask == e2->mask) @@ -7331,19 +7338,19 @@ lang_register_vers_node (const char *name, { struct bfd_elf_version_expr *e2; - if (t->globals.htab && e1->symbol) + if (t->globals.htab && e1->literal) { e2 = htab_find (t->globals.htab, e1); - while (e2 && strcmp (e1->symbol, e2->symbol) == 0) + while (e2 && strcmp (e1->pattern, e2->pattern) == 0) { if (e1->mask == e2->mask) einfo (_("%X%P: duplicate expression `%s'" " in version information\n"), - e1->symbol); + e1->pattern); e2 = e2->next; } } - else if (!e1->symbol) + else if (!e1->literal) for (e2 = t->globals.remaining; e2 != NULL; e2 = e2->next) if (strcmp (e1->pattern, e2->pattern) == 0 && e1->mask == e2->mask) |