equal
deleted
inserted
replaced
|
1 We need the xptcstubsdef_asm file for Sun Studio, but not necessary for GCC. |
|
2 One of the files was placed in the wrong location and needs to be moved. This |
|
3 part can probably be sent upstream. |
|
4 |
|
5 diff --git a/xpcom/reflect/xptcall/md/unix/Makefile.in b/xpcom/reflect/xptcall/md/unix/Makefile.in |
|
6 --- a/xpcom/reflect/xptcall/md/unix/Makefile.in |
|
7 +++ b/xpcom/reflect/xptcall/md/unix/Makefile.in |
|
8 @@ -98,6 +98,7 @@ |
|
9 -e 's/^\(STUB_ENTRY\)(\([0-9][0-9]\))/\12\(\2\)/' \ |
|
10 -e 's/^\(STUB_ENTRY\)(\([0-9][0-9][0-9]\))/\13\(\2\)/' \ |
|
11 $(DIST)/include/xptcstubsdef.inc > $@ |
|
12 +ASFLAGS += -I. |
|
13 ifeq (x86_64,$(OS_TEST)) |
|
14 ASFLAGS += -xarch=amd64 |
|
15 endif |
|
16 diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build |
|
17 --- a/xpcom/reflect/xptcall/md/unix/moz.build |
|
18 +++ b/xpcom/reflect/xptcall/md/unix/moz.build |
|
19 @@ -68,6 +68,9 @@ |
|
20 'xptcstubs_gcc_x86_unix.cpp' |
|
21 ] |
|
22 else: |
|
23 + GENERATED_FILES = [ |
|
24 + 'xptcstubsdef_asm.solx86', |
|
25 + ] |
|
26 SOURCES += [ |
|
27 'xptcinvoke_asm_x86_solaris_SUNW.s', |
|
28 'xptcinvoke_x86_solaris.cpp', |
|
29 @@ -267,9 +270,6 @@ |
|
30 ] |
|
31 |
|
32 if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['OS_TEST'].find('86') == -1: |
|
33 - GENERATED_FILES = [ |
|
34 - 'xptcstubsdef_asm.solx86', |
|
35 - ] |
|
36 if CONFIG['HAVE_64BIT_BUILD']: |
|
37 SOURCES += [ |
|
38 'xptcinvoke_sparcv9_solaris.cpp', |