[pkgsrc/trunk]: pkgsrc/www/mozilla Add (tested) amd64 support. From FreeBSD,...

[sekiya <sekiya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10492e45ed1a
branches:  trunk
changeset: 475956:10492e45ed1a
user:      sekiya <sekiya%pkgsrc.org@localhost>
date:      Sun May 30 14:02:01 2004 +0000

description:
Add (tested) amd64 support.  From FreeBSD, mostly.

diffstat:

 www/mozilla/distinfo         |   12 +-
 www/mozilla/patches/patch-ac |   23 +++-
 www/mozilla/patches/patch-ba |   63 ++++++++++++-
 www/mozilla/patches/patch-bb |   21 ++-
 www/mozilla/patches/patch-bs |   14 ++
 www/mozilla/patches/patch-bt |   16 +++
 www/mozilla/patches/patch-bu |  179 ++++++++++++++++++++++++++++++++++++
 www/mozilla/patches/patch-bv |  211 +++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 516 insertions(+), 23 deletions(-)

diffs (truncated from 640 to 300 lines):

diff -r b0764a256c21 -r 10492e45ed1a www/mozilla/distinfo
--- a/www/mozilla/distinfo      Sun May 30 13:29:04 2004 +0000
+++ b/www/mozilla/distinfo      Sun May 30 14:02:01 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.54 2004/04/29 14:39:23 adam Exp $
+$NetBSD: distinfo,v 1.55 2004/05/30 14:02:01 sekiya Exp $
 
 SHA1 (mozilla-source-1.6.tar.bz2) = baecca0ecec35704049ab6debaec6c96adbade35
 Size (mozilla-source-1.6.tar.bz2) = 31037452 bytes
 SHA1 (patch-aa) = 03f158fe673a54b8060d541c80f9ebda2977afc5
 SHA1 (patch-ab) = 9db4b88f3cc0feb267f8715c2e2238fd80b49f62
-SHA1 (patch-ac) = 4cddfd0bfc8acd97db3b974289a79c9ae41c9edf
+SHA1 (patch-ac) = d5e3f5833860cd3404030eff76c993ab48c0d8df
 SHA1 (patch-ad) = 5408db4b7585dcf5855f64a342cc721a23aec449
 SHA1 (patch-ae) = e10936ff84d8f5b631c5c9f18271f21e902ea351
 SHA1 (patch-af) = 8fcedb0bdd48f9527fff8c9b970a0e6ea68711e4
@@ -19,11 +19,15 @@
 SHA1 (patch-ao) = 7048e3a06d1569e31d2350c2473887a50aa81498
 SHA1 (patch-aw) = 5beeefa214a3003a74ccc68776a97a414c6acff1
 SHA1 (patch-ax) = 070c88dee0446b093ab1c2a9120dc1747642d46f
-SHA1 (patch-ba) = e11ab3e2baa19c9db9e320868a9860fedf5c8cec
-SHA1 (patch-bb) = c5350823464250546f95d1c0962ba7ba6a16aa2f
+SHA1 (patch-ba) = cff5e12280379546688ca556259e2265a1542ab8
+SHA1 (patch-bb) = 8fc197bc5b0b53e8ed7c3e8295bf459b42c2c384
 SHA1 (patch-bm) = f557aa3ce9a25c91884cfd42bb505422e52ac958
 SHA1 (patch-bn) = 07573c79b22821873954d7c70821a382ea42fe4e
 SHA1 (patch-bo) = a6bba31568b60818455911279e7db01c49c94498
 SHA1 (patch-bp) = 5f5eed098d2763ca6a4987d012c9377b81300aa3
 SHA1 (patch-bq) = 0c520287d97027da06a5aa65cbd038bf19a49dde
 SHA1 (patch-br) = 560d738c648b864711d663323bdd1478b7d28103
+SHA1 (patch-bs) = e9434aadc52b0120dcfc80e57002152d2bd47605
+SHA1 (patch-bt) = a033b83ee633391ffc138442697fbe754ec92902
+SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
+SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
diff -r b0764a256c21 -r 10492e45ed1a www/mozilla/patches/patch-ac
--- a/www/mozilla/patches/patch-ac      Sun May 30 13:29:04 2004 +0000
+++ b/www/mozilla/patches/patch-ac      Sun May 30 14:02:01 2004 +0000
@@ -1,9 +1,18 @@
-$NetBSD: patch-ac,v 1.21 2004/01/17 00:04:49 taya Exp $
+$NetBSD: patch-ac,v 1.22 2004/05/30 14:02:01 sekiya Exp $
 
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in      2003-08-15 13:00:23.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in    2004-01-16 23:17:21.000000000 +0900
-@@ -135,7 +135,7 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2003-08-15 13:00:23.000000000 +0900
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in      2004-05-30 21:36:44.000000000 +0900
+@@ -49,6 +49,9 @@
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPPSRCS               := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ endif
++ifeq (amd64,$(OS_TEST))
++CPPSRCS                := xptcinvoke_unixish_amd64.cpp xptcstubs_unixish_amd64.cpp
++endif
+ endif
+ #
+ # New code for Linux, et. al., with gcc
+@@ -135,7 +138,7 @@
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -12,7 +21,7 @@
  CPPSRCS               := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -169,7 +169,7 @@
+@@ -169,7 +172,7 @@
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -21,7 +30,7 @@
  CPPSRCS               := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -295,6 +295,13 @@
+@@ -295,6 +298,13 @@
  CPPSRCS               := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES               := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
diff -r b0764a256c21 -r 10492e45ed1a www/mozilla/patches/patch-ba
--- a/www/mozilla/patches/patch-ba      Sun May 30 13:29:04 2004 +0000
+++ b/www/mozilla/patches/patch-ba      Sun May 30 14:02:01 2004 +0000
@@ -1,8 +1,7 @@
-$NetBSD: patch-ba,v 1.15 2004/01/17 00:04:49 taya Exp $
+$NetBSD: patch-ba,v 1.16 2004/05/30 14:02:01 sekiya Exp $
 
-diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg  2000-12-02 06:29:17.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg        2004-01-16 23:17:44.000000000 +0900
+--- nsprpub/pr/include/md/_netbsd.cfg.orig     2000-12-02 06:29:17.000000000 +0900
++++ nsprpub/pr/include/md/_netbsd.cfg  2004-05-30 11:20:29.000000000 +0900
 @@ -45,7 +45,8 @@
  
  #define PR_AF_INET6 24  /* same as AF_INET6 */
@@ -68,3 +67,59 @@
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
+@@ -184,6 +231,55 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
++#elif defined(__amd64__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
++
+ #elif defined(__powerpc__) || defined(__m68k__)
+ 
+ #undef  IS_LITTLE_ENDIAN
diff -r b0764a256c21 -r 10492e45ed1a www/mozilla/patches/patch-bb
--- a/www/mozilla/patches/patch-bb      Sun May 30 13:29:04 2004 +0000
+++ b/www/mozilla/patches/patch-bb      Sun May 30 14:02:01 2004 +0000
@@ -1,9 +1,14 @@
-$NetBSD: patch-bb,v 1.16 2004/02/22 12:02:55 taya Exp $
+$NetBSD: patch-bb,v 1.17 2004/05/30 14:02:01 sekiya Exp $
 
-diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h    2003-09-12 02:24:53.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.h  2004-02-21 16:47:07.000000000 +0900
-@@ -48,12 +48,20 @@
+--- nsprpub/pr/include/md/_netbsd.h.orig       2003-09-12 02:24:53.000000000 +0900
++++ nsprpub/pr/include/md/_netbsd.h    2004-05-30 14:36:16.000000000 +0900
+@@ -44,16 +44,26 @@
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__alpha__)
+ #define _PR_SI_ARCHITECTURE "alpha"
++#elif defined(__amd64__)
++#define _PR_SI_ARCHITECTURE "amd64"
+ #elif defined(__m68k__)
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
  #define _PR_SI_ARCHITECTURE "powerpc"
@@ -24,7 +29,7 @@
  #endif
  
  #if defined(__ELF__)
-@@ -86,6 +94,12 @@
+@@ -86,6 +96,12 @@
  #define _PR_INET6_PROBE
  #endif
  
@@ -37,7 +42,7 @@
  #define USE_SETJMP
  
  #ifndef _PR_PTHREADS
-@@ -108,7 +122,17 @@
+@@ -108,7 +124,17 @@
  }
  #define       _MD_GET_SP(_thread)     CONTEXT(_thread)[2]
  #endif
@@ -56,7 +61,7 @@
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)                 \
  {                                                                     \
      sigsetjmp(CONTEXT(_thread), 1);                                   \
-@@ -150,7 +174,7 @@
+@@ -150,7 +176,7 @@
  }
  #define       _MD_GET_SP(_thread)     CONTEXT(_thread)[32]
  #endif
diff -r b0764a256c21 -r 10492e45ed1a www/mozilla/patches/patch-bs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla/patches/patch-bs      Sun May 30 14:02:01 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-bs,v 1.1 2004/05/30 14:02:01 sekiya Exp $
+
+--- config/mkdepend/imakemdep.h.orig   2004-05-30 11:16:09.000000000 +0900
++++ config/mkdepend/imakemdep.h        2004-05-30 11:17:01.000000000 +0900
+@@ -277,6 +277,9 @@
+ # ifdef __i386__
+       "-D__i386__",
+ # endif
++#if defined(__amd64__) || defined(__x86_64__)
++      "-D__amd64__ -D__x86_64__",
++# endif
+ # ifdef __GNUC__
+       "-traditional",
+ # endif
diff -r b0764a256c21 -r 10492e45ed1a www/mozilla/patches/patch-bt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla/patches/patch-bt      Sun May 30 14:02:01 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-bt,v 1.1 2004/05/30 14:02:01 sekiya Exp $
+
+--- nsprpub/pr/src/io/prprf.c.orig     2003-02-27 08:53:42.000000000 +0900
++++ nsprpub/pr/src/io/prprf.c  2004-05-30 14:47:15.000000000 +0900
+@@ -51,7 +51,10 @@
+ ** Note: on some platforms va_list is defined as an array,
+ ** and requires array notation.
+ */
+-#if (defined(LINUX) && defined(__powerpc__)) || \
++#if defined(__amd64__)
++#include <stdarg.h>
++#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
++#elif (defined(LINUX) && defined(__powerpc__)) || \
+     (defined(LINUX) && defined(__s390__)) || \
+     (defined(LINUX) && defined(__s390x__)) || \
+     defined(WIN16) || defined(QNX) || \
diff -r b0764a256c21 -r 10492e45ed1a www/mozilla/patches/patch-bu
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla/patches/patch-bu      Sun May 30 14:02:01 2004 +0000
@@ -0,0 +1,179 @@
+$NetBSD: patch-bu,v 1.1 2004/05/30 14:02:01 sekiya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig        2004-05-30 21:38:13.000000000 +0900
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp     2004-05-30 21:37:22.000000000 +0900
+@@ -0,0 +1,174 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++// Platform specific code to invoke XPCOM methods on native objects
++
++#include "xptcprivate.h"
++
++// 6 integral parameters are passed in registers
++const PRUint32 GPR_COUNT = 6;
++
++// 8 floating point parameters are passed in SSE registers
++const PRUint32 FPR_COUNT = 8;
++
++// Remember that these 'words' are 64-bit long
++static inline void
++invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
++                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
++{
++    nr_gpr = 1; // skip one GP register for 'that'
++    nr_fpr = 0;
++    nr_stack = 0;
++
++    /* Compute number of eightbytes of class MEMORY.  */
++    for (uint32 i = 0; i < paramCount; i++, s++) {
++        if (!s->IsPtrData()
++            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
++            if (nr_fpr < FPR_COUNT)
++                nr_fpr++;
++            else
++                nr_stack++;
++        }
++        else {
++            if (nr_gpr < GPR_COUNT)
++                nr_gpr++;
++            else
++                nr_stack++;
++        }
++    }
++}
++
++static void
++invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
++                     PRUint64 * gpregs, double * fpregs)
++{
++    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
++    PRUint32 nr_fpr = 0;
++    PRUint64 value;
++
++    for (uint32 i = 0; i < paramCount; i++, s++) {
++        if (s->IsPtrData())
++            value = (PRUint64) s->ptr;