aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mklibs
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-10-19 23:26:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-10-19 23:26:00 +0000
commit57d29edb07ae100abbe63d40074b8ab2bc7ebe99 (patch)
tree17ee7bfa10b3c4bfd77721eef3cc2cb2e5433358 /tools/mklibs
parenteeadbde8ea70b95603f1848a0cfe57ccb9197263 (diff)
downloadupstream-57d29edb07ae100abbe63d40074b8ab2bc7ebe99.tar.gz
upstream-57d29edb07ae100abbe63d40074b8ab2bc7ebe99.tar.bz2
upstream-57d29edb07ae100abbe63d40074b8ab2bc7ebe99.zip
mklibs: handle duplicate symbols properly
SVN-Revision: 18084
Diffstat (limited to 'tools/mklibs')
-rw-r--r--tools/mklibs/patches/006-duplicate_syms.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/tools/mklibs/patches/006-duplicate_syms.patch b/tools/mklibs/patches/006-duplicate_syms.patch
new file mode 100644
index 0000000000..3f39ee5bb4
--- /dev/null
+++ b/tools/mklibs/patches/006-duplicate_syms.patch
@@ -0,0 +1,32 @@
+--- a/src/mklibs.py
++++ b/src/mklibs.py
+@@ -507,7 +507,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()))
+@@ -525,17 +524,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 name in symbol_provider:
+- 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: