From: Min Zhou Date: Fri, 25 Aug 2023 10:02:47 +0000 (+0800) Subject: Resolve assembler complains when including loongarch_arch.h X-Git-Tag: openssl-3.2.0-alpha1~134 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84a0b1b169197e3afdadcdafc9fea65361ff672f;p=thirdparty%2Fopenssl.git 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) --- 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)