Port ia64 support from www/mozilla.

6 files changed, 74 insertions, 11 deletions

diff --git a/www/firefox/files/patch-config-rules.mk b/www/firefox/files/patch-config-rules.mk
index aa586a3bca82..ecc3c8194dcc 100644
--- a/www/firefox/files/patch-config-rules.mk
+++ b/www/firefox/files/patch-config-rules.mk
@@ -1,10 +1,10 @@
---- config/rules.mk.orig	Mon May  5 21:04:55 2003
-+++ config/rules.mk	Tue May 27 01:33:11 2003
+--- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
++++ config/rules.mk	Sun Feb  1 15:11:41 2004
 @@ -444,7 +444,11 @@
  
  ifeq ($(OS_ARCH),FreeBSD)
  ifdef IS_COMPONENT
-+ifneq (,$(filter alpha,$(OS_TEST)))
++ifneq (,$(filter alpha ia64,$(OS_TEST)))
 +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
 +else
  EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
diff --git a/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg b/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg
index a2aa9f4b4432..3ac9a34fbc70 100644
--- a/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg
+++ b/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg
@@ -1,5 +1,5 @@
---- nsprpub/pr/include/md/_freebsd.cfg	Wed Jan  2 18:38:25 2002
-+++ nsprpub/pr/include/md/_freebsd.cfg	Sat Dec 13 13:02:49 2003
+--- nsprpub/pr/include/md/_freebsd.cfg.orig	Wed Jan  2 18:38:25 2002
++++ nsprpub/pr/include/md/_freebsd.cfg	Sun Feb  1 15:09:53 2004
 @@ -91,7 +91,7 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
@@ -9,7 +9,7 @@
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
-@@ -138,6 +138,146 @@
+@@ -138,6 +138,149 @@
  #define PR_ALIGN_OF_DOUBLE  8
  #define PR_ALIGN_OF_POINTER 8
  
@@ -63,6 +63,9 @@
 +#elif defined(__ia64__)
 +#define IS_LITTLE_ENDIAN 1
 +#undef  IS_BIG_ENDIAN
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
 +#define IS_64
 +
 +#define PR_BYTES_PER_BYTE   1
diff --git a/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.h b/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.h
index 7d4af1cea2b7..18f809bf396b 100644
--- a/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.h
+++ b/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.h
@@ -1,11 +1,13 @@
---- nsprpub/pr/include/md/_freebsd.h	Thu Jan 16 15:09:12 2003
-+++ nsprpub/pr/include/md/_freebsd.h	Sat Dec 13 13:02:49 2003
-@@ -48,6 +48,10 @@
+--- nsprpub/pr/include/md/_freebsd.h.orig	Thu Jan 16 15:09:12 2003
++++ nsprpub/pr/include/md/_freebsd.h	Sun Feb  1 15:21:56 2004
+@@ -48,6 +48,12 @@
  #define _PR_SI_ARCHITECTURE "x86"
  #elif defined(__alpha)
  #define _PR_SI_ARCHITECTURE "alpha"
 +#elif defined(__sparc__)
 +#define _PR_SI_ARCHITECTURE "sparc"
++#elif defined(__ia64__)
++#define _PR_SI_ARCHITECTURE "ia64"
 +#elif defined(__amd64__)
 +#define _PR_SI_ARCHITECTURE "amd64"
  #else
diff --git a/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
new file mode 100644
index 000000000000..94ae99042c41
--- /dev/null
+++ b/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
@@ -0,0 +1,11 @@
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Sun Feb  1 15:39:59 2004
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Sun Feb  1 15:40:11 2004
+@@ -8,7 +8,7 @@
+ *  1 is AddRef
+ *  2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64)
+ XPTC_EXPORT NS_IMETHOD Stub3();
+ XPTC_EXPORT NS_IMETHOD Stub4();
+ XPTC_EXPORT NS_IMETHOD Stub5();
diff --git a/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
index a609c0d5d5e0..fcde57b85b3a 100644
--- a/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ b/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Dec 13 13:02:49 2003
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
 @@ -49,6 +49,9 @@
  ifeq (86,$(findstring 86,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
@@ -10,6 +10,15 @@
  endif
  #
  # New code for Linux, et. al., with gcc
+@@ -60,7 +63,7 @@
+ endif
+ endif
+ # IA64 Linux
+-ifneq (,$(filter Linux,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
+ ifneq (,$(findstring ia64,$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
+ ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
 @@ -106,9 +109,15 @@
  ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
  endif
diff --git a/www/firefox/files/patch-xptcall-ia64 b/www/firefox/files/patch-xptcall-ia64
new file mode 100644
index 000000000000..9cd07f7ddbb2
--- /dev/null
+++ b/www/firefox/files/patch-xptcall-ia64
@@ -0,0 +1,38 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig	Sun Jul 20 00:05:32 2003
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s	Sun Jul 20 00:06:37 2003
+@@ -8,6 +8,7 @@
+ // Section has executable code
+         .section .text, "ax","progbits"
+ // procedure named 'XPTC_InvokeByIndex'
++	.global	XPTC_InvokeByIndex
+         .proc   XPTC_InvokeByIndex
+ // manual bundling
+         .explicit
+@@ -24,7 +25,7 @@
+ 
+ // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+ //   PRUint32 paramCount, nsXPTCVariant* params);
+-XPTC_InvokeByIndex::
++XPTC_InvokeByIndex:
+         .prologue
+         .save ar.pfs, r37
+ // allocate 4 input args, 6 local args, and 8 output args
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	Sun Jul 20 00:02:02 2003
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	Sun Jul 20 00:02:40 2003
+@@ -6,6 +6,7 @@
+ // Section has executable code
+         .section .text, "ax","progbits"
+ // procedure named 'SharedStub'
++	.global SharedStub
+         .proc   SharedStub
+ // manual bundling
+         .explicit
+@@ -14,7 +15,7 @@
+ //      .exclass  PrepareAndDispatch, @fullyvisible
+         .type   PrepareAndDispatch,@function
+ 
+-SharedStub::
++SharedStub:
+ // 9 arguments, first 8 are the input arguments of previous
+ // function call.  The last one is methodIndex, and is passed in memory
+         .prologue