Bug 927551 - make darwin xptcall sources compilable in a singlepass universal build; r=bsmedberg,glandium
authorNathan Froyd <froydnj@mozilla.com>
Wed, 16 Oct 2013 15:25:36 -0400
changeset 166656 169b3659b6c3c79f7d015cee56ee85d657ce2fa3
parent 166655 921bdd41fbce644073290d8f482105001716ea41
child 166657 16ea1b03d8fe67d15f8b5d2baaa7697c0bb414ed
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, glandium
bugs927551
milestone27.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 927551 - make darwin xptcall sources compilable in a singlepass universal build; r=bsmedberg,glandium
xpcom/reflect/xptcall/src/md/unix/moz.build
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_darwin.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_darwin.cpp
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -2,27 +2,20 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpcom'
 
 if CONFIG['OS_ARCH'] == 'Darwin':
-    if CONFIG['OS_TEST'].find('86') != -1:
-        if CONFIG['OS_TEST'] == 'x86_64':
-            CPP_SOURCES += [
-                'xptcinvoke_x86_64_unix.cpp',
-                'xptcstubs_x86_64_darwin.cpp',
-            ]
-        else:
-            CPP_SOURCES += [
-                'xptcinvoke_gcc_x86_unix.cpp',
-                'xptcstubs_gcc_x86_unix.cpp',
-            ]
+    CPP_SOURCES += [
+        'xptcinvoke_darwin.cpp',
+        'xptcstubs_darwin.cpp',
+    ]
 
 if CONFIG['OS_ARCH'] in ('NetBSD', 'OpenBSD', 'GNU'):
     if CONFIG['CPU_ARCH'] == 'x86':
         CPP_SOURCES += [
             'xptcinvoke_gcc_x86_unix.cpp',
             'xptcstubs_gcc_x86_unix.cpp'
         ]
 
@@ -206,22 +199,16 @@ if CONFIG['OS_TEST'] in ('macppc', 'bebo
         ]
 
 if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'powerpc':
     CPP_SOURCES += [
         'xptcinvoke_ppc_openbsd.cpp',
         'xptcstubs_ppc_openbsd.cpp',
     ]
 
-if CONFIG['OS_ARCH'] == 'Darwin' and CONFIG['TARGET_CPU'] == 'powerpc':
-    CPP_SOURCES += [
-        'xptcinvoke_ppc_rhapsody.cpp',
-        'xptcstubs_ppc_rhapsody.cpp',
-    ]
-
 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TEST'].find('sparc') != -1:
     CPP_SOURCES += [
         'xptcinvoke_sparc_solaris.cpp',
         'xptcstubs_sparc_solaris.cpp',
     ]
 
 if CONFIG['OS_ARCH'] == 'NetBSD' and CONFIG['OS_TEST'] == 'sparc':
     CPP_SOURCES += [
new file mode 100644
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_darwin.cpp
@@ -0,0 +1,14 @@
+/* -*- Mode: C -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#if defined(__i386__)
+#include "xptcinvoke_gcc_x86_unix.cpp"
+#elif defined(__x86_64__)
+#include "xptcinvoke_x86_64_unix.cpp"
+#elif defined(__ppc__)
+#include "xptcinvoke_ppc_rhapsody.cpp"
+#else
+#error unknown cpu architecture
+#endif
new file mode 100644
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_darwin.cpp
@@ -0,0 +1,14 @@
+/* -*- Mode: C -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#if defined(__i386__)
+#include "xptcstubs_gcc_x86_unix.cpp"
+#elif defined(__x86_64__)
+#include "xptcstubs_x86_64_darwin.cpp"
+#elif defined(__ppc__)
+#include "xptcstubs_ppc_rhapsody.cpp"
+#else
+#error unknown cpu architecture
+#endif