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 --- mozilla-esr31/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2015-06-04 17:42:52.626316900 -0700

     6 +++ mozilla-esr31/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2015-06-04 17:42:52.636686080 -0700

     7 @@ -98,6 +98,7 @@

     8  	  -e 's/^\(STUB_ENTRY\)(\([0-9][0-9]\))/\12\(\2\)/' \

     9  	  -e 's/^\(STUB_ENTRY\)(\([0-9][0-9][0-9]\))/\13\(\2\)/' \

    10  	$(DIST)/include/xptcstubsdef.inc > $@

    11 +ASFLAGS += -I.

    12  ifeq (x86_64,$(OS_TEST))

    13  ASFLAGS += -xarch=amd64

    14  endif

    15 --- mozilla-esr31/xpcom/reflect/xptcall/src/md/unix/moz.build.orig	2015-06-04 17:42:52.631590433 -0700

    16 +++ mozilla-esr31/xpcom/reflect/xptcall/src/md/unix/moz.build	2015-06-04 17:42:52.636848564 -0700

    17 @@ -74,6 +74,9 @@

    18                  'xptcstubs_gcc_x86_unix.cpp'

    19              ]

    20          else:

    21 +            GENERATED_FILES = [

    22 +                'xptcstubsdef_asm.solx86',

    23 +            ]

    24              SOURCES += [

    25                  'xptcinvoke_asm_x86_solaris_SUNW.s',

    26                  'xptcinvoke_x86_solaris.cpp',

    27 @@ -273,9 +276,6 @@

    28      ]

    29  

    30  if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['OS_TEST'].find('86') == -1:

    31 -    GENERATED_FILES = [

    32 -        'xptcstubsdef_asm.solx86',

    33 -    ]

    34      if CONFIG['HAVE_64BIT_OS']:

    35          SOURCES += [

    36              'xptcinvoke_sparcv9_solaris.cpp',