diff options
author | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-10 17:07:46 +0000 |
---|---|---|
committer | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-10 17:07:46 +0000 |
commit | 3060881070cec7e44f64aab8b61c15d6d117ca5f (patch) | |
tree | 748a052f3a88a3494e1ec1d97312b26cc393aec1 /tools/mklibs/patches/005-duplicate_syms.patch | |
parent | 3d48f3f57b5e98ed485c7e8b99e49d485a06bca9 (diff) |
[tools] mklibs: update to 0.1.34 (v2)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32165 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mklibs/patches/005-duplicate_syms.patch')
-rw-r--r-- | tools/mklibs/patches/005-duplicate_syms.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/tools/mklibs/patches/005-duplicate_syms.patch b/tools/mklibs/patches/005-duplicate_syms.patch new file mode 100644 index 0000000000..8428abfc9a --- /dev/null +++ b/tools/mklibs/patches/005-duplicate_syms.patch @@ -0,0 +1,35 @@ +--- a/src/mklibs ++++ b/src/mklibs +@@ -531,7 +531,6 @@ while 1: + + library_symbols = {} + library_symbols_used = {} +- symbol_provider = {} + + # WORKAROUND: Always add libgcc on old-abi arm + header = elf_header(find_lib(libraries.copy().pop())) +@@ -549,20 +548,13 @@ while 1: + library_symbols_used[library] = set() + for symbol in symbols: + for name in symbol.base_names(): +- if name in symbol_provider: +- debug(DEBUG_SPAM, "duplicate symbol %s in %s and %s" % (symbol, symbol_provider[name], library)) +- else: +- library_symbols[library][name] = symbol +- symbol_provider[name] = library ++ library_symbols[library][name] = symbol + + # which symbols are actually used from each lib + for name in needed_symbols: +- if not name in symbol_provider: +- if not needed_symbols[name].weak: +- print "WARNING: Unresolvable symbol %s" % name +- else: +- lib = symbol_provider[name] +- library_symbols_used[lib].add(library_symbols[lib][name]) ++ for lib in libraries: ++ if name in library_symbols[lib]: ++ library_symbols_used[lib].add(library_symbols[lib][name]) + + # reduce libraries + for library in libraries: |