HomeFreeBSD

security/nss: unbreak aarch64 on -CURRENT

Description

security/nss: unbreak aarch64 on -CURRENT

blinit.c:159:24: error: expected readable system register

id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
               ^

/usr/include/machine/armreg.h:61:19: note: expanded from macro 'READ_SPECIALREG'

__asm __volatile("mrs   %0, " __STRING(reg) : "=&r" (_val));    \
                 ^

<inline asm>:1:10: note: instantiated into assembly here

mrs     x8, (((3) << 19) | ((0) << 16) | ((0) << 12) | ((6) << 8) | ((0) << 5))
            ^

blinit.c:160:28: error: implicit declaration of function 'ID_AA64ISAR0_AES' is invalid in C99 [-Werror,-Wimplicit-function-declaration]

arm_aes_support_ = ID_AA64ISAR0_AES(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE && disable_hw_aes == NULL;
                   ^

blinit.c:162:29: error: implicit declaration of function 'ID_AA64ISAR0_SHA1' is invalid in C99 [-Werror,-Wimplicit-function-declaration]

arm_sha1_support_ = ID_AA64ISAR0_SHA1(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE;
                    ^

blinit.c:162:29: note: did you mean 'ID_AA64ISAR0_AES'?
blinit.c:160:28: note: 'ID_AA64ISAR0_AES' declared here

arm_aes_support_ = ID_AA64ISAR0_AES(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE && disable_hw_aes == NULL;
                   ^

blinit.c:163:29: error: implicit declaration of function 'ID_AA64ISAR0_SHA2' is invalid in C99 [-Werror,-Wimplicit-function-declaration]

arm_sha2_support_ = ID_AA64ISAR0_SHA2(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE;
                    ^

blinit.c:163:29: note: did you mean 'ID_AA64ISAR0_SHA1'?
blinit.c:162:29: note: 'ID_AA64ISAR0_SHA1' declared here

arm_sha1_support_ = ID_AA64ISAR0_SHA1(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE;
                    ^

PR: 242104
Reported by: pkg-fallout
Submitted by: Mikaƫl Urankar

Details

Provenance
jbeichAuthored on
Parents
rP518281: - shift to post-extract
Branches
Unknown
Tags
Unknown