[Libreoffice-commits] core.git: external/nss

[Julien Nabet (via logerrit)]

 external/nss/ExternalProject_nss.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 61d9a4a24405b151d212fa19e5c1edb09f5f2a42
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Jan 3 14:09:46 2021 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Jan 3 17:20:27 2021 +0100

    Fix nss build on Raspberry pi4
    
    In file included from gcm-arm32-neon.c:16:
    /usr/lib/llvm-11/lib/clang/11.0.0/include/arm_neon.h:32:2: error: "NEON support not enabled"
    error "NEON support not enabled"
     ^
    
    gcm-arm32-neon.c:21:5: warning: implicit declaration of function 'vst1_u8' is invalid in C99 [-Wimplicit-function-declaration]
        vst1_u8(outbuf, vrev64_u8(vcreate_u8(ghash->x_high)));
        ^
    gcm-arm32-neon.c:21:21: warning: implicit declaration of function 'vrev64_u8' is invalid in C99 [-Wimplicit-function-declaration]
        vst1_u8(outbuf, vrev64_u8(vcreate_u8(ghash->x_high)));
                        ^
    gcm-arm32-neon.c:21:31: warning: implicit declaration of function 'vcreate_u8' is invalid in C99 [-Wimplicit-function-declaration]
        vst1_u8(outbuf, vrev64_u8(vcreate_u8(ghash->x_high)));
                                  ^
    gcm-arm32-neon.c:27:15: error: unknown type name 'uint8x16_t'; did you mean 'uint16_t'?
    static inline uint8x16_t
                  ^~~~~~~~~~
                  uint16_t
    /usr/include/arm-linux-gnueabihf/bits/stdint-uintn.h:25:20: note: 'uint16_t' declared here
    typedef __uint16_t uint16_t;
                       ^
    gcm-arm32-neon.c:28:13: error: unknown type name 'uint8x8_t'; did you mean 'uint8_t'?
    clmul(const uint8x8_t a, const uint8x8_t b)
                ^~~~~~~~~
                uint8_t
    etc.
    
    Change-Id: I1e241cea5becb159f8b0f898270dc88f93f68670
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108634
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 19831b6c3633..c7738ca2d759 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -54,6 +54,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
 			NSS_USE_SYSTEM_SQLITE=1) \
 		$(if $(filter LINUX,$(OS)),$(if $(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
 		$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
+		$(if $(filter ARM,$(CPUNAME)),NSS_DISABLE_ARM32_NEON=1) \
 		$(if $(CROSS_COMPILING),\
 			CROSS_COMPILE=1 \
 			NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \