Bug 275004 Mozilla crashes on startup when compiled with IBM XL C++ v7 patch by shailen.n.jain@gmail.com r=timeless r=bsmedberg a=beltzner
authortimeless@mozdev.org
Thu, 28 Feb 2008 00:21:15 -0800
changeset 12381 350281f649468eed2d70edbf3182b880eddc21c7
parent 12380 994ba98c0a0c69bfc55d24ea4338da5814ef54e6
child 12382 50acbd449a60510f9f8aefe4191dd484bd4bb75a
push idunknown
push userunknown
push dateunknown
reviewerstimeless, bsmedberg, beltzner
bugs275004
milestone1.9b4pre
Bug 275004 Mozilla crashes on startup when compiled with IBM XL C++ v7 patch by shailen.n.jain@gmail.com r=timeless r=bsmedberg a=beltzner
xpcom/reflect/xptcall/public/genstubs.pl
xpcom/reflect/xptcall/public/xptcstubsdef.inc
xpcom/reflect/xptcall/src/md/unix/Makefile.in
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s.m4
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix64.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix64.s.m4
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp
--- a/xpcom/reflect/xptcall/public/genstubs.pl
+++ b/xpcom/reflect/xptcall/public/genstubs.pl
@@ -60,19 +60,23 @@ close(OUTFILE);
 
 ##
 ## Write the definitions include file. This assumes a macro will be used to
 ## expand the entries written...
 ##
 
 die "Can't open $def_name" if !open(OUTFILE, ">$def_name");
 
+## Disabled for bug 275004 - followup to fix is Bug 419604
+my $warn_inc_is_generated = 0;
+if ($warn_inc_is_generated) {
 print OUTFILE "/* generated file - DO NOT EDIT */\n\n";
 print OUTFILE "/* includes ",$entry_count," stub entries, and ",
               $sentinel_count," sentinel entries */\n\n";
+}
 
 for($i = 0; $i < $entry_count; $i++) {
     print OUTFILE "STUB_ENTRY(",$i+3,")\n";
 }
 
 for($i = 0; $i < $sentinel_count; $i++) {
     print OUTFILE "SENTINEL_ENTRY(",$i,")\n";
 }
--- a/xpcom/reflect/xptcall/public/xptcstubsdef.inc
+++ b/xpcom/reflect/xptcall/public/xptcstubsdef.inc
@@ -1,12 +1,8 @@
-/* generated file - DO NOT EDIT */
-
-/* includes 247 stub entries, and 5 sentinel entries */
-
 STUB_ENTRY(3)
 STUB_ENTRY(4)
 STUB_ENTRY(5)
 STUB_ENTRY(6)
 STUB_ENTRY(7)
 STUB_ENTRY(8)
 STUB_ENTRY(9)
 STUB_ENTRY(10)
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -470,16 +470,30 @@ endif
 
 ifeq ($(OS_ARCH),Darwin)
 xptcstubs_asm_ppc_darwin.o: xptcstubs_asm_ppc_darwin.s.m4 $(PUBLIC)/xptcstubsdef.inc Makefile
 	gm4 $(INCLUDES) $< > ./xptcstubs_asm_ppc_darwin.s && \
 	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_ppc_darwin.s
 	$(RM) -f ./xptcstubs_asm_ppc_darwin.s
 endif
 
