tools/mklibs/patches/005-duplicate_syms.patch

   1 --- a/src/mklibs
   2 +++ b/src/mklibs
   3 @@ -509,10 +509,7 @@ while 1:
   4      num_unresolved = 0
   5      unresolved = set()
   6      for name in needed_symbols:
   7 -        if not name in present_symbols:
   8 -            debug(DEBUG_SPAM, "Still need: %s" % name)
   9 -            unresolved.add(name)
  10 -            num_unresolved = num_unresolved + 1
  11 +        library_symbols[library][name] = symbol
  12
  13      debug (DEBUG_NORMAL, `len(needed_symbols)`, "symbols,",
  14             `num_unresolved`, "unresolved")
  15 @@ -531,7 +528,6 @@ while 1:
  16
  17      library_symbols = {}
  18      library_symbols_used = {}
  19 -    symbol_provider = {}
  20
  21      # WORKAROUND: Always add libgcc on old-abi arm
  22      header = elf_header(find_lib(libraries.copy().pop()))
  23 @@ -557,12 +553,10 @@ while 1:
  24
  25      # which symbols are actually used from each lib
  26      for name in needed_symbols:
  27 -        if not name in symbol_provider:
  28 -            if not needed_symbols[name].weak:
  29 -                print "WARNING: Unresolvable symbol %s" % name
  30 -        else:
  31 -            lib = symbol_provider[name]
  32 -            library_symbols_used[lib].add(library_symbols[lib][name])
  33 +        for lib in libraries:
  34 +            if name in library_symbols[lib]:
  35 +                library_symbols_used[lib].add(library_symbols[lib][name])
  36 +
  37
  38      # reduce libraries
  39      for library in libraries: