openwrtv3/tools/mklibs/patches/005-duplicate_syms.patch
Luka Perkov 33dadd70ab mklibs: update to 0.1.34 (v2)
SVN-Revision: 32165
2012-06-10 17:07:46 +00:00

35 lines
1.3 KiB
Diff

--- 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: