Bug 1411712 - Move symbol version script flags for arm in mozglue to moz.build. r=mshal
authorChris Manchester <cmanchester@mozilla.com>
Thu, 02 Nov 2017 11:47:48 -0700
changeset 443190 60190c4417108c2638b61ad9744edb48b44eeb33
parent 443189 9037f33525cb12e26a57ccd7c0d711d9b257709e
child 443191 e173810afc6e201b4d109000dcc65c8b8bdd4bdc
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1411712
milestone58.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 1411712 - Move symbol version script flags for arm in mozglue to moz.build. r=mshal MozReview-Commit-ID: II250cfTmip
mozglue/build/Makefile.in
mozglue/build/moz.build
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -9,15 +9,8 @@ include $(topsrcdir)/config/config.mk
 ifeq (WINNT,$(OS_TARGET))
 mozglue.def: mozglue.def.in $(GLOBAL_DEPS)
 	$(call py_action,preprocessor,$(if $(MOZ_REPLACE_MALLOC),-DMOZ_REPLACE_MALLOC) $(ACDEFINES) $< -o $@)
 
 GARBAGE += mozglue.def
 endif
 
 include $(topsrcdir)/mozglue/build/replace_malloc.mk
-
-ifdef MOZ_LINKER
-ifeq (arm, $(TARGET_CPU))
-OS_LDFLAGS += -Wl,-version-script,$(srcdir)/arm-eabi-filter
-endif
-
-endif
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -93,9 +93,12 @@ if CONFIG['OS_TARGET'] == 'Darwin':
     # symbol resolution for symbols that jemalloc itself uses. While it
     # might be possible to find a way to avoid all such symbol resolutions,
     # it's currently not possible because at the very least there's a call
     # to pthread_self from tsd_init_check_recursion, which is necessary
     # because somehow clang doesn't want to accept the __thread keyword
     # for TLS.
     LDFLAGS += ['-Wl,-bind_at_load']
 
+if CONFIG['MOZ_LINKER'] and CONFIG['TARGET_CPU'] == 'arm':
+    LDFLAGS += ['-Wl,-version-script,%s/arm-eabi-filter' % SRCDIR]
+
 DIST_INSTALL = True