Bug 734046 - Don't export __aeabi_* symbols from libmozglue.so on ARM. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 13 Mar 2012 09:47:03 +0100
changeset 92204 66fc6fa2c34795027621dead4c5aa7350dbb1acd
parent 92203 03394bda1d0f23ceaf65b6162a1fac9ea0442609
child 92205 ad62dcabf6969355343034d3003546436ed0023e
push id136
push userlsblakk@mozilla.com
push dateFri, 01 Jun 2012 02:39:32 +0000
treeherdermozilla-release@7ebf7352c959 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs734046
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 734046 - Don't export __aeabi_* symbols from libmozglue.so on ARM. r=ted
mozglue/build/Makefile.in
mozglue/build/arm-eabi-filter
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -86,16 +86,21 @@ ifeq (android, $(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,$(DEPTH)/other-licenses/android)
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,../android)
 endif
 
 ifdef MOZ_LINKER
 # Add custom dynamic linker
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,linker,../linker)
+
+ifeq (arm, $(TARGET_CPU))
+EXTRA_DSO_LDOPTS += -Wl,-version-script,$(srcdir)/arm-eabi-filter
+endif
+
 endif
 
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
 
 ifeq (Android, $(OS_TARGET))
 WRAP_LDFLAGS =
 endif
 
new file mode 100644
--- /dev/null
+++ b/mozglue/build/arm-eabi-filter
@@ -0,0 +1,4 @@
+{
+  local:
+    __aeabi*;
+};