From nobody Sat Apr 20 10:34:56 2024 X-Original-To: dev-commits-src-all@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 4VM7Dx2XSZz5HWhq; Sat, 20 Apr 2024 10:34:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VM7Dw6DLLz4TC3; Sat, 20 Apr 2024 10:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609296; 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=wwkkqxwdHY01ow8Bt5O3ZxnCKhzpSCgixaQ4jEYATA0=; b=Ag2hZLIAqTwbABkXJ4NFhPLS861ZBifixzs8M1i9wQ32JM97BlmmjtiRqC9O/4K8VdZWf6 tisX7VZ1GKGqtP/l+D2M1HIEPZXfAzOhLjE3UnevDtRSAHJwv0PtU14izl3aDECzAOgCXs lGuPd2maR/sSaspjVSh8+qg5k4ecutBcmrNYL9mzNEMLIi1M0dtVUzq3KkkrQjk5dQuMVm CAmz16uWEyyF0nu4dCAOOw2YXdhObeEHje7xUE2VQS+D4vItXoX9xjbUUXDZ1jLG2fDk2X OppFs6DgJo+U0iVsPFGDTfCfbZ4lpgjx0CtWfei0ln45RxB2HWs2/3f5/d/fnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609296; a=rsa-sha256; cv=none; b=oBK+t6LYh8xsaniDwlMIq5cRgeTEGkNO/cKO5QPtjz4poYM0yr9XwwcG4RHIY0MyMZeiEL Ur3V2ycDoSCeTULLnaHwQIvGgxNnZ8i96wHUXCHINnldsKf8lEYHdjeW4mQeEXeZ+BOSoJ pKQIO8P7beINWdmJtlxrPfBCUjcWHAEp0npzFp09ZPk9P5QIA5WG8Bjz7ndYbqDzUSqlzU iS9CsYjE8uy8pEDUkKt0icb7uD9yN2d3HeZh2z2ij6h5tN9RZ0gajitX/kTN//50ChgWFA n5GSB1/q+wDwI24eFR+LYxKi1pNT+syqR6WEOGhFmdWXO8uocKNQ7iaCskJmkQ== 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=1713609296; 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=wwkkqxwdHY01ow8Bt5O3ZxnCKhzpSCgixaQ4jEYATA0=; b=og4Aq37I4oI6vvA0OZJ9Mgnov1w7h7Jphp3jbt6XUH3aAhqQ7fDE2jKhgS33evx09Dtraa EjYR44YnsYa9HRoOjYX9cSjsuOUmtiPsw0ShLIK+5KYIBnBjAasmREm4NOI+CRPirTKC33 /aFTOX5agNrYsQlBsf6vTRbh1Y7VpMiA5InLGoNSDmnDL0JmYI5mBLs1sA9ykhodWNJS7N xmhpNIfn0fb/PT7XqCQ0JDkp+I68B+RP4+WfHU7rLOzczf8C4bSsGrbh/yDc6n8vG7dBOo KYIBkNLrI6vQZivuRBB01NoZGj9ZfXtRGNRhmetMazXMtLAb30aClNc5yp8NWw== 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 4VM7Dw5r1LzYkm; Sat, 20 Apr 2024 10:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43KAYufH014729; Sat, 20 Apr 2024 10:34:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAYupn014726; Sat, 20 Apr 2024 10:34:56 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:34:56 GMT Message-Id: <202404201034.43KAYupn014726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: bf7e13e690c3 - stable/13 - sanitizers: mark __elf_aux_vector as weak, to allow linking without libsys List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf7e13e690c32a86fa2cb4aa31343c935dc6cdcb Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bf7e13e690c32a86fa2cb4aa31343c935dc6cdcb commit bf7e13e690c32a86fa2cb4aa31343c935dc6cdcb Author: Dimitry Andric AuthorDate: 2024-04-14 17:38:42 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:29:10 +0000 sanitizers: mark __elf_aux_vector as weak, to allow linking without libsys After libsys was introduced, linking sanitized programs started failing with: # c++ -fsanitize=address main.cc ld: error: undefined symbol: __elf_aux_vector >>> referenced by sanitizer_linux_libcdep.cpp:950 (/usr/src/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp:950) >>> sanitizer_linux_libcdep.o:(__sanitizer::ReExec()) in archive /usr/lib/clang/17/lib/freebsd/libclang_rt.asan-x86_64.a c++: error: linker command failed with exit code 1 (use -v to see invocation) Mark __elf_aux_vector as weak in the internal sanitizer declaration, so the linker will accept it at link time. The dynamic linker will then take care of the symbol at run time. Suggestion by: brooks PR: 276104, 277393 MFC after: 1 month (cherry picked from commit 8b181c2fbaa8c6b32e5510ef6e3a6d364ff4710e) --- .../compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp index cccbb4d256df..962fff53e447 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp @@ -53,7 +53,7 @@ // that, it was never implemented. So just define it to zero. # undef MAP_NORESERVE # define MAP_NORESERVE 0 -extern const Elf_Auxinfo *__elf_aux_vector; +extern const Elf_Auxinfo *__elf_aux_vector __attribute__ ((weak)); # endif # if SANITIZER_NETBSD