diff options
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 0000000..8428abf --- /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: |