Backout 14dc29b1586b (bug 963024) for landing only part of the patch; DONTBUILD because NPOTB
authorNathan Froyd <froydnj@mozilla.com>
Tue, 18 Feb 2014 16:43:12 -0500
changeset 169390 37de5a3f1a93e196bdb35609e40ed0ce84f8509f
parent 169389 e1c8174ce97b7114e40f545fd0ede9383f71a312
child 169391 74b07332a161fba40b1f8ce4f545a7860643c925
push id39938
push usernfroyd@mozilla.com
push dateTue, 18 Feb 2014 21:47:50 +0000
treeherdermozilla-inbound@37de5a3f1a93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs963024
milestone30.0a1
backs out14dc29b1586b46577b72d1249b3c7219a524e67f
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
Backout 14dc29b1586b (bug 963024) for landing only part of the patch; DONTBUILD because NPOTB
xpcom/reflect/xptcall/src/md/unix/Makefile.in
xpcom/reflect/xptcall/src/md/unix/moz.build
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -10,19 +10,16 @@
 # Linux/ARM
 #
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(filter arm% sa110,$(OS_TEST)))
 CXXFLAGS += -O2
 endif
 endif
 
-ifeq ($(OS_TEST),aarch64)
-ASFILES := xptcinvoke_asm_aarch64.s xptcstubs_asm_aarch64.s
-endif
 ######################################################################
 # HPPA
 ######################################################################
 #
 # HP-UX/PA32
 #
 # for gas and gcc, check comment in xptcinvoke_asm_pa32.s
 ifeq ($(OS_ARCH),HP-UX)
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -144,21 +144,16 @@ if CONFIG['OS_ARCH'] == 'NetBSD':
     if CONFIG['OS_TEST'] in ('amiga', 'atari', 'hp300', 'mac68k', 'mvme68k',
                              'next68k', 'sun3', 'sun3x', 'x68k'):
         SOURCES += [
             'xptcinvoke_netbsd_m68k.cpp',
             'xptcstubs_netbsd_m68k.cpp'
         ]
 
 if CONFIG['OS_ARCH'] == 'Linux':
-    if CONFIG['OS_TEST'] == 'aarch64':
-        SOURCES += [
-            'xptcinvoke_aarch64.cpp',
-            'xptcstubs_aarch64.cpp',
-        ]
     if CONFIG['OS_TEST'] == 'm68k':
         SOURCES += [
             'xptcinvoke_linux_m68k.cpp',
             'xptcstubs_linux_m68k.cpp',
         ]
     if CONFIG['OS_TEST'].find('mips') != -1:
         if CONFIG['OS_TEST'].find('mips64') != -1:
             SOURCES += [