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 | 2ecd494691cb71709acc52e629397b0a95e60d80 (patch) | |
tree | a1eee13f543f18c9263cc7a7dc23bfcaf47db19d /tools/mklibs/patches/008-uclibc_libgcc_link.patch | |
parent | fa5028ddeebf45b6c50e41974ea19418d3c23a8c (diff) | |
download | upstream-2ecd494691cb71709acc52e629397b0a95e60d80.tar.gz upstream-2ecd494691cb71709acc52e629397b0a95e60d80.tar.bz2 upstream-2ecd494691cb71709acc52e629397b0a95e60d80.zip |
mklibs: update to 0.1.34
SVN-Revision: 32145
Diffstat (limited to 'tools/mklibs/patches/008-uclibc_libgcc_link.patch')
-rw-r--r-- | tools/mklibs/patches/008-uclibc_libgcc_link.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/tools/mklibs/patches/008-uclibc_libgcc_link.patch b/tools/mklibs/patches/008-uclibc_libgcc_link.patch new file mode 100644 index 0000000000..648b8ef3fd --- /dev/null +++ b/tools/mklibs/patches/008-uclibc_libgcc_link.patch @@ -0,0 +1,37 @@ +--- a/src/mklibs ++++ b/src/mklibs +@@ -113,11 +113,8 @@ def library_depends_gcc_libnames(obj, so + ret = [] + for i in libs: + match = re.match("^(((?P<ld>ld\S*)|(lib(?P<lib>\S+))))\.so.*$", i) +- if match and not soname in ("libpthread.so.0"): +- if match.group('ld'): +- ret.append(find_lib(match.group(0))) +- elif match.group('lib'): +- ret.append('-l%s' % match.group('lib')) ++ if match: ++ ret.append(find_lib(match.group(0))) + return ' '.join(ret) + + class Symbol(object): +@@ -586,6 +583,7 @@ while 1: + extra_flags = [] + extra_pre_obj = [] + extra_post_obj = [] ++ libgcc_link = find_lib("libgcc_s.so.1") + + symbols.update(library_symbols_used[library]) + +@@ -616,9 +614,10 @@ while 1: + cmd.append(pic_file) + cmd.extend(extra_post_obj) + cmd.extend(extra_flags) +- cmd.append("-lgcc") + cmd.extend(["-L%s" % a for a in [dest_path] + [sysroot + b for b in lib_path if sysroot == "" or b not in ("/" + libdir + "/", "/usr/" + libdir + "/")]]) +- cmd.append(library_depends_gcc_libnames(so_file, soname)) ++ if soname != "libgcc_s.so.1": ++ cmd.append(library_depends_gcc_libnames(so_file, soname)) ++ cmd.append(libgcc_link) + command(target + "gcc", *cmd) + + ## DEBUG |