From 84a0b1b169197e3afdadcdafc9fea65361ff672f Mon Sep 17 00:00:00 2001 From: Min Zhou Date: Fri, 25 Aug 2023 18:02:47 +0800 Subject: [PATCH] Resolve assembler complains when including loongarch_arch.h The assembler will complain when we include loongarch_arch.h in an assembly file as following: crypto/loongarch_arch.h: Assembler messages: crypto/loongarch_arch.h:12: Fatal error: no match insn: extern unsigned int OPENSSL_loongarch_hwcap_P So, the sentence of `extern unsigned int OPENSSL_loongarch_hwcap_P` should be guarded with "#ifndef __ASSEMBLER__". Fixes #21838. Signed-off-by: Min Zhou Reviewed-by: Hugo Landau Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/21839) --- crypto/loongarch_arch.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crypto/loongarch_arch.h b/crypto/loongarch_arch.h index 454be913329..9d895fe344d 100644 --- a/crypto/loongarch_arch.h +++ b/crypto/loongarch_arch.h @@ -9,7 +9,10 @@ #ifndef OSSL_CRYPTO_LOONGARCH_ARCH_H # define OSSL_CRYPTO_LOONGARCH_ARCH_H +# ifndef __ASSEMBLER__ extern unsigned int OPENSSL_loongarch_hwcap_P; +# endif + # define LOONGARCH_HWCAP_LSX (1 << 4) # define LOONGARCH_HWCAP_LASX (1 << 5) -- 2.47.3