en Copyright 2025 Java http://opengrok-test.openoffice.org:8080/history/trunk/main/nss/#7b0e10cf231204097c52931dd9077938d539c487 nss: set CPU_ARCH=aarch64 on Apple Silicon so freebl picks 64-bit HACLThe freebl crypto core fails to link libfreebl3.dylib on arm64: Undefined symbols for architecture arm64: "_Hacl_Poly1305_64_finish", referenced from: _Poly1305Do in chacha20poly1305.o "_Hacl_Poly1305_64_init", ... (and _mk_state/_update)Two arch decisions disagree. chacha20poly1305.c selects the 64-bit Poly1305API when (HAVE_INT128_SUPPORT && (NSS_X86_OR_X64 || __aarch64__)); __aarch64__is a compiler macro always defined on arm64, so it calls Hacl_Poly1305_64_*.But freebl's Makefile only *compiles* Hacl_Poly1305_64.c when CPU_ARCH=aarch64,and coreconf/Darwin.mk sets CPU_ARCH from 'uname -p', which on Apple Siliconis 'arm' (not 'aarch64'). The 'arm' branch did nothing, so the 32-bit sourcewas built and the 64-bit references went unresolved.Override CPU_ARCH=aarch64 in Darwin.mk's arm branch (added to nss_macosx.patch).This makes freebl build the 64-bit Hacl_Poly1305_64.c (and the fastercurve25519_64.c/Hacl_Curve25519.c), matching what the C code already assumes.No -arch flag is added: the build is native arm64.Note this is a different token than the NSPR configure fix (f1b9c24444), whichuses 'arm64' (Apple's -arch linker name); NSS coreconf/freebl use 'aarch64'.The only CPU_ARCH==arm consumer in NSS is freebl/Makefile:239, which isLinux-gated (32-bit ARM asm) and unreachable on Darwin, so the override is safe.Verified the full patch chain (nss.patch, nss_sizes.patch, nss_macosx.patch)applies in order and yields CPU_ARCH=aarch64 -> Hacl_Poly1305_64.c selected. List of files: /trunk/main/nss/nss_macosx.patch Thu, 11 Jun 2026 21:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok-test.openoffice.org:8080/history/trunk/main/nss/#6ca087ffd66b43b0098357ff9ea4c4aa083a0c98 nss: disable -Werror and gtests for the macOS buildNSS 3.39's coreconf/werror.mk enables -Werror by default, and clang 13+adds -Wunused-but-set-variable, which 2018-era NSS code trips: shvfy.c:336:9: error: variable 'count' set but not used [-Werror,-Wunused-but-set-variable]The Linux BUILD_ACTION already passes NSS_ENABLE_WERROR=0; give macOSthe same treatment, plus NSS_DISABLE_GTESTS=1 as on Linux/FreeBSD sothe bundled gtest suite is not built either.Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> List of files: /trunk/main/nss/makefile.mk Thu, 11 Jun 2026 20:00:00 +0000 Jim Jagielski <jimjag@gmail.com>