diff options
| author | Luka Perkov <luka@openwrt.org> | 2012-06-09 21:22:37 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2012-06-09 21:22:37 +0000 |
| commit | df12c60f700b6178609aaea7ac6058c398d4565c (patch) | |
| tree | 6afffc145f45846126e51a65c5710b46b343b573 /tools/mklibs/patches/005-duplicate_syms.patch | |
| parent | c22aced8ad60f1c2720da5acb6ddcd4c396a9541 (diff) | |
| download | master-187ad058-df12c60f700b6178609aaea7ac6058c398d4565c.tar.gz master-187ad058-df12c60f700b6178609aaea7ac6058c398d4565c.tar.bz2 master-187ad058-df12c60f700b6178609aaea7ac6058c398d4565c.zip | |
[tools] mklibs: update to 0.1.34
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32145 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mklibs/patches/005-duplicate_syms.patch')
| -rw-r--r-- | tools/mklibs/patches/005-duplicate_syms.patch | 39 |
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: |