X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fmklibs%2Fpatches%2F006-duplicate_syms.patch;fp=tools%2Fmklibs%2Fpatches%2F006-duplicate_syms.patch;h=0000000000000000000000000000000000000000;hb=33dadd70ab731f48bac9e48bca73cd354a933db4;hp=3f39ee5bb48cae0354d96c7df6a94465abe8e537;hpb=d8bea7da9ac837eb7d23183ad58614120dd7d903;p=openwrt%2Fstaging%2Fstintel.git 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: