summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-07-21 04:58:30 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-07-21 04:58:30 +0000
commitb394bae90ab23b7518bfddb4ff63dbe9ec3d0468 (patch)
treea57746452047c41641c57a299d5e11577b9025b1 /www
parentCopy japanese/tdiary to www/tdiary (diff)
Round 3 of ia64 patches. With these patches, Mozilla builds, but has the
core dump problem running regchrome. Submitted by: marcel
Notes
Notes: svn path=/head/; revision=85269
Diffstat (limited to '')
-rw-r--r--www/mozilla/files/patch-Double.cpp17
-rw-r--r--www/mozilla/files/patch-alpha33
-rw-r--r--www/mozilla/files/patch-config::rules.mk14
-rw-r--r--www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in23
4 files changed, 45 insertions, 42 deletions
diff --git a/www/mozilla/files/patch-Double.cpp b/www/mozilla/files/patch-Double.cpp
index 3dabc0260c14..ea09affc26e4 100644
--- a/www/mozilla/files/patch-Double.cpp
+++ b/www/mozilla/files/patch-Double.cpp
@@ -1,11 +1,16 @@
---- extensions/transformiix/source/base/Double.cpp.orig Wed May 21 04:42:05 2003
-+++ extensions/transformiix/source/base/Double.cpp Wed May 21 04:42:24 2003
-@@ -51,7 +51,7 @@
+--- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 00:26:46 2003
++++ extensions/transformiix/source/base/Double.cpp Tue Jun 24 23:30:10 2003
+@@ -51,10 +51,10 @@
//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
#ifdef __FreeBSD__
#include <ieeefp.h>
-#ifdef __alpha__
-+#if defined(__alpha__) || defined(__sparc64__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
+-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+-#else
++#if defined(__i386__)
fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
++#else
++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+ #endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
diff --git a/www/mozilla/files/patch-alpha b/www/mozilla/files/patch-alpha
index f8c1b081c9fa..29631a98e61e 100644
--- a/www/mozilla/files/patch-alpha
+++ b/www/mozilla/files/patch-alpha
@@ -1,36 +1,3 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Mon Jan 27 22:52:51 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue May 27 01:41:12 2003
-@@ -100,9 +100,15 @@
- ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
---- config/rules.mk.orig Mon May 5 21:04:55 2003
-+++ config/rules.mk Tue May 27 01:33:11 2003
-@@ -444,7 +444,11 @@
-
- ifeq ($(OS_ARCH),FreeBSD)
- ifdef IS_COMPONENT
-+ifneq (,$(filter alpha,$(OS_TEST)))
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
- endif
- endif
-
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003
@@ -0,0 +1,184 @@
diff --git a/www/mozilla/files/patch-config::rules.mk b/www/mozilla/files/patch-config::rules.mk
new file mode 100644
index 000000000000..4dda22752411
--- /dev/null
+++ b/www/mozilla/files/patch-config::rules.mk
@@ -0,0 +1,14 @@
+--- config/rules.mk.orig Sun May 18 16:10:18 2003
++++ config/rules.mk Sun Jul 20 18:07:26 2003
+@@ -448,7 +448,11 @@
+
+ ifeq ($(OS_ARCH),FreeBSD)
+ ifdef IS_COMPONENT
++ifeq (,$(filter i386,$(OS_TEST)))
++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
++else
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++endif
+ endif
+ endif
+
diff --git a/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in b/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in
index d1d0dc6f6732..5b911d47b2f9 100644
--- a/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in
+++ b/www/mozilla/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Sat Jul 19 22:50:35 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sat Jul 19 23:46:56 2003
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Sun Jul 20 18:16:25 2003
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Jul 20 11:58:05 2003
@@ -59,13 +59,11 @@
CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
endif
@@ -15,7 +15,24 @@
#
# BeOS/Intel (uses the same unixish_x86 code)
#
-@@ -298,6 +296,15 @@
+@@ -106,9 +104,15 @@
+ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
+ endif
+ #
++# FreeBSD/Alpha
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
++endif
++#
+ # Linux/Alpha
+ #
+-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
+ endif
+ #
+@@ -292,6 +296,15 @@
ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s