From patchwork Mon Oct 29 19:53:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 990519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-488553-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sandoe.co.uk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="WqSss6MT"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42kQJg096Nz9s9J for ; Tue, 30 Oct 2018 06:53:37 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:mime-version:subject :message-id:date:cc:to; q=dns; s=default; b=t8KwM6V1olulWhaRUvVM DM9B0rehbZBm+zgoG/hYh2iRvC0gGl+wdtNgTbj0sUQcCr1nJvF2Gu6l/czh8w9c fBJiKBNS+3QGqx96WxiIxZ+yhbrq2Nqd+7cCf69O1GjUSJ7duu6spwGdoTjK415e LVArCg7EakrLd6ITmHehj+k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:mime-version:subject :message-id:date:cc:to; s=default; bh=mARes96LZLIt7hD0eG7NlAkXNO E=; b=WqSss6MTSjD9jN3l794P4pjKm2RpmWbr1c1y8d5ZK7g50zwxQBSMTWnwZ2 9cXMGvdDCvCiSGu/uP57Z3gkMEHfBmc8MWf1JTBhulUgFCbanoXmqoc9oeONujOh /0VWGpzxRNk6dNU6JxaYaZyoqXhm7HPW+uj01BybnN7opqw8k= Received: (qmail 82318 invoked by alias); 29 Oct 2018 19:53:30 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 82292 invoked by uid 89); 29 Oct 2018 19:53:28 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_COUK, KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy=greatest, HCc:D*comcast.net, sk:restore, sk:fno-dia X-HELO: smtp2.wavenetuk.net Received: from smtp2.wavenetuk.net (HELO smtp2.wavenetuk.net) (195.26.37.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 29 Oct 2018 19:53:25 +0000 Received: from euterpe-sie.home (host81-138-1-83.in-addr.btopenworld.com [81.138.1.83]) by smtp2.wavenetuk.net (Postfix) with ESMTPA id 75F036000DC; Mon, 29 Oct 2018 19:53:23 +0000 (GMT) From: Iain Sandoe Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: [PATCH, testsuite, c-compat] Handle another c/l option not recognised by older GCC or clang. Message-Id: <3ED2368F-937D-474A-A292-5804854ED03F@sandoe.co.uk> Date: Mon, 29 Oct 2018 19:53:05 +0000 Cc: Mike Stump To: GCC Patches Hi When using ALT_CC/CXX_UNDER_TEST in the compat/struct-layout-1 tests, the c/l options provided to the “alt” compiler need to avoid latest and greatest GCC capability. The patch tests to see if the ‘alt’ compiler can handle -fno-diagnostics-show-line-numbers. OK for trunk? thanks Iain gcc/testsuite/ * lib/c-compat.exp (compat-use-alt-compiler): handle -fno-diagnostics-show-line-numbers. (compat_setup_dfp): Likewise. diff --git a/gcc/testsuite/lib/c-compat.exp b/gcc/testsuite/lib/c-compat.exp index f021890..45aa80a 100644 --- a/gcc/testsuite/lib/c-compat.exp +++ b/gcc/testsuite/lib/c-compat.exp @@ -35,7 +35,7 @@ load_lib target-libpath.exp # proc compat-use-alt-compiler { } { global GCC_UNDER_TEST ALT_CC_UNDER_TEST - global compat_same_alt compat_alt_caret compat_alt_color + global compat_same_alt compat_alt_caret compat_alt_color compat_no_line_no global TEST_ALWAYS_FLAGS # We don't need to do this if the alternate compiler is actually @@ -48,6 +48,9 @@ proc compat-use-alt-compiler { } { if { $compat_alt_color == 0 } then { regsub -- "-fdiagnostics-color=never" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS } + if { $compat_no_line_no == 0 } then { + regsub -- "-fno-diagnostics-show-line-numbers" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS + } restore_gcc_exec_prefix_env_var } } @@ -77,10 +80,12 @@ proc compat_setup_dfp { } { global compat_have_dfp global compat_alt_caret global compat_alt_color + global compat_no_line_no global TEST_ALWAYS_FLAGS compat_save_TEST_ALWAYS_FLAGS set compat_alt_caret 0 set compat_alt_color 0 + set compat_no_line_no 0 set compat_save_TEST_ALWAYS_FLAGS $TEST_ALWAYS_FLAGS verbose "compat_setup_dfp: $compat_use_alt $compat_same_alt" 2 @@ -100,6 +105,11 @@ proc compat_setup_dfp { } { int dummy; } "-fdiagnostics-color=never"] != 0 } { set compat_alt_color 1 } + if { [check_no_compiler_messages_nocache compat_alt_has_no_line_no object { + int dummy; } "-fno-diagnostics-show-line-numbers"] != 0 } { + set compat_no_line_no 1 + } + compat-use-tst-compiler }