From nobody Wed Nov 30 12:53:32 2022 X-Original-To: dev-commits-ports-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 4NMfJr2l60z4fvt8; Wed, 30 Nov 2022 12:53:32 +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 4NMfJr2JVFz3P3P; Wed, 30 Nov 2022 12:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669812812; 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=U4sOjCMzbhvmk+XN+JLbCfZK+qV4kI1UUZvNuKwOTvY=; b=a6Fp+F10XbvbuHIaPGYTIaSgLvP+F9MKbfy3C9HMwfK6GKBchTRF4sjLC9vsn63gLpLOxT hYyErfLTPVhKFwM+UYGkoA4Qgp7nApJDA3yjQGQT4Mdx0biQeDGjsmMHPQp40l7Pu5fgDG eHT/Qre6Snxmlr4Y2h/X14e8PR2gp6mEZG5v/vqNJS810J5MeueWZeF3+W85uTNGHRl3HV 2EfDp5ux2OvksIA6MWBfQ8XGcCQHSfwuEp7Cbo+I8+dynq/ty0oU/JSXkxwZq0VaizM9fo SgVp2m0TrtUGH5feejvv6LfwZrfOHkPWe/wnq+9BJFiE2U/fjR5nKLr6M8EsDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669812812; 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=U4sOjCMzbhvmk+XN+JLbCfZK+qV4kI1UUZvNuKwOTvY=; b=HaDnnupRiYYZna8cD9+iynAmXvKjTdnUd9MOt6hgwaCAmhNCgjaFhm/PJmyhvEUzTw7hzH HufPjZGPRyy+X95WwiP4ufWkWcE+mtbJs7v5FP4q98I94lQsfMzaOQ65w7Urz0t72OrRzb vDCWus87pr8fJKKZWhJqzjKf70Sba5ebIFrkWBdSa1pSh6l5hi4BXtcuQiDmdH1ngO22z1 EB6WG3z48b8zZvkvONc1rpqWdeoEuXmpKupAULl7UVTYpNq+roWHUSFEV5luSPTG74UJ9T 1LtCiv0qcPlkY1CjTwvJYXPT5GGuLBgTojYj8PCtD1ux0DBa/Gj09cnXRF5f8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669812812; a=rsa-sha256; cv=none; b=GG2478VZPXcy7DP9PWngf11Bu5BhUJOJsL9YdPXLUe2C9bo02Ul0PPpjqo4bHqLr7u/r4i 2jxrKbwaVWB7uBwE9XskTlkYyKdUZe6apff4sJD4tW7/9Dvi6ZmJ3w0A2HgK3HRdkbK3rA 2nf8mWENa0EbFonE9rC8wM8z2VRFmuFqzT99DvS78J1JQH75CSQmR1D6yFKMmXkD6CrLVM Ys+mh1t/v76WIbqAJUDr2mZ5NPE36PLss0GWwkJBJ9jYMrQZo+iubf/bVVkVQ0rmX9cpce XEg+WG3TSsUFlQKHHYux/CpCd/u8jD+TUTzVHSpiaaUnddvrN/lCSChoPfyZUA== 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 4NMfJr1NgTzx37; Wed, 30 Nov 2022 12:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AUCrWwu090571; Wed, 30 Nov 2022 12:53:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUCrW6r090570; Wed, 30 Nov 2022 12:53:32 GMT (envelope-from git) Date: Wed, 30 Nov 2022 12:53:32 GMT Message-Id: <202211301253.2AUCrW6r090570@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 27141421f69c - main - lang/gcc12: Fix Address sanitizer List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27141421f69cb2d2bc6a462d005b251921f2c52b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=27141421f69cb2d2bc6a462d005b251921f2c52b commit 27141421f69cb2d2bc6a462d005b251921f2c52b Author: Lorenzo Salvadore AuthorDate: 2022-11-26 22:02:08 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-11-30 12:52:52 +0000 lang/gcc12: Fix Address sanitizer Software compiled with -fsanitize=address fails to run with the error message "ASan runtime does not come first in initial library list; you should either link runtime to your application or manually preload it with LD_PRELOAD". This commit fixes the issue by ignoring the [vdso] loaded shared library instead of linux-vdso.so. PR: 267751 Reported by: yuri --- lang/gcc12/Makefile | 2 +- .../files/patch-libsanitizer_asan_asan__linux.cpp | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile index 529e2595718a..5d7601f3635f 100644 --- a/lang/gcc12/Makefile +++ b/lang/gcc12/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 12.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} diff --git a/lang/gcc12/files/patch-libsanitizer_asan_asan__linux.cpp b/lang/gcc12/files/patch-libsanitizer_asan_asan__linux.cpp new file mode 100644 index 000000000000..22630767b114 --- /dev/null +++ b/lang/gcc12/files/patch-libsanitizer_asan_asan__linux.cpp @@ -0,0 +1,18 @@ +Since the vDSO shared librares on Linux and FreeBSD are called +differently, the initialization order check fails on FreeBSD. +This patch fixes it by ignoring [vdso] instead of linux-vdso.so. + +GCC gets the original file from the LLVM Project, so this patch should +probably be upstreamed directly to the LLVM Project rather than to GCC. + +--- libsanitizer/asan/asan_linux.cpp.orig 2022-11-23 10:52:45 UTC ++++ libsanitizer/asan/asan_linux.cpp +@@ -135,7 +135,7 @@ static int FindFirstDSOCallback(struct dl_phdr_info *i + return 0; + + // Ignore vDSO +- if (internal_strncmp(info->dlpi_name, "linux-", sizeof("linux-") - 1) == 0) ++ if (internal_strncmp(info->dlpi_name, "[vdso]", sizeof("[vdso]") - 1) == 0) + return 0; + + #if SANITIZER_FREEBSD || SANITIZER_NETBSD