When using options such as --localize-symbol, --globalize-symbol, etc,
along with the --wildcard option, prefixing a symbol name with '!'
should provide non-matching behaviour, as example the following example
is given in the manual:
--wildcard --weaken-symbol !foo --weaken-symbol fo*
which should weaken all symbols matching the pattern 'fo*', but not the
symbol 'foo'.
However, this currently does not work, the current logic will waken all
symbols matching the pattern 'fo*' AND all symbols that are not 'foo'.
The symbol 'foo' is covered by the first condition, and so is weakened,
while, other symbols, for example 'bar' will match the second condition,
and so be weakened.
This patch adjusts the logic so that a pattern prefixed with '!'
specifically DOES NOT apply the relevant change to any matching symbols,
instead of applying the change to all non-matching symbols. So this:
--weaken-symbol !foo
will ensure that the symbol 'foo' is not weakened, but says nothing
about symbols that are not 'foo'. As a result, a pattern prefixed with
'!' now only makes sense when used alongside a more wide ranging
wildcard pattern.
This change should make the wildcard matching feature more useful, with
no overall loss of functionality. The example given in the manual,
weaken all symbols matching 'fo*' except 'foo' can now be achieved, but
so too can more complex examples, such as weaken all symbols matching
'fo*' except 'foo', 'foa', and 'fob', like this:
--wildcard --weaken-symbol !foo \
--weaken-symbol !foa \
--weaken-symbol !fob \
--weaken-symbol fo*
Under the previous scheme, something as symbols as, weaken all symbols
except 'foo' could have been achieved with this:
--weaken-symbol !foo
however, this will no longer work. To achieve the same result under the
new scheme this is now required:
--weaken-symbol !foo --weaken-symbol *
binutils/ChangeLog:
* objcopy.c (is_specified_symbol_predicate): Don't stop at first
match. Non-match rules set found to FALSE.
binutils/testsuite/ChangeLog:
* binutils-all/objcopy.exp: Run new symbol tests.
(objcopy_test_symbol_manipulation): New function.
* binutils-all/symbols-1.d: New file.
* binutils-all/symbols-2.d: New file.
* binutils-all/symbols-3.d: New file.
* binutils-all/symbols-4.d: New file.
* binutils-all/symbols.s: New file.
+2015-08-07 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * objcopy.c (is_specified_symbol_predicate): Don't stop at first
+ match. Non-match rules set found to FALSE.
+
2015-08-06 Yaakov Selkowitz <yselkowi@redhat.com>
* configure: Regenerate.
if (! fnmatch (slot_name, d->name, 0))
{
d->found = TRUE;
- /* Stop traversal. */
- return 0;
+ /* Continue traversal, there might be a non-match rule. */
+ return 1;
}
}
else
{
- if (fnmatch (slot_name + 1, d->name, 0))
+ if (! fnmatch (slot_name + 1, d->name, 0))
{
- d->found = TRUE;
+ d->found = FALSE;
/* Stop traversal. */
return 0;
}
+2015-08-07 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * binutils-all/objcopy.exp: Run new symbol tests.
+ (objcopy_test_symbol_manipulation): New function.
+ * binutils-all/symbols-1.d: New file.
+ * binutils-all/symbols-2.d: New file.
+ * binutils-all/symbols-3.d: New file.
+ * binutils-all/symbols-4.d: New file.
+ * binutils-all/symbols.s: New file.
+
2015-08-05 Nick Clifton <nickc@redhat.com>
* binutils-all/objcopy.exp (keep_debug_symbols_and_check_links):
}
}
+proc objcopy_test_symbol_manipulation {} {
+ global srcdir
+ global subdir
+
+ set test_list [lsort [glob -nocomplain $srcdir/$subdir/symbols-*.d]]
+ foreach t $test_list {
+ # We need to strip the ".d", but can leave the dirname.
+ verbose [file rootname $t]
+ run_dump_test [file rootname $t]
+ }
+}
+
# ia64 specific tests
if { ([istarget "ia64-*-elf*"]
|| [istarget "ia64-*-linux*"]) } {
# ELF specific tests
if [is_elf_format] {
+ objcopy_test_symbol_manipulation
objcopy_test "ELF unknown section type" unknown.s
objcopy_test_readelf "ELF group" group.s
objcopy_test_readelf "ELF group" group-2.s
--- /dev/null
+#name: localize 'fo*' but not 'foo'
+#PROG: objcopy
+#objcopy: -w -L !foo -L fo*
+#source: symbols.s
+#DUMPPROG: nm
+#nm: -n
+
+0+ D bar
+0+ d foa
+0+ d fob
+0+ D foo
+0+ d foo1
+0+ d foo2
+
--- /dev/null
+#name: weaken 'fo*' but not 'foo'
+#PROG: objcopy
+#objcopy: -w -W !foo -W fo*
+#source: symbols.s
+#DUMPPROG: nm
+#nm: -n
+
+0+ D bar
+0+ W foa
+0+ W fob
+0+ D foo
+0+ W foo1
+0+ W foo2
+
--- /dev/null
+#name: weaken 'fo*' but not 'foo', localize foo.
+#PROG: objcopy
+#objcopy: -w -W !foo -W fo* -L foo
+#source: symbols.s
+#DUMPPROG: nm
+#nm: -n
+
+0+ D bar
+0+ W foa
+0+ W fob
+0+ d foo
+0+ W foo1
+0+ W foo2
+
--- /dev/null
+#name: weaken '*' but not 'foo' or 'bar'
+#PROG: objcopy
+#objcopy: -w -W !foo -W !bar -W *
+#source: symbols.s
+#DUMPPROG: nm
+#nm: -n
+
+0+ D bar
+0+ W foa
+0+ W fob
+0+ D foo
+0+ W foo1
+0+ W foo2
+
--- /dev/null
+ .section ".data", "aw"
+ .global foo
+ .global foo1
+ .global foo2
+ .global foa
+ .global fob
+ .global bar
+foo:
+foo1:
+foo2:
+foa:
+fob:
+bar:
+ .word 0x0
projects / deliverable / binutils-gdb.git / commitdiff
