summaryrefslogtreecommitdiffstats
path: root/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-10 15:09:09 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-10 15:09:09 +0000
commitfae644a63b578cd9a3dcee0d0c968757c964cf46 (patch)
tree12337ee3bf6ee4e284aae3638c2cd1cf17e0b5b7 /tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
parentd0fc9333a91498555cd2e327f6ce47fd3dce9ac1 (diff)
Revert "[tools] mklibs: update to 0.1.34"
Too much broken, needs to be reworked git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32163 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mklibs/patches/009-uclibc_libpthread_symbols.patch')
-rw-r--r--tools/mklibs/patches/009-uclibc_libpthread_symbols.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch b/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
deleted file mode 100644
index 50eb31ab7..000000000
--- a/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/src/mklibs
-+++ b/src/mklibs
-@@ -162,9 +162,10 @@ def undefined_symbols(obj):
- return result
-
- class ProvidedSymbol(Symbol):
-- def __init__(self, name, version, library, default_version):
-+ def __init__(self, name, version, library, default_version, weak):
- super(ProvidedSymbol, self).__init__(name, version, library)
- self.default_version = default_version
-+ self.weak = weak
-
- def base_names(self):
- ret = []
-@@ -205,11 +206,15 @@ def provided_symbols(obj):
- if version_string.lower() not in ('base', 'none'):
- version = version_string
-
-+ weak = False
-+ if weak_string.lower() == 'true':
-+ weak = True
-+
- default_version = False
- if default_version_string.lower() == 'true':
- default_version = True
-
-- result.append(ProvidedSymbol(name, version, library, default_version))
-+ result.append(ProvidedSymbol(name, version, library, default_version, weak))
-
- return result
-
-@@ -500,6 +505,9 @@ while 1:
- debug(DEBUG_SPAM, "present_symbols adding %s" % symbol)
- names = symbol.base_names()
- for name in names:
-+ if name in present_symbols:
-+ if symbol.library != present_symbols[name].library:
-+ needed_symbols[name] = UndefinedSymbol(name, True, symbol.version, symbol.library)
- present_symbols[name] = symbol
-
- # are we finished?
-@@ -593,12 +601,16 @@ while 1:
- # may segfault in ptmalloc_init due to undefined weak reference
- extra_pre_obj.append(sysroot + libc_extras_dir + "/soinit.o")
- extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o")
-- symbols.add(ProvidedSymbol('__dso_handle', None, None, True))
-+ symbols.add(ProvidedSymbol('__dso_handle', None, None, True, True))
-
-- if soname in ("libc.so.0"):
-- symbols.add(ProvidedSymbol('__uClibc_init', None, None, True))
-- symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True))
-- extra_flags.append("-Wl,-init,__uClibc_init")
-+ if soname == "libc.so.0":
-+ symbols.add(ProvidedSymbol('__uClibc_init', None, None, True, True))
-+ symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True, True))
-+ extra_pre_obj.append("-Wl,-init,__uClibc_init")
-+
-+ if soname == "libpthread.so.0":
-+ symbols.add(ProvidedSymbol('__pthread_initialize_minimal_internal', None, None, True, True))
-+ extra_flags.append("-Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal")
-
- map_file = find_pic_map(library)
- if map_file: