xref: /AOO41X/main/nss/nss_linux.patch (revision 7d46477088b91a5e710510dd14aaacb2982a6bcd)

diff -ur misc/nss-3.39/nss/lib/freebl/Makefile misc/build/nss-3.39/nss/lib/freebl/Makefile
--- misc/nss-3.39/nss/lib/freebl/Makefile   2018-08-31 14:55:53.000000000 +0200
+++ misc/build/nss-3.39/nss/lib/freebl/Makefile 2022-02-01 19:27:40.141084376 +0100
@@ -109,6 +109,8 @@
 # NSS_X64 means the target is a 64-bits 64 CPU architecture
 # NSS_X86_OR_X64 means the target is either x86 or x64
 ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH)))
+# Only on GCC > 4.3
+ifeq (,$(filter 4.1 4.2 4.3,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
         DEFINES += -DNSS_X86_OR_X64
         EXTRA_SRCS += gcm-x86.c aes-x86.c
 $(OBJDIR)/gcm-x86.o: CFLAGS += -mpclmul -maes
@@ -119,6 +121,7 @@
         DEFINES += -DNSS_X86
 endif
 endif
+endif

 ifeq ($(OS_TARGET),OSF1)
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
@@ -224,8 +227,11 @@
     DEFINES += -DMP_IS_LITTLE_ENDIAN
 #   DEFINES += -DMPI_AMD64_ADD
     # comment the next four lines to turn off Intel HW acceleration.
+ifeq (,$(filter 4.1 4.2 4.3,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
+    # Only on GCC > 4.3
     DEFINES += -DUSE_HW_AES -DINTEL_GCM
     ASFILES += intel-aes.s intel-gcm.s
+endif
     EXTRA_SRCS += intel-gcm-wrap.c
     INTEL_GCM = 1
     MPI_SRCS += mpi_amd64.c mp_comba.c
diff -ur misc/nss-3.39/nss/lib/freebl/verified/kremlib.h misc/build/nss-3.39/nss/lib/freebl/verified/kremlib.h
--- misc/nss-3.39/nss/lib/freebl/verified/kremlib.h 2018-08-31 14:55:53.000000000 +0200
+++ misc/build/nss-3.39/nss/lib/freebl/verified/kremlib.h   2022-02-01 19:27:47.193464234 +0100
@@ -179,12 +179,28 @@

 /******************************************************************************/
 /* Endian-ness macros that can only be implemented in C                       */
+/* Patched to allow build AOO on older and newer systems                      */
 /******************************************************************************/

-/* ... for Linux */
-#if defined(__linux__) || defined(__CYGWIN__)
+/* We are under Linux */
 #include <endian.h>

+#if defined(__BYTE_ORDER__)
+#define AOO_BYTE_ORDER_OK
+#else
+/* Older headers use different names for these macros */
+#define __BYTE_ORDER__ __BYTE_ORDER
+#define __ORDER_LITTLE_ENDIAN__ __LITTLE_ENDIAN
+#define __ORDER_BIG_ENDIAN__ __BIG_ENDIAN
+#endif
+
+#ifdef AOO_BYTE_ORDER_OK
+/* All required macros are defined */
+
+/* Otherwise, we will end up in the #ifdef's that will define the ones
+   we miss.
+   Please ignore further comments about different architectures.
+*/
 /* ... for OSX */
 #elif defined(__APPLE__)
 #include <libkern/OSByteOrder.h>
diff -ur misc/nss-3.39/nss/lib/softoken/sdb.c misc/build/nss-3.39/nss/lib/softoken/sdb.c
--- misc/nss-3.39/nss/lib/softoken/sdb.c    2018-08-31 14:55:53.000000000 +0200
+++ misc/build/nss-3.39/nss/lib/softoken/sdb.c  2022-02-01 19:27:40.141084376 +0100
@@ -37,7 +37,7 @@
 #elif defined(XP_UNIX)
 #include <unistd.h>
 #endif
-#if defined(LINUX) && !defined(ANDROID)
+#if defined(LINUX) && !defined(ANDROID) && 0
 #include <linux/magic.h>
 #include <sys/vfs.h>
 #endif
@@ -1944,7 +1944,7 @@
     }

     if (checkFSType) {
-#if defined(LINUX) && !defined(ANDROID)
+#if defined(LINUX) && !defined(ANDROID) && 0
         struct statfs statfs_s;
         if (statfs(dbname, &statfs_s) == 0) {
             switch (statfs_s.f_type) {