diff options
author | Brad Laue <brad@gentoo.org> | 2003-11-17 06:30:37 +0000 |
---|---|---|
committer | Brad Laue <brad@gentoo.org> | 2003-11-17 06:30:37 +0000 |
commit | 4163c8dbfdb3ad3530fb4da19d054f3212b07ae6 (patch) | |
tree | 38c675326ca74114fcb71063b52bf523309f6c4e /net-www | |
parent | Removing more old versions (diff) | |
download | gentoo-2-4163c8dbfdb3ad3530fb4da19d054f3212b07ae6.tar.gz gentoo-2-4163c8dbfdb3ad3530fb4da19d054f3212b07ae6.tar.bz2 gentoo-2-4163c8dbfdb3ad3530fb4da19d054f3212b07ae6.zip |
Insert useful CVS message here
Diffstat (limited to 'net-www')
-rw-r--r-- | net-www/mozilla/Manifest | 5 | ||||
-rw-r--r-- | net-www/mozilla/files/mozilla-1.0-abi-compat-wrappers.patch | 65 | ||||
-rw-r--r-- | net-www/mozilla/files/mozilla-1.0-abi-xpcom-ppc.patch | 359 | ||||
-rw-r--r-- | net-www/mozilla/files/mozilla-1.0-asmfixes.patch | 236 | ||||
-rw-r--r-- | net-www/mozilla/files/mozilla-1.0.1-platform.patch | 79 | ||||
-rw-r--r-- | net-www/mozilla/files/mozilla-1.0.1-sparc-xpcom.patch | 101 |
6 files changed, 0 insertions, 845 deletions
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest index 6393f60d08bf..d1d7ef4d2624 100644 --- a/net-www/mozilla/Manifest +++ b/net-www/mozilla/Manifest @@ -15,11 +15,6 @@ MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134 -MD5 937ecdca5b59d442c2b0b5027ead762d files/mozilla-1.0-abi-compat-wrappers.patch 1799 -MD5 4749f0978ad569b9bcf028c75b5de9cc files/mozilla-1.0-abi-xpcom-ppc.patch 12433 -MD5 e239c459343aa377a9c1a6fd0239e4c9 files/mozilla-1.0-asmfixes.patch 9089 -MD5 2428c0ad22b38f773fb9c174722909de files/mozilla-1.0.1-platform.patch 3543 -MD5 1c48ae2eab3e01fae125748d40917e79 files/mozilla-1.0.1-sparc-xpcom.patch 4267 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953 MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629 diff --git a/net-www/mozilla/files/mozilla-1.0-abi-compat-wrappers.patch b/net-www/mozilla/files/mozilla-1.0-abi-compat-wrappers.patch deleted file mode 100644 index 5c44d23dfede..000000000000 --- a/net-www/mozilla/files/mozilla-1.0-abi-compat-wrappers.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: xpfe/bootstrap/nsAppRunner.cpp -=================================================================== -RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsAppRunner.cpp,v -retrieving revision 1.353 -diff -u -r1.353 nsAppRunner.cpp ---- xpfe/bootstrap/nsAppRunner.cpp 16 May 2002 01:02:12 -0000 1.353 -+++ xpfe/bootstrap/nsAppRunner.cpp 3 Jul 2002 22:46:49 -0000 -@@ -134,6 +134,57 @@ - #include "jprof.h" - #endif - -+// on x86 linux, the current builds of some popular plugins (notably -+// flashplayer and real) expect a few builtin symbols from libgcc -+// which were available in some older versions of gcc. However, -+// they're _NOT_ available in newer versions of gcc (eg 3.1), so if -+// we want those plugin to work with a gcc-3.1 built binary, we need -+// to provide these symbols. MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS defaults -+// to true on x86 linux, and false everywhere else. -+// -+// The fact that the new and free operators are mismatched -+// mirrors the way the original functions in egcs 1.1.2 worked. -+ -+extern "C" { -+ -+# ifndef HAVE___builtin_vec_new -+ void *__builtin_vec_new(size_t aSize, const std::nothrow_t &aNoThrow) throw() -+ { -+ return ::operator new(aSize, aNoThrow); -+ } -+# endif -+ -+# ifndef HAVE___builtin_vec_delete -+ void __builtin_vec_delete(void *aPtr, const std::nothrow_t &) throw () -+ { -+ if (aPtr) { -+ free(aPtr); -+ } -+ } -+# endif -+ -+# ifndef HAVE__builtin_new -+ void *__builtin_new(int aSize) -+ { -+ return malloc(aSize); -+ } -+# endif -+ -+# ifndef HAVE__builtin_delete -+ void __builtin_delete(void *aPtr) -+ { -+ free(aPtr); -+ } -+# endif -+ -+# ifndef HAVE__pure_virtual -+ void __pure_virtual(void) { -+ extern void __cxa_pure_virtual(void); -+ -+ __cxa_pure_virtual(); -+ } -+# endif -+} - - #ifdef _BUILD_STATIC_BIN - #include "nsStaticComponent.h" diff --git a/net-www/mozilla/files/mozilla-1.0-abi-xpcom-ppc.patch b/net-www/mozilla/files/mozilla-1.0-abi-xpcom-ppc.patch deleted file mode 100644 index 974b6b065557..000000000000 --- a/net-www/mozilla/files/mozilla-1.0-abi-xpcom-ppc.patch +++ /dev/null @@ -1,359 +0,0 @@ -Index: xpcom//reflect/xptcall/src/md/unix/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in,v -retrieving revision 1.63.2.1 -diff -u -p -r1.63.2.1 Makefile.in ---- xpcom//reflect/xptcall/src/md/unix/Makefile.in 10 Apr 2002 03:37:34 -0000 1.63.2.1 -+++ xpcom//reflect/xptcall/src/md/unix/Makefile.in 6 May 2002 19:09:25 -0000 -@@ -211,16 +211,35 @@ endif - CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) - endif - -+# -+# Linux/PPC -+# - ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s -+ -+GXXABIVERSION := $(shell $(CXX) -x c++ -dM -E - </dev/null \ -+ | grep -w __GXX_ABI_VERSION \ -+ | sed -e 's/.*__/__/' \ -+ | sed -e 's/N\W\{1,\}/N=/') -+ -+ifneq ($(GXXABIVERSION),) -+ABIDEFINE := -D$(GXXABIVERSION) -+endif -+AS := $(CC) -c -x assembler-with-cpp $(ABIDEFINE) - endif - -+# -+# NetBSD/PPC -+# - ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp - ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s - endif - -+# -+# Darwin/PPC -+# - ifeq ($(OS_ARCH),Darwin) - CPPSRCS := xptcinvoke_ppc_rhapsody.cpp xptcstubs_ppc_rhapsody.cpp - ASFILES := xptcinvoke_asm_ppc_rhapsody.s xptcstubs_asm_ppc_rhapsody.s -Index: xpcom//reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.s -=================================================================== -RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.s,v -retrieving revision 1.4.210.1 -diff -u -p -r1.4.210.1 xptcinvoke_asm_ppc_linux.s ---- xpcom//reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.s 10 Apr 2002 03:37:36 -0000 1.4.210.1 -+++ xpcom//reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.s 6 May 2002 19:09:25 -0000 -@@ -62,8 +62,8 @@ XPTC_InvokeByIndex: - addi r0,r10,96 # reserve stack for GPR and FPR register save area r0 = r10 + 96 - lwz r9,0(sp) # r9 = backchain - neg r0,r0 -- stwux r9,sp,r0 # reserve stack sapce and save SP backchain -- -+ stwux r9,sp,r0 # reserve stack space and save SP backchain -+ - addi r3,sp,8 # r3 <= args - mr r4,r5 # r4 <= paramCount - mr r5,r6 # r5 <= params -@@ -85,7 +85,9 @@ XPTC_InvokeByIndex: - lwz r3,8(r31) # r3 <= that - lwz r4,12(r31) # r4 <= methodIndex - lwz r5,0(r3) # r5 <= vtable ( == *that ) -+#if __GXX_ABI_VERSION - 0 < 100 /* G++ pre-V3 ABI */ - addi r4,r4,2 # skip first two vtable entries -+#endif - slwi r4,r4,2 # convert to offset ( *= 4 ) - lwzx r0,r5,r4 # r0 <= methodpointer ( == vtable + offset ) - -Index: xpcom//reflect/xptcall/src/md/unix/xptcstubs_ppc_linux.cpp -=================================================================== -RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_linux.cpp,v -retrieving revision 1.5.38.1 -diff -u -p -r1.5.38.1 xptcstubs_ppc_linux.cpp ---- xpcom//reflect/xptcall/src/md/unix/xptcstubs_ppc_linux.cpp 10 Apr 2002 03:37:43 -0000 1.5.38.1 -+++ xpcom//reflect/xptcall/src/md/unix/xptcstubs_ppc_linux.cpp 6 May 2002 19:09:25 -0000 -@@ -189,7 +189,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, - // however, it's quick, dirty, and'll break when the ABI changes on - // us, which is what we want ;-). - --#define STUB_ENTRY(n) \ -+#if __GXX_ABI_VERSION - 0 < 100 -+// gcc-2 version -+# define STUB_ENTRY(n) \ - __asm__ ( \ - ".section \".text\" \n\t" \ - ".align 2 \n\t" \ -@@ -200,6 +202,46 @@ __asm__ ( - "li 11,"#n" \n\t" \ - "b SharedStub@local \n" \ - ); -+#else -+// gcc-3 version -+// -+// As G++3 ABI contains the length of the functionname in the mangled -+// name, it is difficult to get a generic assembler mechanism like -+// in the G++ 2.95 case. -+// Create names would be like: -+// _ZN14nsXPTCStubBase5Stub1Ev -+// _ZN14nsXPTCStubBase6Stub12Ev -+// _ZN14nsXPTCStubBase7Stub123Ev -+// _ZN14nsXPTCStubBase8Stub1234Ev -+// etc. -+// Use assembler directives to get the names right... -+ -+# define STUB_ENTRY(n) \ -+__asm__ ( \ -+ ".align 2 \n\t" \ -+ ".if "#n" < 10 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ -+ \ -+ ".elseif "#n" < 100 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ -+ \ -+ ".elseif "#n" < 1000 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ -+ \ -+ ".else \n\t" \ -+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ -+ ".endif \n\t" \ -+ \ -+ "li 11,"#n" \n\t" \ -+ "b SharedStub@local \n" \ -+); -+#endif - - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ -Index: xpcom//reflect/xptcall/tests/TestXPTCInvoke.cpp -=================================================================== -RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp,v -retrieving revision 1.22.2.1 -diff -u -p -r1.22.2.1 TestXPTCInvoke.cpp ---- xpcom//reflect/xptcall/tests/TestXPTCInvoke.cpp 10 Apr 2002 03:37:52 -0000 1.22.2.1 -+++ xpcom//reflect/xptcall/tests/TestXPTCInvoke.cpp 6 May 2002 19:09:26 -0000 -@@ -87,6 +87,14 @@ public: - float p17, float p18, float p19, float p20, - float *retval) = 0; - -+ NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval) = 0; -+ -+ NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval) = 0; -+ - NS_IMETHOD PassTwoStrings(const char* s1, const char* s2, char** retval) = 0; - - }; -@@ -113,6 +121,13 @@ public: - NS_IMETHOD AddManyFloats(float p1, float p2, float p3, float p4, - float p5, float p6, float p7, float p8, - float p9, float p10, float* retval); -+ NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval); -+ -+ NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval); - - NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4, - float p5, float p6, float p7, float p8, -@@ -231,6 +246,24 @@ InvokeTestTarget::AddManyManyFloats(floa - } - - NS_IMETHODIMP -+InvokeTestTarget::AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, -+ PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8, -+ PRInt64 p9, PRInt32 p10, PRInt64* retval) -+{ -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+InvokeTestTarget::AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, -+ PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8, -+ PRInt32 p9, PRInt64 p10, PRInt64* retval) -+{ -+ *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP - InvokeTestTarget::PassTwoStrings(const char* s1, const char* s2, char** retval) - { - char *ret = "milk"; -@@ -306,6 +339,22 @@ int main() - else - printf("\tFAILED"); - -+ if(NS_SUCCEEDED(test->AddMixedInts(1,2,3,4,5,6,7,8,9,10,&out64))) -+ { -+ LL_L2I(tmp32, out64); -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32); -+ } -+ else -+ printf("\tFAILED"); -+ -+ if(NS_SUCCEEDED(test->AddMixedInts2(1,2,3,4,5,6,7,8,9,10,&out64))) -+ { -+ LL_L2I(tmp32, out64); -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32); -+ } -+ else -+ printf("\tFAILED"); -+ - if(NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) - printf(" = %s\n", outS); - else -@@ -384,8 +433,8 @@ int main() - var[2].flags = nsXPTCVariant::PTR_IS_DATA; - var[2].ptr = &var[2].val.i64; - -- if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var))) -- printf("\t2L * 2L = %d\n", (int)var[2].val.i64); -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var))) -+ printf("\t2L * 2L = %d\n", (int)var[2].val.i64); - else - printf("\tFAILED"); - -@@ -555,6 +604,8 @@ int main() - if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 10, 11, var))) - printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %ff\n", - (double) var[10].val.f); -+ else -+ printf("\tFAILED"); - - var[0].val.f = 1.0f; - var[0].type = nsXPTType::T_FLOAT; -@@ -645,6 +696,108 @@ int main() - printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 = %ff\n", - (double) var[20].val.f); - -+ var[0].val.i64 = 1; -+ var[0].type = nsXPTType::T_I64; -+ var[0].flags = 0; -+ -+ var[1].val.i32 = 2; -+ var[1].type = nsXPTType::T_I32; -+ var[1].flags = 0; -+ -+ var[2].val.i64 = 3; -+ var[2].type = nsXPTType::T_I64; -+ var[2].flags = 0; -+ -+ var[3].val.i32 = 4; -+ var[3].type = nsXPTType::T_I32; -+ var[3].flags = 0; -+ -+ var[4].val.i32 = 5; -+ var[4].type = nsXPTType::T_I32; -+ var[4].flags = 0; -+ -+ var[5].val.i64 = 6; -+ var[5].type = nsXPTType::T_I64; -+ var[5].flags = 0; -+ -+ var[6].val.i32 = 7; -+ var[6].type = nsXPTType::T_I32; -+ var[6].flags = 0; -+ -+ var[7].val.i32 = 8; -+ var[7].type = nsXPTType::T_I32; -+ var[7].flags = 0; -+ -+ var[8].val.i64 = 9; -+ var[8].type = nsXPTType::T_I64; -+ var[8].flags = 0; -+ -+ var[9].val.i32 = 10; -+ var[9].type = nsXPTType::T_I32; -+ var[9].flags = 0; -+ -+ var[10].val.i64 = 0; -+ var[10].type = nsXPTType::T_I64; -+ var[10].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[10].ptr = &var[10].val.i64; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 11, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", -+ (int)var[10].val.i64); -+ else -+ printf("\tFAILED"); -+ -+ var[0].val.i32 = 1; -+ var[0].type = nsXPTType::T_I32; -+ var[0].flags = 0; -+ -+ var[1].val.i64 = 2; -+ var[1].type = nsXPTType::T_I64; -+ var[1].flags = 0; -+ -+ var[2].val.i32 = 3; -+ var[2].type = nsXPTType::T_I32; -+ var[2].flags = 0; -+ -+ var[3].val.i64 = 4; -+ var[3].type = nsXPTType::T_I64; -+ var[3].flags = 0; -+ -+ var[4].val.i64 = 5; -+ var[4].type = nsXPTType::T_I64; -+ var[4].flags = 0; -+ -+ var[5].val.i32 = 6; -+ var[5].type = nsXPTType::T_I32; -+ var[5].flags = 0; -+ -+ var[6].val.i64 = 7; -+ var[6].type = nsXPTType::T_I64; -+ var[6].flags = 0; -+ -+ var[7].val.i64 = 8; -+ var[7].type = nsXPTType::T_I64; -+ var[7].flags = 0; -+ -+ var[8].val.i32 = 9; -+ var[8].type = nsXPTType::T_I32; -+ var[8].flags = 0; -+ -+ var[9].val.i64 = 10; -+ var[9].type = nsXPTType::T_I64; -+ var[9].flags = 0; -+ -+ var[10].val.i64 = 0; -+ var[10].type = nsXPTType::T_I64; -+ var[10].flags = nsXPTCVariant::PTR_IS_DATA; -+ var[10].ptr = &var[10].val.i64; -+ -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 13, 11, var))) -+ printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", -+ (int)var[10].val.i64); -+ else -+ printf("\tFAILED"); -+ - var[0].val.p = (void*)"moo"; - var[0].type = nsXPTType::T_CHAR_STR; - var[0].flags = 0; -@@ -658,7 +811,7 @@ int main() - var[2].flags = nsXPTCVariant::PTR_IS_DATA; - var[2].ptr = &var[2].val.p; - -- if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 3, var))) -+ if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 14, 3, var))) - printf(" = %s\n", var[2].val.p); - else - printf("\tFAILED"); - diff --git a/net-www/mozilla/files/mozilla-1.0-asmfixes.patch b/net-www/mozilla/files/mozilla-1.0-asmfixes.patch deleted file mode 100644 index 92287f91b48b..000000000000 --- a/net-www/mozilla/files/mozilla-1.0-asmfixes.patch +++ /dev/null @@ -1,236 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp.asmfixes 2002-06-12 11:03:43.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp 2002-06-12 11:32:57.000000000 +0200 -@@ -40,7 +40,7 @@ - #include "xptcprivate.h" - #include "xptc_platforms_unixish_x86.h" - --static nsresult -+extern "C" nsresult - PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) - { - #define PARAM_BUFFER_COUNT 16 -@@ -102,32 +102,67 @@ PrepareAndDispatch(nsXPTCStubBase* self, - return result; - } - --#ifdef __GNUC__ /* Gnu Compiler. */ --#define STUB_ENTRY(n) \ --nsresult nsXPTCStubBase::Stub##n() \ --{ \ -- register nsresult (*method) (nsXPTCStubBase *, uint32, PRUint32 *) = PrepareAndDispatch; \ -- int temp0, temp1; \ -- register nsresult result; \ -- __asm__ __volatile__( \ -- "leal 0x0c(%%ebp), %%ecx\n\t" /* args */ \ -- "pushl %%ecx\n\t" \ -- "pushl $"#n"\n\t" /* method index */ \ -- "movl 0x08(%%ebp), %%ecx\n\t" /* this */ \ -- "pushl %%ecx\n\t" \ -- "call *%%edx\n\t" /* PrepareAndDispatch */ \ -- "addl $12, %%esp" \ -- : "=a" (result), /* %0 */ \ -- "=&c" (temp0), /* %1 */ \ -- "=d" (temp1) /* %2 */ \ -- : "2" (method) /* %2 */ \ -- : "memory" ); \ -- return result; \ --} -+#ifndef __GNUC__ -+#error "can't find a compiler to use" -+#endif - -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// gcc3 mangling tends to insert the length of the method name -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+"_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+"_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+"_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub" \ -+); - #else --#error "can't find a compiler to use" --#endif /* __GNUC__ */ -+// gcc2 version -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".globl Stub" #n "__14nsXPTCStubBase\n\t" \ -+ ".type Stub" #n "__14nsXPTCStubBase,@function\n" \ -+"Stub" #n "__14nsXPTCStubBase:\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+); -+#endif -+ -+// static nsresult SharedStub(PRUint32 methodIndex) __attribute__((regparm(1))) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+"SharedStub:\n\t" -+ "pushl %ebp\n\t" -+ "movl %esp, %ebp\n\t" -+ "leal 0x0c(%ebp), %ecx\n\t" -+ "pushl %ecx\n\t" -+ "pushl %eax\n\t" -+ "movl 0x08(%ebp), %ecx\n\t" -+ "pushl %ecx\n\t" -+ "call PrepareAndDispatch\n\t" -+ "addl $12, %esp\n\t" -+ "popl %ebp\n\t" -+ "ret" -+); - - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp.asmfixes 2002-06-11 15:48:50.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp 2002-06-12 11:06:49.000000000 +0200 -@@ -40,9 +40,7 @@ - #include "xptcprivate.h" - #include "xptc_platforms_unixish_x86.h" - --extern "C" { -- --static void -+extern "C" void - invoke_copy_to_stack(PRUint32 paramCount, nsXPTCVariant* s, PRUint32* d) - { - for(PRUint32 i = paramCount; i >0; i--, d++, s++) -@@ -70,69 +68,64 @@ invoke_copy_to_stack(PRUint32 paramCount - } - } - --} -- -+extern "C" - XPTC_PUBLIC_API(nsresult) - XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -- PRUint32 paramCount, nsXPTCVariant* params) --{ --#ifdef __GNUC__ /* Gnu compiler. */ -- PRUint32 result; -- // Each param takes at most 2, 4-byte words -- // It doesn't matter if we push too many words, and calculating the exact -- // ammount takes time. -- PRUint32 n = paramCount << 3; -- void (*fn_copy) (unsigned int, nsXPTCVariant *, PRUint32 *) = invoke_copy_to_stack; -- int temp1, temp2, temp3; -- -- __asm__ __volatile__( -- "subl %8, %%esp\n\t" /* make room for params */ -- "pushl %%esp\n\t" -- "pushl %7\n\t" -- "pushl %6\n\t" -- "call *%0\n\t" /* copy params */ -- "addl $0xc, %%esp\n\t" -- "movl %4, %%ecx\n\t" -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+#ifdef __GNUC__ /* GNU compiler */ -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".type XPTC_InvokeByIndex,@function\n" -+"XPTC_InvokeByIndex:\n\t" -+ "pushl %ebp\n\t" -+ "movl %esp, %ebp\n\t" -+ "pushl %ecx\n\t" -+ "pushl %edx\n\t" -+ "pushl %edi\n\t" -+ "movl 0x10(%ebp), %ecx\n\t" /* paramCount */ -+ "movl 0x14(%ebp), %edx\n\t" /* params */ -+ // Each param takes at most 2, 4-byte words -+ // It doesn't matter if we push too many words, and calculating the exact -+ // ammount takes time. -+ "leal 0(,%ecx,8), %edi\n\t" -+ "subl %edi, %esp\n\t" -+ "pushl %esp\n\t" /* copy params */ -+ "pushl %edx\n\t" -+ "pushl %ecx\n\t" -+ "call invoke_copy_to_stack\n\t" -+ "addl $12, %esp\n\t" -+ "movl 0x08(%ebp), %ecx\n\t" /* that */ -+ "movl 0x0c(%ebp), %eax\n\t" /* methodIndex */ - #ifdef CFRONT_STYLE_THIS_ADJUST -- "movl (%%ecx), %%edx\n\t" -- "movl %5, %%eax\n\t" /* function index */ -- "shl $3, %%eax\n\t" /* *= 8 */ -- "addl $8, %%eax\n\t" /* += 8 skip first entry */ -- "addl %%eax, %%edx\n\t" -- "movswl (%%edx), %%eax\n\t" /* 'this' offset */ -- "addl %%eax, %%ecx\n\t" -- "pushl %%ecx\n\t" -- "addl $4, %%edx\n\t" /* += 4, method pointer */ -+#error "FIXME: untested" -+ "movl (%ecx), %edx\n\t" -+ "shl $3, %eax\n\t" /* *= 8 */ -+ "addl $8, %eax\n\t" /* += 8 skip first entry */ -+ "addl %eax, %edx\n\t" -+ "movswl (%edx), %eax\n\t" /* 'this' offset */ -+ "addl %eax, %ecx\n\t" -+ "pushl %ecx\n\t" -+ "addl $4, %edx\n\t" /* += 4, method pointer */ - #else /* THUNK_BASED_THIS_ADJUST */ -- "pushl %%ecx\n\t" -- "movl (%%ecx), %%edx\n\t" -- "movl %5, %%eax\n\t" /* function index */ -+ "pushl %ecx\n\t" -+ "movl (%ecx), %edx\n\t" - #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -- "leal (%%edx,%%eax,4), %%edx\n\t" -+ "leal 0(%edx,%eax,4), %edx\n\t" - #else /* not G++ V3 ABI */ -- "leal 8(%%edx,%%eax,4), %%edx\n\t" -+ "leal 8(%edx,%eax,4), %edx\n\t" - #endif /* G++ V3 ABI */ - #endif -- "call *(%%edx)\n\t" /* safe to not cleanup esp */ -- "addl $4, %%esp\n\t" -- "addl %8, %%esp" -- : "=a" (result), /* %0 */ -- "=c" (temp1), /* %1 */ -- "=d" (temp2), /* %2 */ -- "=g" (temp3) /* %3 */ -- : "g" (that), /* %4 */ -- "g" (methodIndex), /* %5 */ -- "1" (paramCount), /* %6 */ -- "2" (params), /* %7 */ -- "g" (n), /* %8 */ -- "0" (fn_copy) /* %3 */ -- : "memory" -- ); -- -- return result; -- -+ "call *(%edx)\n\t" -+ "addl $4, %esp\n\t" /* reajust stack for "this" pointer */ -+ "addl %edi, %esp\n\t" /* ... and space for params */ -+ "popl %edi\n\t" -+ "popl %edx\n\t" -+ "popl %ecx\n\t" -+ "popl %ebp\n\t" -+ "ret" -+); - #else - #error "can't find a compiler to use" - #endif /* __GNUC__ */ -- --} diff --git a/net-www/mozilla/files/mozilla-1.0.1-platform.patch b/net-www/mozilla/files/mozilla-1.0.1-platform.patch deleted file mode 100644 index 3e3d31e18e9b..000000000000 --- a/net-www/mozilla/files/mozilla-1.0.1-platform.patch +++ /dev/null @@ -1,79 +0,0 @@ -Index: mozilla/security/coreconf/README -=================================================================== -RCS file: /cvsroot/mozilla/security/coreconf/README,v -retrieving revision 1.2 -diff -u -r1.2 README ---- mozilla/security/coreconf/README 27 Dec 2000 00:42:43 -0000 1.2 -+++ mozilla/security/coreconf/README 24 Oct 2002 04:44:32 -0000 -@@ -232,9 +232,6 @@ - $(OS_CONFIG).mk <architecture>-specific macros - (dependent upon <architecture> tags) - -- platform.mk source and release <platform> tags -- (dependent upon <architecture> tags) -- - tree.mk release <tree> tags - (dependent upon <architecture> tags) - -Index: mozilla/security/coreconf/config.mk -=================================================================== -RCS file: /cvsroot/mozilla/security/coreconf/config.mk,v -retrieving revision 1.13 -diff -u -r1.13 config.mk ---- mozilla/security/coreconf/config.mk 18 May 2002 03:24:14 -0000 1.13 -+++ mozilla/security/coreconf/config.mk 24 Oct 2002 04:44:32 -0000 -@@ -70,9 +70,7 @@ - # [4.0] Master "Core Components" source and release <platform> tags # - # (dependent upon <architecture> tags) # - ####################################################################### --ifndef PLATFORM - PLATFORM = $(OBJDIR_NAME) --endif - - ####################################################################### - # [5.0] Master "Core Components" release <tree> tags # -Index: mozilla/security/coreconf/platform.mk -=================================================================== -RCS file: mozilla/security/coreconf/platform.mk -diff -N mozilla/security/coreconf/platform.mk ---- mozilla/security/coreconf/platform.mk 31 Mar 2000 18:55:32 -0000 1.1 -+++ /dev/null 1 Jan 1970 00:00:00 -0000 -@@ -1,38 +0,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 the Netscape security libraries. --# --# The Initial Developer of the Original Code is Netscape --# Communications Corporation. Portions created by Netscape are --# Copyright (C) 1994-2000 Netscape Communications Corporation. All --# Rights Reserved. --# --# Contributor(s): --# --# Alternatively, the contents of this file may be used under the --# terms of the GNU General Public License Version 2 or later (the --# "GPL"), in which case the provisions of the GPL are applicable --# instead of those above. If you wish to allow use of your --# version of this file only under the terms of the GPL and not to --# allow others to use your version of this file under the MPL, --# indicate your decision by deleting the provisions above and --# replace them with the notice and other provisions required by --# the GPL. If you do not delete the provisions above, a recipient --# may use your version of this file under either the MPL or the --# GPL. --# -- --####################################################################### --# Master "Core Components" <platform> tag # --####################################################################### -- --PLATFORM = $(OBJDIR_NAME) diff --git a/net-www/mozilla/files/mozilla-1.0.1-sparc-xpcom.patch b/net-www/mozilla/files/mozilla-1.0.1-sparc-xpcom.patch deleted file mode 100644 index 91afff1f07e5..000000000000 --- a/net-www/mozilla/files/mozilla-1.0.1-sparc-xpcom.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- ./xpcom/reflect/xptcall/src/md/unix/Makefile.in.~1~ Tue Apr 9 20:37:34 2002 -+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue May 14 00:31:31 2002 -@@ -244,7 +244,11 @@ - ifeq ($(OS_ARCH),Linux) - ifneq (,$(findstring sparc,$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc_solaris.cpp xptcstubs_sparc_solaris.cpp -+ifdef HAVE_GCC3_ABI -+ASFILES := xptcinvoke_asm_sparc_linux_GCC3.s xptcstubs_asm_sparc_solaris.s -+else - ASFILES := xptcinvoke_asm_sparc_linux.s xptcstubs_asm_sparc_solaris.s -+endif - endif - endif - # ---- ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_linux_GCC3.s.~1~ Tue May 14 00:36:47 2002 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_linux_GCC3.s Tue May 14 20:10:33 2002 -@@ -0,0 +1,84 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * -+ * 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) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * David S. Miller <davem@redhat.com> (ported to gcc3) -+ * -+ * 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. -+ */ -+ -+/* -+ * Platform specific code to invoke XPCOM methods on native objects for -+ * Linux/Sparc with gcc 3 ABI. -+ */ -+ .global XPTC_InvokeByIndex -+/* -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params); -+ * -+ */ -+XPTC_InvokeByIndex: -+ save %sp,-(64 + 16),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 16 -+ mov %i2,%o0 ! paramCount -+ call invoke_count_words ! returns the required stack size in %o0 -+ mov %i3,%o1 ! params -+ -+ sll %o0,2,%l0 ! number of bytes -+ sub %sp,%l0,%sp ! create the additional stack space -+ -+ mov %sp,%o0 ! pointer for copied args -+ add %o0,72,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+! -+! calculate the target address from the vtable -+! -+ ld [%i0],%l1 ! *that --> vTable -+ sll %i1,2,%i1 ! multiply index by 4 -+ add %i1,%l1,%l1 ! l1 now points to vTable entry -+ ld [%l1],%l0 ! target address -+ -+.L5: ld [%sp + 88],%o5 -+.L4: ld [%sp + 84],%o4 -+.L3: ld [%sp + 80],%o3 -+.L2: ld [%sp + 76],%o2 -+.L1: ld [%sp + 72],%o1 -+.L0: -+ jmpl %l0,%o7 ! call the routine -+! always have a 'this', from the incoming 'that' -+ mov %i0,%o0 -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore |