components/desktop/firefox/patches/firefox28-217-xpt-as-flag.patch
author Stacy Yeh <stacy.yeh@oracle.com>
Mon, 11 Jan 2016 09:27:45 -0800
changeset 5255 cea0e462549a
permissions -rw-r--r--
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland

We need the xptcstubsdef_asm file for Sun Studio, but not necessary for GCC. 
One of the files was placed in the wrong location and needs to be moved. This 
part can probably be sent upstream. 

--- mozilla-esr31/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2015-06-04 17:42:52.626316900 -0700
+++ mozilla-esr31/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2015-06-04 17:42:52.636686080 -0700
@@ -98,6 +98,7 @@
 	  -e 's/^\(STUB_ENTRY\)(\([0-9][0-9]\))/\12\(\2\)/' \
 	  -e 's/^\(STUB_ENTRY\)(\([0-9][0-9][0-9]\))/\13\(\2\)/' \
 	$(DIST)/include/xptcstubsdef.inc > $@
+ASFLAGS += -I.
 ifeq (x86_64,$(OS_TEST))
 ASFLAGS += -xarch=amd64
 endif
--- mozilla-esr31/xpcom/reflect/xptcall/src/md/unix/moz.build.orig	2015-06-04 17:42:52.631590433 -0700
+++ mozilla-esr31/xpcom/reflect/xptcall/src/md/unix/moz.build	2015-06-04 17:42:52.636848564 -0700
@@ -74,6 +74,9 @@
                 'xptcstubs_gcc_x86_unix.cpp'
             ]
         else:
+            GENERATED_FILES = [
+                'xptcstubsdef_asm.solx86',
+            ]
             SOURCES += [
                 'xptcinvoke_asm_x86_solaris_SUNW.s',
                 'xptcinvoke_x86_solaris.cpp',
@@ -273,9 +276,6 @@
     ]
 
 if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['OS_TEST'].find('86') == -1:
-    GENERATED_FILES = [
-        'xptcstubsdef_asm.solx86',
-    ]
     if CONFIG['HAVE_64BIT_OS']:
         SOURCES += [
             'xptcinvoke_sparcv9_solaris.cpp',