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/006-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/006-duplicate_syms.patch')
-rw-r--r-- | tools/mklibs/patches/006-duplicate_syms.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/tools/mklibs/patches/006-duplicate_syms.patch b/tools/mklibs/patches/006-duplicate_syms.patch deleted file mode 100644 index 3f39ee5bb4..0000000000 --- a/tools/mklibs/patches/006-duplicate_syms.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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: |