+ifeq ($(OS_ARCH),AIX)
+ifdef HAVE_64BIT_OS
+xptcstubs_asm_ppc_aix64.o: xptcstubs_asm_ppc_aix64.s.m4 $(PUBLIC)/xptcstubsdef.inc Makefile
+	m4 -DAIX_OBJMODEL=$(AIX_OBJMODEL) $(INCLUDES) -I. $< > ./xptcstubs_asm_ppc_aix64.s && \
+	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_ppc_aix64.s
+	$(RM) ./xptcstubs_asm_ppc_aix64.s
+else
+xptcstubs_asm_ppc_aix.o: xptcstubs_asm_ppc_aix.s.m4 $(PUBLIC)/xptcstubsdef.inc Makefile
+	m4 -DAIX_OBJMODEL=$(AIX_OBJMODEL) $(INCLUDES) -I. $< > ./xptcstubs_asm_ppc_aix.s && \
+	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_ppc_aix.s
+	$(RM) ./xptcstubs_asm_ppc_aix.s
+endif
+endif
+
 ifeq ($(OS_ARCH),IRIX)
 # The assembler on IRIX (6.3 only?) seems to have trouble with the default command,
 # but works fine if we first copy the header and source file into the current dir.
 xptcstubs_asm_irix.o: $(PUBLIC)/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_irix.s
 	@rm -f ./xptcstubsdef.inc
 	@cp $(PUBLIC)/xptcstubsdef.inc .
 	@if test ! -f ./Makefile.in; then rm -f ./xptcstubs_asm_irix.s; cp $(srcdir)/xptcstubs_asm_irix.s .; else true; fi
 	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_irix.s
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s
@@ -1,133 +0,0 @@
-#
-# -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
-.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-.set r30,30; .set r31,31
-.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-.set f30,30; .set f31,31
-
-
-
-        .rename H.10.NO_SYMBOL{PR},""
-        .rename H.18.SharedStub{TC},"SharedStub"
-
-
-# .text section
-
-        .csect  H.10.NO_SYMBOL{PR}
-        .globl  .SharedStub
-        .globl  SharedStub{DS}
-        .extern .PrepareAndDispatch
-
-
-#jimbo        csect   CODE{PR}
-#
-# on entry SharedStub has the method selector in r12, the rest of the original
-# parameters are in r3 thru r10 and f1 thru f13
-#
-#jimbo	import	.PrepareAndDispatch
-
-.SharedStub:
-	mflr	r0
-	stw	r0,8(sp)
-
- 	mr	r12,r3		    # Move methodIndex into r12 for LATER
- 	lwz	r3,104(sp)	    # Get the 'original' r3
-
-        stwu	sp,-176(sp)	    # room for linkage (24), fprData (104), gprData(28)
-				    # outgoing params to PrepareAndDispatch (20)
-
-	stw	r4,44(sp)
-	stw	r5,48(sp)
-	stw	r6,52(sp)
-	stw	r7,56(sp)
-	stw	r8,60(sp)
-	stw	r9,64(sp)
-	stw	r10,68(sp)
-	stfd	f1,72(sp)
-	stfd	f2,80(sp)
-	stfd	f3,88(sp)
-	stfd	f4,96(sp)
-	stfd	f5,104(sp)
-	stfd	f6,112(sp)
-	stfd	f7,120(sp)
-	stfd	f8,128(sp)
-	stfd	f9,136(sp)
-	stfd	f10,144(sp)
-	stfd	f11,152(sp)
-	stfd	f12,156(sp)
-	stfd	f13,164(sp)
-
-	addi	r6,sp,44	# gprData
-	addi	r7,sp,72	# fprData
-				# r3 has the 'self' pointer already
-	mr	r4,r12		# methodIndex selector (it is now LATER)
-	addi	r5,sp,312	# pointer to callers args area, beyond r3-r10 mapped range
-
-	bl	.PrepareAndDispatch
-	nop
-    
-	lwz	r0,184(sp)
-	addi	sp,sp,176
-	mtlr	r0
-	blr
-
-# .data section
-
-        .toc                            # 0x00000038
-T.18.SharedStub:
-        .tc     H.18.SharedStub{TC},SharedStub{DS}
-
-        .csect  SharedStub{DS}
-        .long   .SharedStub             # "\0\0\0\0"
-        .long   TOC{TC0}                # "\0\0\0008"
-        .long   0x00000000              # "\0\0\0\0"
-# End   csect   SharedStub{DS}
-
-# .bss section
new file mode 100644
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s.m4
@@ -0,0 +1,137 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#   IBM Corporation
+#
+
+.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
+.set r30,30; .set r31,31
+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+.set f30,30; .set f31,31
+
+# Define the correct name of the stub function based on the object model
+
+define(STUB_NAME, 
+       ifelse(AIX_OBJMODEL, ibm,
+              `Stub'$1`__EI14nsXPTCStubBaseFv',
+              `Stub'$1`__14nsXPTCStubBaseFv'))
+
+define(STUB_ENTRY, `
+    .rename H.10.NO_SYMBOL{PR},""
+    .rename H.18.'STUB_NAME($1)`{TC},"'STUB_NAME($1)`"
+    .csect  H.10.NO_SYMBOL{PR}
+    .globl  .'STUB_NAME($1)`
+    .globl  'STUB_NAME($1)`{DS}
+
+.'STUB_NAME($1)`:
+    li      r12, '$1`
+    b       .SharedStub
+    nop
+        
+
+    .toc
+T.18.'STUB_NAME($1)`:
+    .tc     H.18.'STUB_NAME($1)`{TC},'STUB_NAME($1)`{DS}
+    .csect  'STUB_NAME($1)`{DS}
+    .long   .'STUB_NAME($1)`
+    .long   TOC{TC0}
+    .long   0x00000000
+')
+
+define(SENTINEL_ENTRY, `')
+
+include(xptcstubsdef.inc)
+
+    .rename H.10.NO_SYMBOL{PR},""
+    .rename H.18.SharedStub{TC},"SharedStub"
+
+# .text section
+    .csect  H.10.NO_SYMBOL{PR}
+    .globl  .SharedStub
+    .globl  SharedStub{DS}
+    .extern .PrepareAndDispatch
+
+.SharedStub:
+    mflr    r0
+    stw     r0,8(sp)
+
+    stwu    sp,-176(sp)     # room for linkage (24), fprData (104), gprData(28)
+                            # outgoing params to PrepareAndDispatch (20)
+
+    stw     r4,44(sp)       # link area (24) + PrepareAndDispatch params (20)
+    stw     r5,48(sp)
+    stw     r6,52(sp)
+    stw     r7,56(sp)
+    stw     r8,60(sp)
+    stw     r9,64(sp)
+    stw     r10,68(sp)
+    stfd    f1,72(sp)
+    stfd    f2,80(sp)
+    stfd    f3,88(sp)
+    stfd    f4,96(sp)
+    stfd    f5,104(sp)
+    stfd    f6,112(sp)
+    stfd    f7,120(sp)
+    stfd    f8,128(sp)
+    stfd    f9,136(sp)
+    stfd    f10,144(sp)
+    stfd    f11,152(sp)
+    stfd    f12,156(sp)
+    stfd    f13,164(sp)
+
+    addi    r6,sp,44        # gprData
+
+    addi    r7,sp,72        # fprData
+                            # r3 has the 'self' pointer already
+    mr      r4,r12          # methodIndex selector (it is now LATER)
+    addi    r5,sp,208       # pointer to callers args area, beyond r3-r10
+                            # mapped range
+
+    bl      .PrepareAndDispatch
+    nop
+
+    
+    lwz     r0,184(sp)
+    addi    sp,sp,176
+    mtlr    r0
+    blr
+
+# .data section
+
+    .toc                            # 0x00000038
+T.18.SharedStub:
+    .tc     H.18.SharedStub{TC},SharedStub{DS}
+
+    .csect  SharedStub{DS}
+    .long   .SharedStub             # "\0\0\0\0"
+    .long   TOC{TC0}                # "\0\0\0008"
+    .long   0x00000000              # "\0\0\0\0"
+# End   csect   SharedStub{DS}
+
+# .bss section
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix64.s
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix64.s
@@ -1,137 +0,0 @@
-#  ***** BEGIN LICENSE BLOCK *****
-#
-# Version: MPL 1.1/LGPL 2.1/GPL 2.0
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is IBM Corporation.
-# Portions created by IBM are
-#   Copyright (C) 2002, International Business Machines Corporation.
-#   All Rights Reserved.
-#
-# Contributor(s):
-#
-#  Alternatively, the contents of this file may be used under the terms of
-#  either of the GNU General Public License Version 2 or later (the "GPL"),
-#  or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the LGPL or the GPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-#
-#  ***** END LICENSE BLOCK *****
-
-.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
-.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-.set r30,30; .set r31,31
-.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-.set f30,30; .set f31,31
-
-
-        .rename     H.10.NO_SYMBOL{PR},""
-        .rename     H.18.SharedStub{TC},"SharedStub"
-
-
-# .text section
-
-        .csect      H.10.NO_SYMBOL{PR}
-        .globl      .SharedStub
-        .globl      SharedStub{DS}
-        .extern     .PrepareAndDispatch
-
-
-#jimbo        csect   CODE{PR}
-#
-# on entry SharedStub has the method selector in r12, the rest of the original
-# parameters are in r3 thru r10 and f1 thru f13
-#
-#jimbo	import	.PrepareAndDispatch
-
-.SharedStub:
-        mflr    r0
-        std     r0,16(sp)
-
-        mr      r12,r3      # Move methodIndex into r12 for LATER
-        ld      r3,176(sp)  # Get the 'original' r3 (load 'this' into r3)
-
-        stdu    sp,-248(sp) # room for linkage (24*2), fprData (104),
-                            # gprData(28*2), outgoing params to 
-                            # PrepareAndDispatch (40)
-
-        std     r4,88(sp)   # link area (48) + PrepareAndDispatch parms (40)
-        std     r5,96(sp)
-        std     r6,104(sp)
-        std     r7,112(sp)
-        std     r8,120(sp)
-        std     r9,128(sp)
-        std     r10,136(sp)
-        stfd    f1,144(sp)
-        stfd    f2,152(sp)
-        stfd    f3,160(sp)
-        stfd    f4,168(sp)
-        stfd    f5,176(sp)
-        stfd    f6,184(sp)
-        stfd    f7,192(sp)
-        stfd    f8,200(sp)
-        stfd    f9,208(sp)
-        stfd    f10,216(sp)
-        stfd    f11,224(sp)
-        stfd    f12,232(sp)
-        stfd    f13,240(sp)
-
-        addi    r6,sp,88    # gprData
-        addi    r7,sp,144   # fprData
-                            # r3 has the 'self' pointer already
-        mr      r4,r12      # methodIndex selector (it is now LATER)
-        addi    r5,sp,488   # pointer to callers args area, beyond r3-r10
-                            # mapped range
-        # 32bit:    176 (stack-distance)    64bit:  248 (stack-distance)
-        #           104 (this ptr offset)           176
-        #            32 (8*4 for r3-r10)             64 (8*8)
-        #           ---                             ---
-        #           312                             488
-
-        bl      .PrepareAndDispatch
-        nop
-
-        ld      r0,264(sp)  # 248+16
-        addi    sp,sp,248
-        mtlr    r0
-        blr
-
-# .data section
-
-        .toc                            # 0x00000038
-T.18.SharedStub:
-        .tc     H.18.SharedStub{TC},SharedStub{DS}
-
-        .csect  SharedStub{DS}
-        .llong  .SharedStub             # "\0\0\0\0"
-        .llong  TOC{TC0}                # "\0\0\0008"
-        .llong  0x00000000              # "\0\0\0\0"
-# End   csect   SharedStub{DS}
-
-# .bss section
new file mode 100644
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix64.s.m4
@@ -0,0 +1,114 @@
+ #
+ # The contents of this file are subject to the Netscape Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/NPL/
+ #
+ # Software distributed under the License is distributed on an "AS
+ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # rights and limitations under the License.
+ #
+ # The Original Code is mozilla.org code.
+ #
+ # The Initial Developer of the Original Code is Netscape
+ # Communications Corporation.  Portions created by Netscape are
+ # Copyright (C) 1999 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): 
+ #   IBM Corporation
+ #
+.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
+.set r30,30; .set r31,31
+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+.set f30,30; .set f31,31
+# Define the correct name of the stub function based on the object model
+define(STUB_NAME, 
+       ifelse(AIX_OBJMODEL, ibm,
+              `Stub'$1`__EI14nsXPTCStubBaseFv',
+              `Stub'$1`__14nsXPTCStubBaseFv'))
+define(STUB_ENTRY, `
+    .rename H.10.NO_SYMBOL{PR},""
+    .rename H.18.'STUB_NAME($1)`{TC},"'STUB_NAME($1)`"
+    .csect  H.10.NO_SYMBOL{PR}
+    .globl  .'STUB_NAME($1)`
+    .globl  'STUB_NAME($1)`{DS}
+.'STUB_NAME($1)`:
+    li      r12, '$1`
+    b       .SharedStub
+    nop
+    .toc
+T.18.'STUB_NAME($1)`:
+    .tc     H.18.'STUB_NAME($1)`{TC},'STUB_NAME($1)`{DS}
+    .csect  'STUB_NAME($1)`{DS}
+    .llong   .'STUB_NAME($1)`
+    .llong   TOC{TC0}
+    .llong   0x00000000
+')
+define(SENTINEL_ENTRY, `')
+include(xptcstubsdef.inc)
+    .rename H.10.NO_SYMBOL{PR},""
+    .rename H.18.SharedStub{TC},"SharedStub"
+# .text section
+    .csect  H.10.NO_SYMBOL{PR}
+    .globl  .SharedStub
+    .globl  SharedStub{DS}
+    .extern .PrepareAndDispatch
+.SharedStub:
+    mflr    r0
+    std     r0,16(sp)
+    stdu    sp,-248(sp)     # room for linkage (24*2), fprData (104), gprData(28*2)
+                            # outgoing params to PrepareAndDispatch (40)
+    std     r4,88(sp)       # link area (48) + PrepareAndDispatch params (20)
+    std     r5,96(sp)
+    std     r6,104(sp)
+    std     r7,112(sp)
+    std     r8,120(sp)
+    std     r9,128(sp)
+    std     r10,136(sp)
+    stfd    f1,144(sp)
+    stfd    f2,152(sp)
+    stfd    f3,160(sp)
+    stfd    f4,168(sp)
+    stfd    f5,176(sp)
+    stfd    f6,184(sp)
+    stfd    f7,192(sp)
+    stfd    f8,200(sp)
+    stfd    f9,208(sp)
+    stfd    f10,216(sp)
+    stfd    f11,224(sp)
+    stfd    f12,232(sp)
+    stfd    f13,240(sp)
+    addi    r6,sp,88        # gprData
+    addi    r7,sp,144       # fprData
+                            # r3 has the 'self' pointer already
+    mr      r4,r12          # methodIndex selector (it is now LATER)
+    addi    r5,sp,328       # pointer to callers args area, beyond r3-r10
+                            # mapped range
+    bl      .PrepareAndDispatch
+    nop
+    ld      r0,264(sp)
+    addi    sp,sp,248
+    mtlr    r0
+    blr
+# .data section
+    .toc                            # 0x00000038
+T.18.SharedStub:
+    .tc     H.18.SharedStub{TC},SharedStub{DS}
+    .csect  SharedStub{DS}
+    .llong   .SharedStub             # "\0\0\0\0"
+    .llong   TOC{TC0}                # "\0\0\0008"
+    .llong   0x00000000              # "\0\0\0\0"
+# End   csect   SharedStub{DS}
+# .bss section
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp
@@ -198,23 +198,17 @@ PrepareAndDispatch(nsXPTCStubBase* self,
     result = self->mOuter->CallMethod((PRUint16)methodIndex,info,dispatchParams);
 
     if(dispatchParams != paramBuffer)
         delete [] dispatchParams;
 
     return result;
 }
 
-extern "C" int SharedStub(int);
-
-#define STUB_ENTRY(n)                \
-nsresult nsXPTCStubBase::Stub##n()   \
-{                                    \
-    return SharedStub(n);	     \
-}                                    \
+#define STUB_ENTRY(n)
 
 #define SENTINEL_ENTRY(n) \
 nsresult nsXPTCStubBase::Sentinel##n() \
 { \
     NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
     return NS_ERROR_NOT_IMPLEMENTED; \
 }
 
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp
@@ -185,23 +185,17 @@ PrepareAndDispatch(nsXPTCStubBase* self,
     result = self->mOuter->CallMethod((PRUint16)methodIndex,info,dispatchParams);
 
     if(dispatchParams != paramBuffer)
         delete [] dispatchParams;
 
     return result;
 }
 
-extern "C" int SharedStub(int);
-
-#define STUB_ENTRY(n)                \
-nsresult nsXPTCStubBase::Stub##n()   \
-{                                    \
-    return SharedStub(n);	     \
-}                                    \
+#define STUB_ENTRY(n)
 
 #define SENTINEL_ENTRY(n) \
 nsresult nsXPTCStubBase::Sentinel##n() \
 { \
     NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
     return NS_ERROR_NOT_IMPLEMENTED; \
 }