Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32145 3c298f89-4303-0410-b956-a3cf2f4a3e73
- Loading branch information
luka
committed
Jun 9, 2012
1 parent
dd225c9
commit 71a8b79
Showing
13 changed files
with
101 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,20 @@ | ||
--- a/src/mklibs.py | ||
+++ b/src/mklibs.py | ||
@@ -500,7 +500,7 @@ while 1: | ||
--- a/src/mklibs | ||
+++ b/src/mklibs | ||
@@ -524,7 +524,7 @@ while 1: | ||
# No progress in last pass. Verify all remaining symbols are weak. | ||
for name in unresolved: | ||
if not needed_symbols[name].weak: | ||
- raise "Unresolvable symbol %s" % name | ||
- raise Exception("Unresolvable symbol %s" % name) | ||
+ print "WARNING: Unresolvable symbol %s" % name | ||
break | ||
|
||
previous_pass_unresolved = unresolved | ||
@@ -533,10 +533,7 @@ while 1: | ||
|
||
# which symbols are actually used from each lib | ||
@@ -559,7 +559,7 @@ while 1: | ||
for name in needed_symbols: | ||
- if not name in symbol_provider: | ||
- if not needed_symbols[name].weak: | ||
- raise "No library provides non-weak %s" % name | ||
- else: | ||
+ if name in symbol_provider: | ||
if not name in symbol_provider: | ||
if not needed_symbols[name].weak: | ||
- raise Exception("No library provides non-weak %s" % name) | ||
+ print "WARNING: Unresolvable symbol %s" % name | ||
else: | ||
lib = symbol_provider[name] | ||
library_symbols_used[lib].add(library_symbols[lib][name]) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
tools/mklibs/patches/007-uclibc_init.patch → tools/mklibs/patches/006-uclibc_init.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
tools/mklibs/patches/008-gc_sections.patch → tools/mklibs/patches/007-gc_sections.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- a/src/mklibs-readelf/main.cpp | ||
+++ b/src/mklibs-readelf/main.cpp | ||
@@ -84,7 +84,7 @@ static void process_symbols_provided (co | ||
continue; | ||
if (shndx == SHN_UNDEF || shndx == SHN_ABS) | ||
continue; | ||
- if (type != STT_NOTYPE && type != STT_OBJECT && type != STT_FUNC && type != STT_GNU_IFUNC && type != STT_COMMON && type != STT_TLS) | ||
+ if (type != STT_NOTYPE && type != STT_OBJECT && type != STT_FUNC && type != STT_COMMON && type != STT_TLS) | ||
continue; | ||
if (!name.size()) | ||
continue; | ||
@@ -115,7 +115,7 @@ static void process_symbols_undefined (c | ||
continue; | ||
if (shndx != SHN_UNDEF) | ||
continue; | ||
- if (type != STT_NOTYPE && type != STT_OBJECT && type != STT_FUNC && type != STT_GNU_IFUNC && type != STT_COMMON && type != STT_TLS) | ||
+ if (type != STT_NOTYPE && type != STT_OBJECT && type != STT_FUNC && type != STT_COMMON && type != STT_TLS) | ||
continue; | ||
if (!name.size()) | ||
continue; |