X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=tools%2Fmklibs%2Fpatches%2F008-uclibc_libgcc_link.patch;fp=tools%2Fmklibs%2Fpatches%2F008-uclibc_libgcc_link.patch;h=0000000000000000000000000000000000000000;hp=648b8ef3fd302a2b6aa4b502b00c2c58cbf7cfe6;hb=1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4;hpb=e2be7290b1cd0e6061d7d0f982ac5da13ff1a685 diff --git a/tools/mklibs/patches/008-uclibc_libgcc_link.patch b/tools/mklibs/patches/008-uclibc_libgcc_link.patch deleted file mode 100644 index 648b8ef3fd..0000000000 --- a/tools/mklibs/patches/008-uclibc_libgcc_link.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- 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("^(((?Pld\S*)|(lib(?P\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