From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8F16C1382C5 for ; Tue, 20 Mar 2018 22:13:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C2B1E09BF; Tue, 20 Mar 2018 22:13:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2ABF1E09BF for ; Tue, 20 Mar 2018 22:13:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76514335C2E for ; Tue, 20 Mar 2018 22:13:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C109225A for ; Tue, 20 Mar 2018 22:13:28 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1521583994.fd5ea318c3f1b5f59c8b783202a3b22321c2e25f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/files/6.0.0/, sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-6.0.0-r1.ebuild sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch X-VCS-Directories: sys-devel/clang/ sys-devel/clang/files/6.0.0/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fd5ea318c3f1b5f59c8b783202a3b22321c2e25f X-VCS-Branch: master Date: Tue, 20 Mar 2018 22:13:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0ae8e732-2759-4861-8769-01225fa90ff6 X-Archives-Hash: 0bff84e3230322de096978632d117179 commit: fd5ea318c3f1b5f59c8b783202a3b22321c2e25f Author: Michał Górny gentoo org> AuthorDate: Tue Mar 20 20:20:12 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Mar 20 22:13:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd5ea318 sys-devel/clang: Fix test failure w/ USE=compiler-rt in 6.0.0 Closes: https://bugs.gentoo.org/650316 sys-devel/clang/clang-6.0.0-r1.ebuild | 3 +++ ...oss-DSO-CFI-Android-sanitizer-test-for-rt.patch | 30 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/sys-devel/clang/clang-6.0.0-r1.ebuild b/sys-devel/clang/clang-6.0.0-r1.ebuild index c001fef8e41..a8ab8bbb6b6 100644 --- a/sys-devel/clang/clang-6.0.0-r1.ebuild +++ b/sys-devel/clang/clang-6.0.0-r1.ebuild @@ -74,6 +74,9 @@ PATCHES=( # fix Driver crash with CHOST prefix and long command-line # https://bugs.gentoo.org/650082 "${FILESDIR}"/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch + # fix test failure with default-compiler-rt + # https://bugs.gentoo.org/650316 + "${FILESDIR}"/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch ) # Multilib notes: diff --git a/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch b/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch new file mode 100644 index 00000000000..0c664489106 --- /dev/null +++ b/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch @@ -0,0 +1,30 @@ +From f81bc3f2d174ac21e576cdddb736524531258fbe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Mon, 19 Mar 2018 20:55:47 +0100 +Subject: [PATCH 2/2] [test] Fix Cross-DSO CFI Android sanitizer test for + -rtlib=compiler-rt + +Fix the CHECK-CFI-CROSS-DSO-ANDROID test to be more precise and match +specifically 'clang_rt.cfi' rather than any compiler-rt library. This +fixes the failure when the linker command-line contains +clang_rt.builtins library due to CLANG_DEFAULT_RTLIB=compiler-rt. +--- + test/Driver/sanitizer-ld.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c +index 0da4255f69..9309450186 100644 +--- a/test/Driver/sanitizer-ld.c ++++ b/test/Driver/sanitizer-ld.c +@@ -514,7 +514,7 @@ + // RUN: --sysroot=%S/Inputs/basic_android_tree \ + // RUN: | FileCheck --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID %s + // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}" +-// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt. ++// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.cfi + + // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime. + // RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso %s -### -o %t.o 2>&1 \ +-- +2.16.2 +