summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-07-26 21:49:58 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-07-26 21:49:58 +0000
commit30c1a0a7927d6992cbf7baf9e8e1f637b2e4f6d4 (patch)
tree89c0045d73cc71a8a86842d8aa10f24e71cb5f26 /www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
parent- Update to 0.07 (diff)
- update firefox/thunderbird ESR versions to 10.0.6
- update firefox 14.0.1 - update thunderbird to 14.0 - update seamonkey to 2.11 - switch to new options framework - add experimental rendering via cairo-qt (QT4 option) - add audio backend options (ALSA and PulseAudio) - rename SMB option to GNOMEVFS2 - turn on LOGGING by default (like upstream linux builds) - improve about:memory output - unbreak PGO - use system libs [1] - switch to libevent2 [2] - fix conflict with devel/libunwind and base gcc [3] - unbreak clang/libc++ build [4] - unbreak build with base gcc on >= 9.x [5] - use common IPC code with other BSDs[6] - and *miscellaneous improvements* PR: ports/146231 [1], ports/161421 [2] ports/150631, ports/168369, ports/168637, ports/168793, ports/168978 [3] ports/163454, ports/164905, ports/169231 [4] ports/169389, ports/169479 [5] Obtained from: pkgsrc via bugzilla #753046 [6] In collaboration with: Jan Beich (who did the major part of this work and deserves a special thank you!)
Notes
Notes: svn path=/head/; revision=301582
Diffstat (limited to 'www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c')
-rw-r--r--www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c45
1 files changed, 45 insertions, 0 deletions
diff --git a/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c b/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
new file mode 100644
index 000000000000..eb54e8414e99
--- /dev/null
+++ b/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
@@ -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
+