aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mklibs/patches/006-duplicate_syms.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-06-10 15:09:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-06-10 15:09:09 +0000
commit1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4 (patch)
treeee5ebc2ee6dec8c0add30dfadd46b55f2312f9a9 /tools/mklibs/patches/006-duplicate_syms.patch
parente2be7290b1cd0e6061d7d0f982ac5da13ff1a685 (diff)
downloadupstream-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.tar.gz
upstream-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.tar.bz2
upstream-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.zip
Revert "[tools] mklibs: update to 0.1.34"
Too much broken, needs to be reworked SVN-Revision: 32163
Diffstat (limited to 'tools/mklibs/patches/006-duplicate_syms.patch')
-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: