aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-11-17 04:36:07 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-11-17 04:36:07 +0000
commit3dfc0a8b3670dc00d4cb0f58f3ac16e44704301e (patch)
treefa9b1bd745a609bc3cd48b6ee726ee17c131e02f
parentc76b3f6282b9af52c23ca9376924702a686b4acf (diff)
downloadmaster-187ad058-3dfc0a8b3670dc00d4cb0f58f3ac16e44704301e.tar.gz
master-187ad058-3dfc0a8b3670dc00d4cb0f58f3ac16e44704301e.tar.bz2
master-187ad058-3dfc0a8b3670dc00d4cb0f58f3ac16e44704301e.zip
mklibs: fix missing __pack_f symbol in uclibc after relink
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18438 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--tools/mklibs/patches/009-uclibc_libgcc_link.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/tools/mklibs/patches/009-uclibc_libgcc_link.patch b/tools/mklibs/patches/009-uclibc_libgcc_link.patch
new file mode 100644
index 0000000000..2312d6a2c5
--- /dev/null
+++ b/tools/mklibs/patches/009-uclibc_libgcc_link.patch
@@ -0,0 +1,27 @@
+--- a/src/mklibs.py
++++ b/src/mklibs.py
+@@ -560,6 +560,7 @@ while 1:
+ extra_flags = []
+ extra_pre_obj = []
+ extra_post_obj = []
++ libgcc_link = "-lgcc"
+
+ symbols.update(library_symbols_used[library])
+
+@@ -575,6 +576,7 @@ while 1:
+ symbols.add(ProvidedSymbol('__uClibc_init', None, None, True))
+ symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True))
+ extra_flags.append("-Wl,-init,__uClibc_init")
++ libgcc_link = "-lgcc_s_pic"
+
+ map_file = find_pic_map(library)
+ if map_file:
+@@ -590,7 +592,7 @@ while 1:
+ cmd.append(pic_file)
+ cmd.extend(extra_post_obj)
+ cmd.extend(extra_flags)
+- cmd.append("-lgcc")
++ cmd.append(libgcc_link)
+ 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))
+ command(target + "gcc", *cmd)