From patchwork Wed Aug 24 19:06:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 662485 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3sKGxr5ZBpz9sCy for ; Thu, 25 Aug 2016 05:06:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=fOHzd7oe; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=MDj0gAJ9UDIHPvfng v7XKRhK3ghijOHIUJcbhKoP48ZsprP03s/DRWkQIqNH2W71KzD0irnUksgnCw0+f a6oCHM//5YFEun+J3xxstWiRd6FxhG4uySP4HJkhad0jlb4gbLyegnRfaEu0nobA MusoO9s4giOnSs6mx2UIQ6upYM= 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 :message-id:date:from:mime-version:cc:subject:references :in-reply-to:content-type; s=default; bh=5ZaZZNKxohx7InlfIZJilbi 2HuI=; b=fOHzd7oeYCD/SGyv3NQ/91kDxAutVubmV59gwrrJEtiRaI/q7isxiFX YfwZIpCWJ63Ksurh9rxz4JORh1V9u7SxxhppBGLsvXKk/PkgGKhrJmRi04wHY3xv NLLarWTT/UQ8Pv70zXPEGCzazYorpULMeLyjvpsEki5hmNpSf2zQ= Received: (qmail 97733 invoked by alias); 24 Aug 2016 19:06: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 97712 invoked by uid 89); 24 Aug 2016 19:06:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.5 required=5.0 tests=AWL, BAYES_50, MISSING_HEADERS, SPF_PASS autolearn=no version=3.3.2 spammy=awk, SHELL, Regenerated, as_fn_error X-HELO: eu-smtp-delivery-143.mimecast.com Received: from eu-smtp-delivery-143.mimecast.com (HELO eu-smtp-delivery-143.mimecast.com) (146.101.78.143) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 24 Aug 2016 19:06:19 +0000 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp0087.outbound.protection.outlook.com [94.245.120.87]) (Using TLS) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-73-TeZeLkFWPq6VADLqllSi6Q-1; Wed, 24 Aug 2016 20:06:14 +0100 Received: from [10.2.206.73] (217.140.96.140) by VI1PR0802MB2158.eurprd08.prod.outlook.com (10.172.12.15) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.9; Wed, 24 Aug 2016 19:06:11 +0000 Message-ID: <57BDF021.6090207@arm.com> Date: Wed, 24 Aug 2016 20:06:09 +0100 From: Szabolcs Nagy User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 CC: nd , "gcc-patches@gcc.gnu.org" , Jakub Jelinek Subject: [PATCH 1/4][PR 71931] Fix libatomic tests References: <57BDEFC5.4050207@arm.com> In-Reply-To: <57BDEFC5.4050207@arm.com> X-ClientProxiedBy: DB5PR07CA0001.eurprd07.prod.outlook.com (10.167.223.11) To VI1PR0802MB2158.eurprd08.prod.outlook.com (10.172.12.15) X-MS-Office365-Filtering-Correlation-Id: e40c9b5f-b13b-42fa-8546-08d3cc51b6c7 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2158; 2:vhZn5sSVOzPZkJmdQjeCERgKFXz+yBkxgHdT5Tr4bBBYMiFYvuAwkuTgw/uJGO6eN+2mHWC1vEEdKMMVyQ8h03oPUgFZdQ03pTBeGK+c8JnQspM6xj0FrSrPIzbHLKCT9oSKlAVE/GskFzyoraXeYFKkaZNMD2c0pdoqnJPuZWPqWESFcXiQ2XXutLkJV/Os; 3:PTsroqAoKQDT3xKgXmQg2IzPtpBg4EjpvNcQARreMdXNQjCFufG42Kdb8fZaYC4ACP5git0y8qPz6Wt+IQFvrnTZ9A1it2ggG+wMD4o9KVbtALoqT6X0t4r2qJI59bJz X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0802MB2158; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2158; 25:HI0E/5LepHY3EHjtOl1llLSplbJU1jtodbnF4boRweZJLzA1duxwaF38FfN2muv5q3HjOJKMhlqXTthom61cCskSY2h/x1PfnnnGwP70yFi4F2R7IWpWnElcFzhqmeUK96f0zHTPUXtSvgEIkn+EIrLK4nHBuXPQsoYlG/2qVzzt5701G9lKZkz/6/6Ixyu8UPm9WSBNmBLcHwJ1jGt1Uo3VIhn/+9/n5pSQBePKMOSrfdIWu01L8cpwtkpIZA/0OY622H9FjRTLdnU36ZPdYo2eEMBhpXr3oCVRC5NIfbT3IjwSKbS3Yg6gUDX0NIf28Iv3CVqlBFuk2zO5kzaFcwWe++KD6Oi/n8vH50USGNXl74HjnZKki14WQIUpHY3xy1RqP0R4EolknZfVYzuAiU1YhozfTeAZFlNWuiuYCR1XfiL/OTXYwtA8l4+I2VXdsNdHOL9Lmqr2GQ7egVsBShvxX/q7PGabep+DdT5kYT7ouvzGsmzFVpLcS9djCNI8JhM22N1OXAb0kRaWbwMV+yE3sdeD9ONPHKX4htXYdCIoqMBgYNN/tW4HG7Yb4VXovBcJK9bfRtY/aHGMJY1PEAua49vX6MKVMSN12P4SbTlFVbxgZreaCf2m3gvToy/z6D+R4DumtUNlV4ir+SFwpHzKIaJqCLzWKX4Wy+Fbrh4ulyEaqQEL6PTYmt31ltg1SDE9SXCe+io1HZz01enlpxu+k1emKHPfMHFjfMgGEKj8XcmRGAl9Yy0NTYLlq8n5oYK4eDAZM5JpzBLktO2uwDm59PMH46hfbSLUQ4RfLgeWibhg8t6oEvOeW8QoCzngm4br8m7P/LUQfrPDd9l7FQ== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2158; 31:rqAPUYC8NACyFlDhjhmlNbwNMRSTv1LFMqf9N5BSQIIBO++lC8Zrhz4UH95GnEMK2fWQP2gz/7jazHLjDR1KspLZ3iew0mzTgg0ilObFzERskJhApuO0gbZnJTIt+qacwdujaSBESBsyC77cDEU23UHH8sJVWY0EKJrQwztGflKF9dflJtM1Y9N0zZ2hooPNsA/sVrQrnQj4almBP/1UtzZ9ErDiyfB+ra1RipoarQzKHkbmxiQVwPn4BTd72HKN; 20:8VBQyifiDz5D4qpSxsHQkiDIbQzilAacD/3ZH277L7WO3ha21j/hlEaTphtl2XRt4nTlZVJfGSPiarRT1JZmXZzgXq3u8BWw9FS8RxZXWkGCGgnjPqDpDjX+LSElgTuMs95jIhwedlj4wBBJBRWMK3RPBTqlqnHQeGLSHy8PdrU=; 4:TTT3qw7EQitOHCNIQKiuAQhZe39mPNugK59B5PvVr7eDr98SUfO8jq2Gyw7JdcnMCkiL+IY/gqTjBrpItJ3RtApxJFDSZPlCGxraBvFOXEJvI+12LDAiEEJp2/7ODSNpEHDPXUpKy0Lf6+c2MU/5dym0p4uyJjLHX4CmOMrmuO6QazmXgOkPFgyFtej4mT6ZmfWNpn1SLwScmubxb0wf2hUynv4BJbosxGDiKbdfztRNu2P3VwdKYA/+jOKa3fHMysoPUnsCSLcEjP3ql0PLwsjlLOcQizz7WIRzWBzvkm7YopRMO8Dg/Nsn0qfaTonxl5FTZ+6U0xn/FqCvk0dN8gG5TAYISgzfC6KS0OZlCcUpCTolUPEamxSzuBQgwOISIypoYW6zOlIzWrx+K9ICJzptNPqrrzCn3rh7SH1Qcn4fqfwT5XFX/IUQKINVA7uwjT3VjgNieKZWx5TVeEm4IBJy12aKBZwOvZ8KLWhkCLc= NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(102415321)(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:VI1PR0802MB2158; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0802MB2158; X-Forefront-PRVS: 0044C17179 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6049001)(7916002)(377424004)(199003)(189002)(4610100001)(65816999)(36756003)(21490400002)(50986999)(76176999)(64126003)(65806001)(66066001)(65956001)(1671002)(5000100001)(8676002)(84326002)(81166006)(5890100001)(81156014)(83506001)(68736007)(2906002)(92566002)(2950100001)(5660300001)(54356999)(19580405001)(4326007)(80316001)(586003)(7846002)(7736002)(3846002)(87266999)(6116002)(109986004)(2476003)(59896002)(270700001)(105586002)(512874002)(86362001)(189998001)(229853001)(305945005)(59246006)(4001350100001)(110136002)(568964002)(97736004)(33656002)(19580395003)(77096005)(4001450100002)(106356001)(42186005)(101416001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0802MB2158; H:[10.2.206.73]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0802MB2158; 23:tBtAyF776fyKzHBgWV55VVrjp7ydnnQnOeUIyAz?= =?us-ascii?Q?xvDwUaNZ5EnWpa01WU+CdjbyyMCVIoT8jIComudvMO/aoJhvR92ZIdBH4hpe?= =?us-ascii?Q?7ad0yQUeqpr6jK9v5fgWtqyU+8i/jv7tfMmfh6C/1Rwyi40gsS4BKd4Vt2gO?= =?us-ascii?Q?HXc1RrOFp61/lvni9XMI7Lxdtc3hRyhEF+CuZ01bbp9oRO0xVy0nZ8Bu7/EN?= =?us-ascii?Q?7Q3oT6vI9ufDBD96BreNXBJM4tq4r0MXD0Qgf0QWsuDdmsfpcoT1JnO6a1bK?= =?us-ascii?Q?uxsRoc23zZsCJtHu55k5fHtYieQ/rCaS2NUqykQMdZM79ThzdZVtXQr2ofLc?= =?us-ascii?Q?Uai+nfNgMbTTDfyBFUKvSZYxj2zHyGgNsI9uep6xKm772wTCVu3n07ZCpUaB?= =?us-ascii?Q?ASSfn3Qa5+AdzNvz/2c6jVm4K/3G2sJ/x6RYXlK286t+TDNJkvE9SSItK+9g?= =?us-ascii?Q?WqrZaErO7fn6BNGfznCw3dKbQoFNl+7hhBo3mwscuWtQ0yhhIQp9Q5ljN3k/?= =?us-ascii?Q?SKjNuR3UTiFZMNGoJuZSggXpthGsDmdCs1jsYIjhKBKjMVTboXPprXr08RlZ?= =?us-ascii?Q?Gegf96Uvl4iQf1Z53nSR9uLGhc7aA4VbfJrSSTDo/AMONZEJ8KJDqV3BMkil?= =?us-ascii?Q?YPUJ+8t+8Yi/WNTqyruAnZDg0jHzIA4MASNGaGXcrs54FIrs0298ZCfWN6F5?= =?us-ascii?Q?lhOt08TFybjgUneKEcczARTxOPjEcVagk48WOz6+C1CjAO00snchKpkaqsIN?= =?us-ascii?Q?jWx72gIoTP31RucC3h4Om6zhYPEAXlQ6q0wgizp7QXrHOyN5ncfyD9tnyS9i?= =?us-ascii?Q?T55Cz3TkdqCmTPl5CeS7YJp29Dcy7cN9O5qO9WXpW2+hhMgbortqs1wqIbjC?= =?us-ascii?Q?xwUhSIdOFr5UiwJTNSKV//3Sbm2l5lEbFwbT5ZbaDICmBNtG/7ONZPoUo+b3?= =?us-ascii?Q?Iw/uXYhMaWCbafFwlpWZjYAqP39uPu76aBfX65O0VsH8GNntZ6IIZJnGNJkM?= =?us-ascii?Q?PGSlEceuxpO0YlidRleSw7iM6soQuqGKkDTWR6qVjclO9aHFq5ZJFcTCaJa3?= =?us-ascii?Q?Q0ynyKOr2Yuz00sqOZI93CN+Xd7mSoGgdpAPnKFb4UZpsV+KGY47B9B2rlAj?= =?us-ascii?Q?qucaRfC+7LQZxZwVqn84aRqMLvrALbvs72vTfvkCGvRGmtwUQzl5sAPK5V5R?= =?us-ascii?Q?dxl4RMwysz8yZSmhWKWhixLaJTAhTh8hKoK7ns2zpk5dPGlj8aoSXtiVw+iR?= =?us-ascii?Q?p2EJSZvP6gZ+FcH73+b7Xl11leVjuulZNIUpwjRxIARpYon3jtJvTkeNelzB?= =?us-ascii?Q?t8o6zt71SvTQETyqa7oaTJSuDztRIXd9xekmvK2WRjtqEcQ8cLfz+XjkKEaZ?= =?us-ascii?Q?Wxzq4XKiGu/b3iuZZfCe84pgoE6gCBU72Fl2KnywnNqa0rUEpqsk3Gc3Bw+b?= =?us-ascii?Q?mKMnfmmkUFqnUO6uvczpCnt61PcY5HXr5uAllIV26Fp2jfrKD5aj5kbOdona?= =?us-ascii?Q?Umg7vprEx5FglfYMj8/8sV31zTb5TO+Y/s/aGKTDhiJySaqlAOqfJPg6je/f?= =?us-ascii?Q?nskcP/Og7jrMCT+Vyaw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2158; 6:JfiI92bDORtEn5yNn3PQB0mzRyVlz4dxsFndZeCAT9Y3F9aksxeluPsLq9ooT/cTyaqFIEwC7uWD1ZZzGA0P32XsbJvKhO5jO3/6nDTyhtadS46ulc4MTQtP+iWI2ehNkzsvG26NckirSmKlPf8uI73LOx54vdBvPvDq6g3lG+80o2IIAkwCXVe87c+p+lXCZkcfSEUfyYHkou033O9KTLqYLp+jB18TseyXG7UMFkxDL6mkmGEFXYZ/1Vj9pPKyjGU8pXCudEHD+NLsAZA94PKTHPrLT3LcLwKTQYzghzVqyYR6gbFmCjEuKDifv7jfskSdjXwI+GbdqjIkzwtqIQ==; 5:J/uKLwz+EL5EDcXp0QRnfGFbiw/9dWc7Q3F/gCWK9UHTthIY24RPstyiATzmncOVOtCccmLlf0+97cXckN9guKzeq23WikGIZEqDkAd4ZGiIaSXyJg5YdvMZKmGN07+jUYcHO/wQskGqaiYgW/YWpg==; 24:37vas3kn+DCzWcTX3Nl8JN2Mw91b8mTXwV5PsgRJ9SrkKHQhkjYkfNLhfyIm4KcnRWK6ejB8hqYBAXIHV6PfQ6fIZqFulLvSepUl5MKDIDY=; 7:nB/fHMCoxT2DCP39KC9Qlm+97jytqa70Z/XauRn59FklRoYUS6VubUHg7EhK/aD2pyuDeFBU57XTZDloACQl2cNQ9LJnM8LXroysYCE/hQdh7n7Jl3ZNFLlNZfwVqg3IGMMfhyncrfceLYOtqNLMDqmdOaxIoeLt+whH9CO1ucLQ4uJcawd1eqCU3HT5wx/XVWneMkjquXX6jDn5WxZw96RJpKCfhuIldskncKBk6hK1KKKyNR1l1v32viaGqen8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2158; 20:m7m2+QSkULvSUqrt2UMsbxMqwJSOoNvjM1elJWQR7CKQhU09izlnFh+JtCvo7P5kZotMg3G7opnUcnlMuYSGohNLu99BM3DzADafpnmH2dhTO74OhrRZjKI6MTeyobj+QX+9Gg/8oBusjShsrGmLsnL3pNPh+vO6kxTs1dqq8uk= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2016 19:06:11.7375 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2158 X-MC-Unique: TeZeLkFWPq6VADLqllSi6Q-1 X-IsSubscribed: yes Pass build time CC make var down to dejagnu so the sysroot is set correctly when gcc is built with --with-build-sysroot. libatomic/ 2016-08-24 Szabolcs Nagy PR testsuite/71931 * configure.ac: Add AC_CONFIG_FILES. * configure: Regenerated. * testuite/Makefile.am: Add rule for libatomic-test-support.exp. * testuite/Makefile.in: Regenerated. * testuite/libatomic-test-support.exp.in: New. * testuite/lib/libatomic.exp (libatomic_init): Use BUILD_CC. diff --git a/libatomic/configure b/libatomic/configure index 8526abf..d185e9d 100755 --- a/libatomic/configure +++ b/libatomic/configure @@ -9083,7 +9083,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -15264,6 +15264,8 @@ fi ac_config_files="$ac_config_files Makefile testsuite/Makefile" +ac_config_files="$ac_config_files testsuite/libatomic-test-support.exp" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -16312,6 +16314,7 @@ do "gstdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gstdint.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; + "testsuite/libatomic-test-support.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libatomic-test-support.exp" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/libatomic/configure.ac b/libatomic/configure.ac index cf40ea1..7ed2bcc 100644 --- a/libatomic/configure.ac +++ b/libatomic/configure.ac @@ -261,4 +261,5 @@ else fi AC_CONFIG_FILES(Makefile testsuite/Makefile) +AC_CONFIG_FILES(testsuite/libatomic-test-support.exp) AC_OUTPUT diff --git a/libatomic/testsuite/Makefile.am b/libatomic/testsuite/Makefile.am index 561b7e2..6c5e5fc 100644 --- a/libatomic/testsuite/Makefile.am +++ b/libatomic/testsuite/Makefile.am @@ -11,3 +11,5 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS)" + +all-local: libatomic-test-support.exp diff --git a/libatomic/testsuite/Makefile.in b/libatomic/testsuite/Makefile.in index 34f83e0..16f28fa 100644 --- a/libatomic/testsuite/Makefile.in +++ b/libatomic/testsuite/Makefile.in @@ -52,7 +52,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = testsuite -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/libatomic-test-support.exp.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ @@ -69,7 +70,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = $(top_builddir)/auto-config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = libatomic-test-support.exp CONFIG_CLEAN_VPATH_FILES = SOURCES = am__can_run_installinfo = \ @@ -255,6 +256,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +libatomic-test-support.exp: $(top_builddir)/config.status $(srcdir)/libatomic-test-support.exp.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -315,7 +318,7 @@ distclean-DEJAGNU: check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check: check-am -all-am: Makefile +all-am: Makefile all-local installdirs: install: install-am install-exec: install-exec-am @@ -415,19 +418,21 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ - clean-libtool distclean distclean-DEJAGNU distclean-generic \ - distclean-libtool dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am +.PHONY: all all-am all-local check check-DEJAGNU check-am clean \ + clean-generic clean-libtool distclean distclean-DEJAGNU \ + distclean-generic distclean-libtool dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am +all-local: libatomic-test-support.exp + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp index cafab54..e374c64 100644 --- a/libatomic/testsuite/lib/libatomic.exp +++ b/libatomic/testsuite/lib/libatomic.exp @@ -47,6 +47,8 @@ load_gcc_lib timeout.exp load_gcc_lib timeout-dg.exp load_gcc_lib fortran-modules.exp +load_file libatomic-test-support.exp + set dg-do-what-default run # @@ -74,6 +76,7 @@ proc libatomic_init { args } { global ALWAYS_CFLAGS global CFLAGS global TOOL_EXECUTABLE TOOL_OPTIONS + global BUILD_CC global GCC_UNDER_TEST global TESTING_IN_BUILD_TREE global target_triplet @@ -89,6 +92,8 @@ proc libatomic_init { args } { if ![info exists GCC_UNDER_TEST] then { if [info exists TOOL_EXECUTABLE] { set GCC_UNDER_TEST $TOOL_EXECUTABLE + } elseif [info exists BUILD_CC] { + set GCC_UNDER_TEST $BUILD_CC } else { set GCC_UNDER_TEST "[find_gcc]" } diff --git a/libatomic/testsuite/libatomic-test-support.exp.in b/libatomic/testsuite/libatomic-test-support.exp.in new file mode 100644 index 0000000..972f8d5 --- /dev/null +++ b/libatomic/testsuite/libatomic-test-support.exp.in @@ -0,0 +1 @@ +set BUILD_CC "@CC@"