diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-02-28 18:17:02 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-02-28 18:17:02 +0000 |
| commit | 84b78edf81362a3b0181bfe654c8368922b1863c (patch) | |
| tree | d1f12dec5fbe2fcaa2269a710036027b0ed5177d /tools/mklibs/patches/009-uclibc_libgcc_link.patch | |
| parent | de38604311fbe7e043c30268edc258574e984f30 (diff) | |
| download | master-187ad058-84b78edf81362a3b0181bfe654c8368922b1863c.tar.gz master-187ad058-84b78edf81362a3b0181bfe654c8368922b1863c.tar.bz2 master-187ad058-84b78edf81362a3b0181bfe654c8368922b1863c.zip | |
mklibs: fix some long standing libpthread symbol link issues, mostly related to weak function overrides between libgcc, libc and libpthread
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25795 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mklibs/patches/009-uclibc_libgcc_link.patch')
| -rw-r--r-- | tools/mklibs/patches/009-uclibc_libgcc_link.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/mklibs/patches/009-uclibc_libgcc_link.patch b/tools/mklibs/patches/009-uclibc_libgcc_link.patch index d201821fc6..36f2067193 100644 --- a/tools/mklibs/patches/009-uclibc_libgcc_link.patch +++ b/tools/mklibs/patches/009-uclibc_libgcc_link.patch @@ -22,16 +22,15 @@ symbols.update(library_symbols_used[library]) -@@ -590,9 +588,11 @@ while 1: +@@ -590,9 +588,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" and soname != "libc.so.0": -+ 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) |