diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-10-19 23:26:00 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-10-19 23:26:00 +0000 |
| commit | e496f76ecb7b1aa5e07b2109f3c436de55dd34e5 (patch) | |
| tree | dcc9b59ced2e4a540729666cb8ecd4bd95a468d4 /tools/mklibs/patches/006-duplicate_syms.patch | |
| parent | 46f8cbd71e21c931e455453148b92ac23d6930b0 (diff) | |
| download | master-187ad058-e496f76ecb7b1aa5e07b2109f3c436de55dd34e5.tar.gz master-187ad058-e496f76ecb7b1aa5e07b2109f3c436de55dd34e5.tar.bz2 master-187ad058-e496f76ecb7b1aa5e07b2109f3c436de55dd34e5.zip | |
mklibs: handle duplicate symbols properly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18084 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, 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: |