From nobody Tue Mar 04 19:56:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z6mf019b6z5qcHj; Tue, 04 Mar 2025 19:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6mf00KYcz3tdr; Tue, 04 Mar 2025 19:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741118184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2njkWt1l/9u7eTFWtu/q/ccACZj/4nXyhKCLEvCkcEY=; b=vYFTk5qRWfHvaen66UzsbtT8i28dGPDVZ8N3fuE/jbHawcsmZp01ncD+po1/G8Rm6OiHGg RXltF7jgoL6Ip3HH7089LjQ5p/zxobz0XnhVjuzitNWXH5FqeS3Etq6q+gM8LXd5zl/zWW GJHwfEV78kfHZ44upx/R53bLLQbwQceSb8YdVQH9jCJT6tHxLXhFi4andRbjjeWEb9spQL yJQ+GJZX39Epuxc+ftEzeTT927vxAx//d7RHjpP8yEbnsFDPo7hR+vxPB3wChSwTrd1o3t Inr2zuqf1KpfLe88iSB+ByxEgRT0hNnQvKmncTuaSmZLU8Y9kBy8s9ctHu7tBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741118184; a=rsa-sha256; cv=none; b=IVC8yN0GigHMfUA56c6GM9XafzUREYGbr4mC6D9HsBOOFXEfagsUOZwasnnBGKzAqTdMiY BtPx2n/hu9FbWUe3UFT993tnxDVKtmP9Xg14Q7V4G2fKM55UIpuAs28lQYXzotQ5zSdHkl DRF+Z5IH50OjxOxXy3MD80wReRaCUis9zc/L0rzU3kWiz2oy3rwKClpAMXiirhfQRXnX0i f7qBJ59dPHoXxMPMkzkLCZMVBtAytjJ6txwdp+loxyeWAfaQ6xGYEg2668AoK/H+F7NSUO alB0RP2K0A0yeqxp2sbOBZmHohZQgIJCjU//uoF42Fp5/4b3vQVJpsoJBUMsyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741118184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2njkWt1l/9u7eTFWtu/q/ccACZj/4nXyhKCLEvCkcEY=; b=tIRQvLGiLP+6b/VjCKg1JM84hswvW+QIKtCBRIK6vHUjf36V/i7or/28YXxTCEb8AeBGCW pLc3WCszao63lKyAL7vTHra5/lFDOBRwcXFTZCZ+xVJAgoHgQS+dyj/vAOo2H+octxKcKJ yKOSNkhOSTac6HkP8OEIIf7BETVu1PIv8gSlFSw031QSls3i61AoEkJuOJcRoiFvPQTX3L Lb4lmI2Hw00wkLasglq0JqacqOfyHGwgZTTddeNpbuqxczEdvju3UzVsL0VU7dMOhiNbhB UF7w0Y+EgtBZnRsRKiu2qjXf9Kge24lnjc5P4hEvzex6KKCFLtq1JtROL/UbdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z6mdz72tXzYjB; Tue, 04 Mar 2025 19:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 524JuNjg017772; Tue, 4 Mar 2025 19:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524JuNZU017769; Tue, 4 Mar 2025 19:56:23 GMT (envelope-from git) Date: Tue, 4 Mar 2025 19:56:23 GMT Message-Id: <202503041956.524JuNZU017769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 429b03a00ba7 - main - libc: fix _FORTIFY_SOURCE build on aarch64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 429b03a00ba74ae0188cce3f3064cfac023e18c5 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=429b03a00ba74ae0188cce3f3064cfac023e18c5 commit 429b03a00ba74ae0188cce3f3064cfac023e18c5 Author: Kyle Evans AuthorDate: 2025-03-04 19:53:34 +0000 Commit: Kyle Evans CommitDate: 2025-03-04 19:53:34 +0000 libc: fix _FORTIFY_SOURCE build on aarch64 As with their amd64 counterparts, we need to undef these string funcs that _FORTIFY_SOURCE will have defined macros for to avoid breaking the build. Fixes: bea89d038ac ("lib/libc/aarch64/string: add strlcat SIMD [...]") Fixes: 3dc5429158c ("lib/libc/aarch64/string: add strncat SIMD [...]") --- lib/libc/aarch64/string/strlcat.c | 2 ++ lib/libc/aarch64/string/strncat.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/libc/aarch64/string/strlcat.c b/lib/libc/aarch64/string/strlcat.c index c3c996163ade..fe2e75d091c5 100644 --- a/lib/libc/aarch64/string/strlcat.c +++ b/lib/libc/aarch64/string/strlcat.c @@ -8,6 +8,8 @@ #include +#undef strlcat /* _FORTIFY_SOURCE */ + void *__memchr_aarch64(const void *, int, size_t); size_t __strlcpy(char *restrict, const char *restrict, size_t); diff --git a/lib/libc/aarch64/string/strncat.c b/lib/libc/aarch64/string/strncat.c index 33b278ac5e04..2c63ab50b3c3 100644 --- a/lib/libc/aarch64/string/strncat.c +++ b/lib/libc/aarch64/string/strncat.c @@ -8,6 +8,8 @@ #include +#undef strncat /* _FORTIFY_SOURCE */ + void *__memccpy(void *restrict, const void *restrict, int, size_t); char *