From patchwork Tue Mar 12 17:27:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 1055590 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-497771-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="sEZBGGOA"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SaeAWJ0Z"; 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 44JhkM0rRpz9s71 for ; Wed, 13 Mar 2019 04:27:35 +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 :mime-version:from:date:message-id:subject:to:cc:content-type; q=dns; s=default; b=G7hqASOFe3/6JBBCPkpZHjI7851Z3BI7tHTklani4hr LHmdVGqyjkP6rT39pl/e/MI/OK++nQqrpChdGj8q6oMcAeggPDcBoNOV/CeCG4Rh 2pAphBbT26mgSkouawuImlqdVi1epBvf6JfTsWQ6HpfKHHeMMHJCcFvS4XP+dKWI = 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 :mime-version:from:date:message-id:subject:to:cc:content-type; s=default; bh=LVLU72GsuWlgvClhQs/rANwdplE=; b=sEZBGGOABOYxETKvo iLOJXu1dk7MpvyHms1tml7/N7vLYNckfECvkTTfSRGciTgRZvErDFet3pXPZw+Jo Uhc1uZNpq6nF9qNA1RM8BgovldlshUqq/KclaPbcIHslQ67+Ta3YyQemfbfkNbi6 NMk0UbwPhirjgAr+E9yGDrFcfo= Received: (qmail 517 invoked by alias); 12 Mar 2019 17:27:28 -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 508 invoked by uid 89); 12 Mar 2019 17:27:28 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-6.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-io1-f41.google.com Received: from mail-io1-f41.google.com (HELO mail-io1-f41.google.com) (209.85.166.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 12 Mar 2019 17:27:27 +0000 Received: by mail-io1-f41.google.com with SMTP id f6so2830263iop.3 for ; Tue, 12 Mar 2019 10:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=UXaz9LxZQ3HSngtqwFBOiOFbvcMVNdjcWmHGs7k0G5o=; b=SaeAWJ0ZrYRSRHnyq0wnlAMpx1AGVzVvbU51tXKUzD2z/IQKHr43Hdolv0xBpYaLDz 3E08uFF/fr0DkzyBcjFb+N9M9/G6Hs704fIFNADEGq1/+iel59X6fSnDZaV+4x0JdKz6 LMJ7gcC/HBnV+5manfN0i9feN9TpkXJbhqa0FxvewwbaXsRHeMks3Jygm/y84lXHpy8H wdH/a/B4vAhSGZFC9OmJvlKUj2yV0s58T/u1uyiWFI9YRv2VZYgCpH6F4alfWGyvtEKs /bdlS9CQQfPtwIZ0rnZj0LH/JZhZvI/3y34aHuENT45BmRMuQ5auL/aewIpsMNY2kqgx ZYWQ== MIME-Version: 1.0 From: Uros Bizjak Date: Tue, 12 Mar 2019 18:27:14 +0100 Message-ID: Subject: [PATCH, d/87824]: x86_64-linux multilib issues To: "gcc-patches@gcc.gnu.org" Cc: Iain Buclaw Attached patch fixes libstdc++ includes for multilib d testsuite and fixes runnable/cppa.d testsuite failure with 32bit multilib on x86_64-linux-gnu. 2019-03-12 Uroš Bizjak PR d/87824 * lib/gdc.exp (gdc_include_flags): Find C++ headers by calling libstdc++v3/scripts/testsuite_flags. Filter out unsupported -nostdinc++ flag. Tested on x86_64-linux-gnu {,-m32}. OK for mainline? Uros. Index: lib/gdc.exp =================================================================== --- lib/gdc.exp (revision 269617) +++ lib/gdc.exp (working copy) @@ -88,14 +88,13 @@ append flags "-I${srcdir}/../../libphobos/libdruntime " append flags "-I${srcdir}/../../libphobos/src " - # For the tests that mix C++ and D, we should try and handle this better. - if { $gccpath != "" } { - if [file exists "${gccpath}/libstdc++-v3/include"] { - append flags "-I${gccpath}/libstdc++-v3/include " - append flags "-I${gccpath}/libstdc++-v3/include/$target " - } + # For the tests that mix C++ and D, need to know where headers are located. + set odir [lookfor_file ${gccpath} libstdc++-v3] + if { ${odir} != "" } { + set cxxflags [exec sh ${odir}/scripts/testsuite_flags --build-includes] + set idx [lsearch $cxxflags "-nostdinc++"] + append flags [lreplace $cxxflags $idx $idx] } - append flags "-I${srcdir}/../../libstdc++-v3/libsupc++" } #