aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mklibs/patches/005-duplicate_syms.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2012-06-09 21:22:37 +0000
committerLuka Perkov <luka@openwrt.org>2012-06-09 21:22:37 +0000
commit2ecd494691cb71709acc52e629397b0a95e60d80 (patch)
treea1eee13f543f18c9263cc7a7dc23bfcaf47db19d /tools/mklibs/patches/005-duplicate_syms.patch
parentfa5028ddeebf45b6c50e41974ea19418d3c23a8c (diff)
downloadupstream-2ecd494691cb71709acc52e629397b0a95e60d80.tar.gz
upstream-2ecd494691cb71709acc52e629397b0a95e60d80.tar.bz2
upstream-2ecd494691cb71709acc52e629397b0a95e60d80.zip
mklibs: update to 0.1.34
SVN-Revision: 32145
Diffstat (limited to 'tools/mklibs/patches/005-duplicate_syms.patch')
-rw-r--r--tools/mklibs/patches/005-duplicate_syms.patch39
1 files changed, 39 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..b899330f59
--- /dev/null
+++ b/tools/mklibs/patches/005-duplicate_syms.patch
@@ -0,0 +1,39 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -509,10 +509,7 @@ while 1:
+ num_unresolved = 0
+ unresolved = set()
+ for name in needed_symbols:
+- if not name in present_symbols:
+- debug(DEBUG_SPAM, "Still need: %s" % name)
+- unresolved.add(name)
+- num_unresolved = num_unresolved + 1
++ library_symbols[library][name] = symbol
+
+ debug (DEBUG_NORMAL, `len(needed_symbols)`, "symbols,",
+ `num_unresolved`, "unresolved")
+@@ -531,7 +528,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()))
+@@ -557,12 +553,10 @@ while 1:
+
+ # 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: