Date: Fri, 8 Jun 2012 14:00:35 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r724 - in branches/experimental: mail/thunderbird-beta/files mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-beta/files www/firefox-esr/files www/firefox/files www/firefox36/files www/libxul/files www/seamonkey-beta/files www/seamonkey/files Message-ID: <201206081400.q58E0Zrx028330@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jun 8 14:00:34 2012
New Revision: 724
Log:
add missing bits to ppc64 support in bundled nss
PR: ports/147696 (based on)
Added:
branches/experimental/www/firefox-beta/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
Modified:
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,12 +1,16 @@
--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-04-30 19:44:32.000000000 +0000
+++ mozilla/security/coreconf/FreeBSD.mk 2010-05-10 13:04:45.000000000 +0000
-@@ -52,6 +52,15 @@
+@@ -52,6 +52,19 @@
ifeq ($(CPU_ARCH),amd64)
CPU_ARCH = x86_64
endif
+ifeq ($(OS_TEST),amd64)
+CPU_ARCH = amd64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Modified: branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Added: branches/experimental/www/firefox-beta/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Fri Jun 8 14:00:34 2012 (r724)
@@ -0,0 +1,45 @@
+--- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100
++++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100
+@@ -733,6 +733,34 @@
+ #endif
+
+ #if defined(__ppc64__)
++#if defined(__FreeBSD__)
++#include <sys/stddef.h>
++#include <sys/sysctl.h>
++
++#include <machine/cpu.h>
++#include <machine/md_var.h>
++
++unsigned long
++s_mpi_getProcessorLineSize()
++{
++ static int cacheline_size = 0;
++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
++ int clen;
++
++ if (cacheline_size > 0)
++ return cacheline_size;
++
++ clen = sizeof(cacheline_size);
++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size)
++ return 128; /* guess */
++
++ return cacheline_size;
++}
++#else /* __FreeBSD__ */
++
++
++
+ /*
+ * Sigh, The PPC has some really nice features to help us determine cache
+ * size, since it had lots of direct control functions to do so. The POWER
+@@ -786,6 +814,7 @@
+ return 0;
+ }
+
++#endif /* __FreeBSD__ */
+ #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1
+ #endif
+
Modified: branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Added: branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Fri Jun 8 14:00:34 2012 (r724)
@@ -0,0 +1,45 @@
+--- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100
++++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100
+@@ -733,6 +733,34 @@
+ #endif
+
+ #if defined(__ppc64__)
++#if defined(__FreeBSD__)
++#include <sys/stddef.h>
++#include <sys/sysctl.h>
++
++#include <machine/cpu.h>
++#include <machine/md_var.h>
++
++unsigned long
++s_mpi_getProcessorLineSize()
++{
++ static int cacheline_size = 0;
++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
++ int clen;
++
++ if (cacheline_size > 0)
++ return cacheline_size;
++
++ clen = sizeof(cacheline_size);
++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size)
++ return 128; /* guess */
++
++ return cacheline_size;
++}
++#else /* __FreeBSD__ */
++
++
++
+ /*
+ * Sigh, The PPC has some really nice features to help us determine cache
+ * size, since it had lots of direct control functions to do so. The POWER
+@@ -786,6 +814,7 @@
+ return 0;
+ }
+
++#endif /* __FreeBSD__ */
+ #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1
+ #endif
+
Modified: branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Added: branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Fri Jun 8 14:00:34 2012 (r724)
@@ -0,0 +1,45 @@
+--- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100
++++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100
+@@ -733,6 +733,34 @@
+ #endif
+
+ #if defined(__ppc64__)
++#if defined(__FreeBSD__)
++#include <sys/stddef.h>
++#include <sys/sysctl.h>
++
++#include <machine/cpu.h>
++#include <machine/md_var.h>
++
++unsigned long
++s_mpi_getProcessorLineSize()
++{
++ static int cacheline_size = 0;
++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
++ int clen;
++
++ if (cacheline_size > 0)
++ return cacheline_size;
++
++ clen = sizeof(cacheline_size);
++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size)
++ return 128; /* guess */
++
++ return cacheline_size;
++}
++#else /* __FreeBSD__ */
++
++
++
+ /*
+ * Sigh, The PPC has some really nice features to help us determine cache
+ * size, since it had lots of direct control functions to do so. The POWER
+@@ -786,6 +814,7 @@
+ return 0;
+ }
+
++#endif /* __FreeBSD__ */
+ #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1
+ #endif
+
Modified: branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000
+++ security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Modified: branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000
+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 13:58:50 2012 (r723)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:00:34 2012 (r724)
@@ -1,6 +1,6 @@
--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000
+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000
-@@ -49,8 +49,20 @@
+@@ -49,8 +49,24 @@
ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
@@ -15,6 +15,10 @@
+ifeq ($(OS_TEST),ia64)
+CPU_ARCH = ia64
+endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++endif
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206081400.q58E0Zrx028330>