From patchwork Fri Feb 28 01:17:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 1246241 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-520282-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=JhC69UB9; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=KORwSiWV; 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 48TBW030HYz9sNg for ; Fri, 28 Feb 2020 12:18:20 +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:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; q=dns; s=default; b=OazWxbZSSyOUBZDv ileFfF/U0cF8fhjgq9sOM5B+8Gz71B/osK9Q4CP7SImKVta8HdhJvmsfVhCGORsW B8chCrUS9dwuF40oFUpz6ilP9A0UXB4AmRx8qofCqN1r24FTGyxNW8PZT0z6PvCf ffr6yAxNISxlhi9Sw4DQt4R5ThI= 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:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; s=default; bh=lN2itiv2zr3XWp/mL7O+dH esmIo=; b=JhC69UB9NM7ub5ydDmA808DufNewd4rOI045vEUUDb48TNz4agB81O qfwu1f/iJ6OPp3XHDpnScEomwDYzNqhd9bgR1iiBki4Q1ND9ZyrzWblHm8v9UYc/ 6Rao2/+h5GR3kQD68VRz5VERfx3DZ6zcOjh7AwdtqkBiY04aiTl64= Received: (qmail 32797 invoked by alias); 28 Feb 2020 01:18:12 -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 32736 invoked by uid 89); 28 Feb 2020 01:18:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-8.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS autolearn=ham version=3.3.1 spammy=bringing X-HELO: esa4.hgst.iphmx.com Received: from esa4.hgst.iphmx.com (HELO esa4.hgst.iphmx.com) (216.71.154.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Feb 2020 01:17:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1582852677; x=1614388677; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=14KNx+it4JxWlaGHuiD969OqKMERMV1AcEng9oN8gJw=; b=KORwSiWVOde06xoze+QKEw3AQQtFoYOz6fjfphxVq0g410jY0h/Ctfny i+ImhSR5CLGE+w1QF+dyNAF8cBGAF3YCaQi0LKtT4vh5Ra1U0muEPT8bm KkHpBwXg2yrkh+BTXHiGTvEw6GEJ9NJqIvyWkFM8vzyW3FobFwG2b5vOi kovVVI77+CkcQtx8oJ3F6LCvXY4C/ds2ixNErE7UcO7qxRSze0GrzJ2nF +tlApaKNc4J1nLla8yK5g1mTOiDglEe6QiVa3TINRPy9ZZLy3y98wUHOI b8uTDFM571SNNJ+UyvC/UyYPmwrlJ6O0Y80yNcxEEKW+amZHFejT4fyCC Q==; IronPort-SDR: ca7D2bKXFKBCbkQPpeBiOvoatTrKdaNcUYxxxxiDP+sDmEiYwLmndyYIx0wmfNpcmqVBxKZmjA AtA+tO2qxmYYjbLc2tPo2OAz7nYCbdbpWWHcXWw37zTsT1xyp7K3ZCaOWm/5BhpyCgKn3csW2Q BVMBKkNMo8LDgqemmQQInLUxPW+9xuzvuXf6cGGk9UJQiQjwJpe3s0Nv/XK7FSD/O3ajVRHZkz WETYF6w0j0gVs86WHbn4maclras/wKDAxh9hawwoe/S7q+9WobvbbxnIiNZTZOBW3uZ240eros jbQ= Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 28 Feb 2020 09:17:55 +0800 IronPort-SDR: cVYdAYTh7/Of32OJwv8tOlzq87Za0EuEnjr+Qb2l+JGlPG2+eUNNPPsgZkrrvKJ+l3OyP/9Eho tCppzkq14tD8HiptrSYQeJ8WyG40C2g6AndKlGpZYbR3Pbg0rsTYII9KqPj7zQp/rSILCB500e LyLdeY1jwqR9oRdYB6mfKnpKdGDkUkLjWxYzqUH68CrCRlX+KjAzEodoD0qGSoMbfuT2iEAtRU C7n4XsNQv6YD7+yVBNMN249eTqNPTyCQbQz3hQ+RkKihLagL5t/6nkjAAjELQ6jLoPJdB+wYU7 30eC4sdbX2SwBd2N8IOKu9QZ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:10:18 -0800 IronPort-SDR: DnHpsKg1wdYaz4e1j4QLtiPxkWBRF4aCQsdaptrdNSO2zbfdS5tbWYR/oSDnQXvfGYMtJn9E4v WUDN/nVTCYBB4SVicIRpLYywl2nQUBqTUJ11HnXP1ekUU72VjnOeYb6s+rFZvKvREhQp+9iSU8 AncqdlOxBsr8yW0djpF9lQmHTSeMw+3t6JES1euPc4xo9kLENlsKGp7xm7YG9B+7Hu4SGkLfsT 8nhd/J5kohpbHi1lUocsaPZJtv13XVV0RXablzYOCQhJaICjoqSsH4DrbmYa+4js9/SlMI/Ojv Wsg= WDCIronportException: Internal Received: from unknown (HELO redsun52) ([10.149.66.28]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:17:53 -0800 Date: Fri, 28 Feb 2020 01:17:51 +0000 (GMT) From: "Maciej W. Rozycki" To: gcc-patches@gcc.gnu.org cc: Julian Brown , Tobias Burnus , Jeff Law , Thomas Schwinge , Mike Stump , Chung-Lin Tang , Ian Lance Taylor Subject: [PATCH v3 1/4] libatomic/test: Fix compilation for build sysroot In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Fix a problem with the libatomic testsuite using a method to determine the compiler to use resulting in the tool being different from one the library has been built with, and causing a catastrophic failure from the lack of a suitable `--sysroot=' option where the `--with-build-sysroot=' configuration option has been used to build the compiler resulting in the inability to link executables. Address this problem by providing a DejaGNU configuration file defining the compiler to use, via the GCC_UNDER_TEST TCL variable, set from $CC by autoconf, which will have all the required options set for the target compiler to build executables in the environment configured, removing failures like: .../bin/riscv64-linux-gnu-ld: cannot find crt1.o: No such file or directory .../bin/riscv64-linux-gnu-ld: cannot find -lm collect2: error: ld returned 1 exit status compiler exited with status 1 FAIL: libatomic.c/atomic-compare-exchange-1.c (test for excess errors) Excess errors: .../bin/riscv64-linux-gnu-ld: cannot find crt1.o: No such file or directory .../bin/riscv64-linux-gnu-ld: cannot find -lm UNRESOLVED: libatomic.c/atomic-compare-exchange-1.c compilation failed to produce executable and bringing overall test results for the `riscv64-linux-gnu' target (here with the `x86_64-linux-gnu' host and RISC-V QEMU in the Linux user emulation mode as the target board) from: === libatomic Summary === # of unexpected failures 27 # of unresolved testcases 27 to: === libatomic Summary === # of expected passes 54 libatomic/ * configure.ac: Add testsuite/libatomic-site-extra.exp to output files. * configure: Regenerate. * libatomic/testsuite/libatomic-site-extra.exp.in: New file. * testsuite/Makefile.am (EXTRA_DEJAGNU_SITE_CONFIG): New variable. * testsuite/Makefile.in: Regenerate. --- Changes from v2: - Revert to v1. - Rename testsuite/libatomic-test-support.exp.in to testsuite/libatomic-site-extra.exp.in. Changes from v1: - Remove testsuite/libatomic-test-support.exp.in and the associated changes. - Pass $(CC) via `--tool_exec' in $(AM_RUNTESTFLAGS). --- libatomic/configure | 3 +++ libatomic/configure.ac | 1 + libatomic/testsuite/Makefile.am | 2 ++ libatomic/testsuite/Makefile.in | 5 ++++- libatomic/testsuite/libatomic-site-extra.exp.in | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) gcc-test-libatomic-gcc-under-test.diff Index: gcc/libatomic/configure =================================================================== --- gcc.orig/libatomic/configure +++ gcc/libatomic/configure @@ -15728,6 +15728,8 @@ fi ac_config_files="$ac_config_files Makefile testsuite/Makefile" +ac_config_files="$ac_config_files testsuite/libatomic-site-extra.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 @@ -16799,6 +16801,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-site-extra.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libatomic-site-extra.exp" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac Index: gcc/libatomic/configure.ac =================================================================== --- gcc.orig/libatomic/configure.ac +++ gcc/libatomic/configure.ac @@ -288,4 +288,5 @@ else fi AC_CONFIG_FILES(Makefile testsuite/Makefile) +AC_CONFIG_FILES(testsuite/libatomic-site-extra.exp) AC_OUTPUT Index: gcc/libatomic/testsuite/Makefile.am =================================================================== --- gcc.orig/libatomic/testsuite/Makefile.am +++ gcc/libatomic/testsuite/Makefile.am @@ -11,3 +11,5 @@ EXPECT = $(shell if test -f $(top_buildd _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \ echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS) + +EXTRA_DEJAGNU_SITE_CONFIG = libatomic-site-extra.exp Index: gcc/libatomic/testsuite/Makefile.in =================================================================== --- gcc.orig/libatomic/testsuite/Makefile.in +++ gcc/libatomic/testsuite/Makefile.in @@ -109,7 +109,7 @@ am__configure_deps = $(am__aclocal_m4_de DIST_COMMON = $(srcdir)/Makefile.am mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = $(top_builddir)/auto-config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = libatomic-site-extra.exp CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -278,6 +278,7 @@ _RUNTEST = $(shell if test -f $(top_srcd echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS) +EXTRA_DEJAGNU_SITE_CONFIG = libatomic-site-extra.exp all: all-am .SUFFIXES: @@ -310,6 +311,8 @@ $(top_srcdir)/configure: @MAINTAINER_MOD $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +libatomic-site-extra.exp: $(top_builddir)/config.status $(srcdir)/libatomic-site-extra.exp.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo Index: gcc/libatomic/testsuite/libatomic-site-extra.exp.in =================================================================== --- /dev/null +++ gcc/libatomic/testsuite/libatomic-site-extra.exp.in @@ -0,0 +1 @@ +set GCC_UNDER_TEST {@CC@} From patchwork Fri Feb 28 01:18:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 1246242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-520283-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=sAA7DCSi; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=LHFCFneN; 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 48TBWG4Dzcz9sNg for ; Fri, 28 Feb 2020 12:18:34 +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:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; q=dns; s=default; b=XxuBCWjgg+58U4zn or9EPI0O9bB819SU6vLkV3+K4o0h/i90oA/Tyhwc3LhrVaYDFcrDFR6i4sUBDqun XNp1ZB/h1SsPZPWLdbUg6MT6cf14LOH4eumpmULZWaiHdmnj4WI+TEh8YsM/iO0m VXIjObwjclo11IXnybru3ecZQ3A= 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:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; s=default; bh=D/fONSfxal1VaW34xx35bX 9JUBo=; b=sAA7DCSiasaSzxo2BVTFiw9r4gO8MUmMs9OLehy+e5pqGjAwfFTtkU iqSj3E4YZD9rAdCZuT6qccOel+p4AZZt5qGEzMlIV4DBmQSaC4+QYrj4TrdSgs1A ZtjKvr7aBU1M0FN07LSYk3ao+SkZimYZBFkXuDMitPE5roXPvoJzk= Received: (qmail 34337 invoked by alias); 28 Feb 2020 01:18:25 -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 33551 invoked by uid 89); 28 Feb 2020 01:18:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS autolearn=ham version=3.3.1 spammy= X-HELO: esa2.hgst.iphmx.com Received: from esa2.hgst.iphmx.com (HELO esa2.hgst.iphmx.com) (68.232.143.124) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Feb 2020 01:18:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1582852701; x=1614388701; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=/ZMwz0e9QT+qfDZZib6PZPmRi229TdKtTL9FpLSPojM=; b=LHFCFneN4PKw1e7fURAyQsKQXGvkw7NWKXr5KQO3vAoGrInzSfPcq1Av Hl20GAthXKfakQsziyf4K23HR1LGcyD9+nSxPNFnk0qC37QcPw+MYpZug rWCpv1OHu59LkT5SjZeFoJLN570o3TXYyCuDFDhIDmIR0bc6llyAslV49 MLR8IvJFJ4UlEapSa1bHtrC8hwGDbziLa20iqYSLreeYqtBPF2lDJoo5F y/BBLOMNpnB51ZC3kl0NiPY3CaNhLG7XeaW6IrlHjnsZsfE7bkPrSlotL FBgINRWZoMyxhlXSP9i21KXoGyhBPAOXgYeZshAjiw5rh3GujlEjXOJXa w==; IronPort-SDR: 7516k+0vgqm6UFFpQvWDojyQeQafH0ALa3dioBtXJqS1r0/pFQuO5o+TXz7WV0vARHuOhI0ARx ZjNHWNAZl/nFeU09PkqFM5teAwIHnUJGFWMB3nkVoCqWL8mmTAHwvTqd1c+NFsqOrbTXKT/kH0 a4dI+W4LTK89Aon/PVUY3JTrSNapbSOdZY9QcnSrzzab+mqAsvfEcha7RQX37uHef0j8AAdwJe 9EBu30gx4fScDPorLpAdCbVieg051Wcx8oPeb61rxeGif9e/pUW/O36CzkHpMmrA0fAGcTPye3 wcI= Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 28 Feb 2020 09:18:19 +0800 IronPort-SDR: R5TIicAjULxSFz+XWmlBZCCc/WMpsyO77IxGJUbKkAw7psDQLEXudLXsmoB2BkBSL7BCp5fAL7 1tPUiHC81ewglADK2EzFjmT4rEiY4+fLuS+vxlf+aUIvJFdjlMa680fXVu41P88mX6E267yWDx Dzr4kHNDlmFFMld1R/P9OPca5z7vkJ4LFWYKgG6Ald2EESPfvbHkZsdQIywj+HJPUWS19nYCyT 86R7wo9i9ls+SpyHNyaS4f21lxo6UJRYkQyxeBj+siTVcN1ig1/pSJ8otgI3jqoHpj4KVNEG7Q NrbRYVSjKAlN3yCB/s5HsbK9 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:10:37 -0800 IronPort-SDR: MtnuUsDupuyj8SOisI2rNOG+VeqFEsJI4R/eyuWAUcmLv9OJfneeSnrhYH/jwWISMLTbCuMEgy Mp2KUmKHcOJu9OlFR7ZYn+mBWLvxB78NJS/JVnv0C2nmza8uDyB5Q0+5OfOal4RVocNJEXVA5Z zzjD2nTgSMp4m2dc+rvX7wTiDXcWpJJY1QOhf5HBiwKKwyCkfh7Iqhl+WM0FizZ6AKC1S98lK7 vJqF3khGMhSAYXL6GMcdV+Y6+q4TD50bQEeaQQGFndwLZ6GIt1UWQXVfgBES9Q+8PrfuwreZVc YHY= WDCIronportException: Internal Received: from unknown (HELO redsun52) ([10.149.66.28]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:18:14 -0800 Date: Fri, 28 Feb 2020 01:18:10 +0000 (GMT) From: "Maciej W. Rozycki" To: gcc-patches@gcc.gnu.org cc: Julian Brown , Tobias Burnus , Jeff Law , Thomas Schwinge , Mike Stump , Chung-Lin Tang , Ian Lance Taylor Subject: [PATCH v3 2/4] libffi/test: Fix compilation for build sysroot In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Fix a problem with the libffi testsuite using a method to determine the compiler to use resulting in the tool being different from one the library has been built with, and causing a catastrophic failure from the inability to actually choose any compiler at all in a cross-compilation configuration. Address this problem by providing a DejaGNU configuration file defining the compiler to use, via the GCC_UNDER_TEST TCL variable, set from $CC by autoconf, which will have all the required options set for the target compiler to build executables in the environment configured, removing failures like: FAIL: libffi.call/closure_fn0.c -W -Wall -Wno-psabi -O0 (test for excess errors) Excess errors: default_target_compile: No compiler to compile with UNRESOLVED: libffi.call/closure_fn0.c -W -Wall -Wno-psabi -O0 compilation failed to produce executable and bringing overall test results for the `riscv64-linux-gnu' target (here with the `x86_64-linux-gnu' host and RISC-V QEMU in the Linux user emulation mode as the target board) from: === libffi Summary === # of unexpected failures 708 # of unresolved testcases 708 # of unsupported tests 30 to: === libffi Summary === # of expected passes 1934 # of unsupported tests 28 Also respect the TOOL_EXECUTABLE TCL variable for a standalone run via `runtest' and remove an unused TOOL_OPTIONS TCL variable instance. libffi/ * configure.ac: Add testsuite/libffi-site-extra.exp to output files. * configure: Regenerate. * testsuite/libffi-site-extra.exp.in: New file. * testsuite/Makefile.am (EXTRA_DEJAGNU_SITE_CONFIG): New variable. * testsuite/Makefile.in: Regenerate. * testsuite/lib/libffi.exp (libffi-init): Handle GCC_UNDER_TEST. (libffi_target_compile): Likewise. --- Changes from v2: - Revert to v1. - Rename testsuite/libffi-test-support.exp.in to testsuite/libffi-site-extra.exp.in. Changes from v1: - Remove testsuite/libffi-test-support.exp.in and the associated changes. - Pass $(CC) via `--tool_exec' in $(AM_RUNTESTFLAGS). --- libffi/configure | 3 ++- libffi/configure.ac | 2 +- libffi/testsuite/Makefile.am | 2 ++ libffi/testsuite/Makefile.in | 5 ++++- libffi/testsuite/lib/libffi.exp | 16 ++++++++++++++-- libffi/testsuite/libffi-site-extra.exp.in | 1 + 6 files changed, 24 insertions(+), 5 deletions(-) gcc-test-libffi-gcc-under-test.diff Index: gcc/libffi/configure =================================================================== --- gcc.orig/libffi/configure +++ gcc/libffi/configure @@ -16662,7 +16662,7 @@ ac_config_commands="$ac_config_commands ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h" -ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc" +ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile testsuite/libffi-site-extra.exp man/Makefile libffi.pc" cat >confcache <<\_ACEOF @@ -17829,6 +17829,7 @@ do "include/ffi.h") CONFIG_FILES="$CONFIG_FILES include/ffi.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; + "testsuite/libffi-site-extra.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libffi-site-extra.exp" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;; Index: gcc/libffi/configure.ac =================================================================== --- gcc.orig/libffi/configure.ac +++ gcc/libffi/configure.ac @@ -377,6 +377,6 @@ test -d src/$TARGETDIR || mkdir src/$TAR AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h) -AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc) +AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile testsuite/libffi-site-extra.exp man/Makefile libffi.pc) AC_OUTPUT Index: gcc/libffi/testsuite/Makefile.am =================================================================== --- gcc.orig/libffi/testsuite/Makefile.am +++ gcc/libffi/testsuite/Makefile.am @@ -11,6 +11,8 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja echo $(top_srcdir)/../dejagnu/runtest ; \ else echo runtest; fi` +EXTRA_DEJAGNU_SITE_CONFIG = libffi-site-extra.exp + AM_RUNTESTFLAGS = CLEANFILES = *.exe core* *.log *.sum Index: gcc/libffi/testsuite/Makefile.in =================================================================== --- gcc.orig/libffi/testsuite/Makefile.in +++ gcc/libffi/testsuite/Makefile.in @@ -106,7 +106,7 @@ am__configure_deps = $(am__aclocal_m4_de DIST_COMMON = $(srcdir)/Makefile.am mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = $(top_builddir)/fficonfig.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = libffi-site-extra.exp CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -279,6 +279,7 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja echo $(top_srcdir)/../dejagnu/runtest ; \ else echo runtest; fi` +EXTRA_DEJAGNU_SITE_CONFIG = libffi-site-extra.exp CLEANFILES = *.exe core* *.log *.sum EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \ libffi.call/cls_align_longdouble_split.c \ @@ -390,6 +391,8 @@ $(top_srcdir)/configure: @MAINTAINER_MOD $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +libffi-site-extra.exp: $(top_builddir)/config.status $(srcdir)/libffi-site-extra.exp.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo Index: gcc/libffi/testsuite/lib/libffi.exp =================================================================== --- gcc.orig/libffi/testsuite/lib/libffi.exp +++ gcc/libffi/testsuite/lib/libffi.exp @@ -99,7 +99,8 @@ proc libffi-init { args } { global blddirffi global objdir global blddircxx - global TOOL_OPTIONS + global TOOL_EXECUTABLE + global GCC_UNDER_TEST global tool global libffi_include global libffi_link_flags @@ -123,7 +124,15 @@ proc libffi-init { args } { set ld_library_path "." append ld_library_path ":${gccdir}" - set compiler "${gccdir}/xgcc" + if ![info exists GCC_UNDER_TEST] then { + if [info exists TOOL_EXECUTABLE] { + set GCC_UNDER_TEST $TOOL_EXECUTABLE + } else { + set GCC_UNDER_TEST "[find_gcc]" + } + } + + set compiler [lindex $GCC_UNDER_TEST 0] if { [is_remote host] == 0 && [which $compiler] != 0 } { foreach i "[exec $compiler --print-multi-lib]" { set mldir "" @@ -175,11 +184,14 @@ proc libffi_target_compile { source dest global srcdir global blddirffi global TOOL_OPTIONS + global GCC_UNDER_TEST global libffi_link_flags global libffi_include global target_triplet + lappend options "compiler=$GCC_UNDER_TEST" + if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } { lappend options "libs=${gluefile}" lappend options "ldflags=$wrap_flags" Index: gcc/libffi/testsuite/libffi-site-extra.exp.in =================================================================== --- /dev/null +++ gcc/libffi/testsuite/libffi-site-extra.exp.in @@ -0,0 +1 @@ +set GCC_UNDER_TEST {@CC@} From patchwork Fri Feb 28 01:18:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 1246243 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-520284-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=lVGYcUVO; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=XH0CPhiW; 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 48TBWc5R48z9sNg for ; Fri, 28 Feb 2020 12:18:52 +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:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; q=dns; s=default; b=s2fCNqGYyuDIOH1L e/xbSfMWfJP7e5HO2WvpNKWbfj9JTsv0q/AjY7OuvZPfVk3UowuIvGJqfpK/CyMB j+E8N83nVDLAopTuoKtCZBvTgE1rm5Tm3QBGKiBEuUGC3QJt/qdgZj47/VY9Ch/h YRfwVcE2gab/DMRrNpEjG/MoMuQ= 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:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; s=default; bh=paf3dayux8ufxSLQ84J63S YjuH8=; b=lVGYcUVOzhHe4WEwfoVsc/ES4FqkOowe5EFjh1N8y7vkb5JsRb5Hob IRBe8HM+zcGVR/mW6pYseE9AkpuHESSXrwJFJVB7o0psafDB6+XIOqpNzevQjhPv XB7Z+vtwcj8goThbUCSKrMfOQDupomNL/6xrU0jvV7tLs87biwwME= Received: (qmail 35887 invoked by alias); 28 Feb 2020 01:18:44 -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 35871 invoked by uid 89); 28 Feb 2020 01:18:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-8.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_SHORT autolearn=ham version=3.3.1 spammy= X-HELO: esa6.hgst.iphmx.com Received: from esa6.hgst.iphmx.com (HELO esa6.hgst.iphmx.com) (216.71.154.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Feb 2020 01:18:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1582852721; x=1614388721; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=+F+XnNwMpsfMW4/SMrK5bqZMIq7LnqHzu8SubrDNGSA=; b=XH0CPhiWJ1I/zy+J8GUfHx9xlORLFwWJ8phnpOd8pq0Zru79R27WBdvC zdtpgc1XF0DNm/2dklWbg4oKgS9bFW5PRaKl86n6huaKDSs9ZDQ2D/lMe o8TqEMxLh8Oavih0M515/YPOTyRa6JZeW3iqV8VUKo8NlIfr08syp39XV okA5ToK+XFykUKSyPDyYOEVvaiDB/0SRPcDeRrcty37CUuj/BDWiNj2Eg QzMTTnUW3uk0BZ6oiPbpHn96E+L4wRqw2dRe8qIe/OldrAEeF0jqsBlG/ NClK8v6jvOaWhaGuY2sqNc94oTkswLarEhQ4e78YLE7O1dqwHNO4hdbbp w==; IronPort-SDR: gth/hpiVQMRQPivQhzYcjIRiCt3l7Kx1GEuYXw1QPjJPHnZI8Ce2Gvi9zMO2bNoPsde1NgOs/6 nesj6fl3c3berz1fE5ETw7JzIHhV+ue6KQw4MwZpDX/5953+hfhiNImHcb5HKFJz/d63WxYidz frHZamhJUPe0iCMlZDdgzk6cPAvquwqNlDBJzMLuEzNsvM6buVG21eCPQCPwg7w/BTLa31C2aX +Zta7vNIqRzKmHa1XW7llxx1vVKFDYhdmHKh0ZRq0TihyUq2gRbcxKKPofxN0gg/fHx/Edg4rM i5c= Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 28 Feb 2020 09:18:39 +0800 IronPort-SDR: 7yrs7yhA+thcx1reEAman946xqejCODQ3hM8yZkQak+hLh3u4PWpo2SDjcT9elz9ko6ZeYnYRO 8Grq7ouTrKLCpfPV+m9M9VVXPlX3zJulsSVmn0JJFA4BS95udtHTxGRPCqOJLCd9p40kLtmafk TNQiFlfwiT6BsP7IsIWHt5NVWMjZG3nEcnC0yWDPv9ryzcnlumtrYz0p6yCGxq2NxQsrARRFSB Pm+9tJ8Zq2u1imrI8ZpKJqIlxzyQ0QvvWiv1RBb+tFsv/whl9+GPFQ6FDlKUDvUx2jQvGF+2CF avlL4wuQxIix45nSbgbwUTeT Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:10:38 -0800 IronPort-SDR: iXtgNbx5MtoIHEJmxMKJmB0IlQ+KsuTfdMJQOFFy2sKiUTI+v2lC8twC3InnKYcZgN3/YHx7+q lbXI5yGa66A8ly7ou0xDqiY3qg2zDlVHYl+f5i3ofARpc3zmOh/cY7+9WcQYIdvysSQakdm1ZW 3oIz8942a3GMgFJiz4l6mSQm6qXHccd2HwfvzZewBJ9HYCaX3CVoFSiQe3uCQizgejTjyWgn2H jjDfR5CNHytQOllZhNo5vKiLweb+fiUaxldAI1FsQVsnIDBsqNW++gOYY9r8qIGHOyf5SKsvB6 LSw= WDCIronportException: Internal Received: from unknown (HELO redsun52) ([10.149.66.28]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:18:36 -0800 Date: Fri, 28 Feb 2020 01:18:34 +0000 (GMT) From: "Maciej W. Rozycki" To: gcc-patches@gcc.gnu.org cc: Julian Brown , Tobias Burnus , Jeff Law , Thomas Schwinge , Mike Stump , Chung-Lin Tang , Ian Lance Taylor Subject: [PATCH v3 3/4] libgo/test: Complement compilation fix for build sysroot In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Complement commit b72813a68c94 ("libgo: fix DejaGNU testsuite compiler when using build sysroot") and move testsuite/libgo-test-support.exp.in to testsuite/libgo-site-extra.exp.in. Update testsuite/lib/libgo.exp to handle the `--tool_exec' option to `runtest' as with other top-level GCC target libraries, by using the TOOL_EXECUTABLE TCL variable. libgo/ * configure.ac: Produce testsuite/libgo-site-extra.exp rather than testsuite/libgo-test-support.exp. * configure: Regenerate. * testsuite/libgo-test-support.exp.in: Rename file to... * testsuite/libgo-site-extra.exp.in: ... this. * testsuite/Makefile.am: Use libgo-site-extra.exp rather than libgo-test-support.exp. * testsuite/Makefile.in: Regenerate. * testsuite/lib/libgo.exp: Handle TOOL_EXECUTABLE. --- Changes from v2: - Rename testsuite/libgo-test-support.exp.in to testsuite/libgo-site-extra.exp.in. Applies on top of v1. --- libgo/configure | 4 ++-- libgo/configure.ac | 2 +- libgo/testsuite/Makefile.am | 2 +- libgo/testsuite/Makefile.in | 6 +++--- libgo/testsuite/lib/libgo.exp | 12 ++++++++---- libgo/testsuite/libgo-site-extra.exp.in | 17 +++++++++++++++++ libgo/testsuite/libgo-test-support.exp.in | 17 ----------------- 7 files changed, 32 insertions(+), 28 deletions(-) gcc-test-libgo-site-extra.diff Index: gcc/libgo/configure =================================================================== --- gcc.orig/libgo/configure +++ gcc/libgo/configure @@ -15880,7 +15880,7 @@ else multilib_arg= fi -ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/libgo-test-support.exp" +ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/libgo-site-extra.exp" ac_config_commands="$ac_config_commands default" @@ -17061,7 +17061,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; - "testsuite/libgo-test-support.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libgo-test-support.exp" ;; + "testsuite/libgo-site-extra.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libgo-site-extra.exp" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; Index: gcc/libgo/configure.ac =================================================================== --- gcc.orig/libgo/configure.ac +++ gcc/libgo/configure.ac @@ -889,7 +889,7 @@ else multilib_arg= fi -AC_CONFIG_FILES(Makefile testsuite/Makefile testsuite/libgo-test-support.exp) +AC_CONFIG_FILES(Makefile testsuite/Makefile testsuite/libgo-site-extra.exp) AC_CONFIG_COMMANDS([default], [if test -n "$CONFIG_FILES"; then Index: gcc/libgo/testsuite/Makefile.am =================================================================== --- gcc.orig/libgo/testsuite/Makefile.am +++ gcc/libgo/testsuite/Makefile.am @@ -11,7 +11,7 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja echo $(top_srcdir)/../dejagnu/runtest ; \ else echo runtest; fi` -EXTRA_DEJAGNU_SITE_CONFIG = libgo-test-support.exp +EXTRA_DEJAGNU_SITE_CONFIG = libgo-site-extra.exp # When running the tests we set GCC_EXEC_PREFIX to the install tree so that # files that have already been installed there will be found. The -B option Index: gcc/libgo/testsuite/Makefile.in =================================================================== --- gcc.orig/libgo/testsuite/Makefile.in +++ gcc/libgo/testsuite/Makefile.in @@ -107,7 +107,7 @@ am__configure_deps = $(am__aclocal_m4_de DIST_COMMON = $(srcdir)/Makefile.am mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = libgo-test-support.exp +CONFIG_CLEAN_FILES = libgo-site-extra.exp CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -300,7 +300,7 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja echo $(top_srcdir)/../dejagnu/runtest ; \ else echo runtest; fi` -EXTRA_DEJAGNU_SITE_CONFIG = libgo-test-support.exp +EXTRA_DEJAGNU_SITE_CONFIG = libgo-site-extra.exp # When running the tests we set GCC_EXEC_PREFIX to the install tree so that # files that have already been installed there will be found. The -B option @@ -340,7 +340,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -libgo-test-support.exp: $(top_builddir)/config.status $(srcdir)/libgo-test-support.exp.in +libgo-site-extra.exp: $(top_builddir)/config.status $(srcdir)/libgo-site-extra.exp.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: Index: gcc/libgo/testsuite/lib/libgo.exp =================================================================== --- gcc.orig/libgo/testsuite/lib/libgo.exp +++ gcc/libgo/testsuite/lib/libgo.exp @@ -17,11 +17,15 @@ set TESTING_IN_BUILD_TREE 1 if ![info exists GOC_UNDER_TEST] then { - set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] - if {$gccdir != ""} { - set gccdir [file dirname $gccdir] + if [info exists TOOL_EXECUTABLE] { + set GOC_UNDER_TEST $TOOL_EXECUTABLE + } else { + set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] + if {$gccdir != ""} { + set gccdir [file dirname $gccdir] + } + set GOC_UNDER_TEST "$gccdir/gccgo -B$gccdir/" } - set GOC_UNDER_TEST "$gccdir/gccgo -B$gccdir/" } if [info exists GOTEST_TMPDIR] { Index: gcc/libgo/testsuite/libgo-site-extra.exp.in =================================================================== --- /dev/null +++ gcc/libgo/testsuite/libgo-site-extra.exp.in @@ -0,0 +1,17 @@ +# Copyright (C) 2019 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +set GOC_UNDER_TEST {@GOC@} Index: gcc/libgo/testsuite/libgo-test-support.exp.in =================================================================== --- gcc.orig/libgo/testsuite/libgo-test-support.exp.in +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2019 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GCC; see the file COPYING3. If not see -# . - -set GOC_UNDER_TEST {@GOC@} From patchwork Fri Feb 28 01:18:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 1246244 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-520285-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=qeBgwxF0; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=ii+y6GCD; 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 48TBX039t8z9sNg for ; Fri, 28 Feb 2020 12:19:12 +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:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; q=dns; s=default; b=soS1X1/pKPp1/aI0 i146I4omTtUR0KC+IrSad4JKSYE0QgW8AmFVC/VJGjn780qtb9w0zA4b3QtAJc6U bUfHwUSV2HOwWczbyeX+RPkS1B6DD1LbiiUEFAj+YG+43gPTLFz7K1wgfO3bS5A8 +qbzCgq9fl1QiXXTNDkW/TTFusE= 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:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; s=default; bh=l9rC8FGXx45D8XXNE/67SA h0SvY=; b=qeBgwxF0cBpVScTur+ZVYcVfDkjVmDvlZ1wyWZiUROv8nYgRBcjNkA SgFapMFwMAlxj3GzH4jBlbaxuQiHsSknoqlYe8GRyCq5tptI3MMv20J4zTXNYwVr w6YArenRXYzgi4/7z9+fFeuSzeAkLZcy4KYJsmWE9TMhG9Ko5fm/4= Received: (qmail 37352 invoked by alias); 28 Feb 2020 01:19:05 -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 37344 invoked by uid 89); 28 Feb 2020 01:19:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-8.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS autolearn=ham version=3.3.1 spammy= X-HELO: esa1.hgst.iphmx.com Received: from esa1.hgst.iphmx.com (HELO esa1.hgst.iphmx.com) (68.232.141.245) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Feb 2020 01:19:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1582852743; x=1614388743; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=/UGVFZ4LqDM/CTrWztrstASyp586B0dTci8l8zaItt0=; b=ii+y6GCDzLYxASv4qH4QklbQEx9dkYXYaGRDfnP4ESZVQg/2jstqTob5 US4dnC2j5pmgIDpKQSLtv60KUVsSQS8X6LZXPuKV2/cEOH/lEMkbsNLzp rkrTYlv4la5l9YHaYLB+mtLTPjat9qcnK0jJ3eAJd5lMcIQ8OdypLk5Hi UDFgQtjt8j6vuAhtsL2e7ivqpmNgMPvhIFTcmTnSyKOFDuTxHM5KHOC8s XtRh6iCdKgCdPjVkF/UvqEV/glGuswmpcerqOYChmu8islx9BNyN2rBK4 g7oAUK1aKOiENm5UgmwXdmbtrnQtbF8hfc3IJ4P8xkQQVP+IlAVt22rzk A==; IronPort-SDR: QlgzshRGtzGxSenCAOWFufEWI+lwTQsKdiWCHA0TGSI/iE6YEFJMvEYFse7SgbfnYWxCwDkkpR Bf3BteutxWe1P1U2OOSzjwhMgzwhmQgGEMNTquo44hF3S0zzlSEndjp630zEiN7RI5i30Zeqzj 8KpoRxJoNoxCwbEADVQxjXu3Km6XWWrNlIN9rMNHXGQZjahHYlhpVoR65kxaSbZHUe/w43fOsw WeTM9+JgFH8QxHPSA4n4RZcXE5Q7GUklB479QLngwuFpvkZcBdPWU5K2jmGept2nfE34/0JSLE 3QA= Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 28 Feb 2020 09:19:01 +0800 IronPort-SDR: kM9XJ/9hZVofNtI+crvDpd7cCP6fEUMwrHHXA5IHD6YVDxkVDYrm+GvCYCNHJAFfZagXkoRFLw /imNVViIst1zlbHoA+TQ8GYnoid/LcBtzu4WVUb+sty4YHmNLKFXIhq7fdAXcaQsdSTInBHkbk SrsFztbYiRYwXmvl3uTBnLxhfzEjQBt0NYAgeYBtIz1gGxSmW4znp4nEyhoO6/wlV//wNcj3sr dOYqM2mHM+iEEzFZ3slbRGAmuP0x8+Qs/ycXQu4sSRq0xCGOTyD6AHN3fGJY6K6qdqull1+MkJ WXfwM6inVRnEWi3QL6t70LeQ Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:11:24 -0800 IronPort-SDR: ZB3Y7d5xcCblu/ILF8uzxsYJaEscl9yfsJhByu7CYl80ZDU9T+D1r35onGk1z0NgtUIgqZO1aG 8ig2FYZfe7R4Blov70jMnCog80MtWz9Beb8TJ6iCfb54nUGpCygRmxXMqOXDs0VJfqoEsa5OA3 I2tQbWjZ83Wi8Sas/BLtS8nXqeysLEyPJFboNwIaNOZA3WwBAcVg5BqbLp0SqXd19wedjlVgEu ZLKMvJz94YcLXaXufgPpo3FxJWNSlEBWf68+kZvcELGQ5+3HJRtW4yeZcpZvXuBJl9cEJLsmel J0w= WDCIronportException: Internal Received: from unknown (HELO redsun52) ([10.149.66.28]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 17:19:01 -0800 Date: Fri, 28 Feb 2020 01:18:57 +0000 (GMT) From: "Maciej W. Rozycki" To: gcc-patches@gcc.gnu.org cc: Julian Brown , Tobias Burnus , Jeff Law , Thomas Schwinge , Mike Stump , Chung-Lin Tang , Ian Lance Taylor Subject: [PATCH v3 4/4] libgomp/test: Remove a build sysroot fix regression In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Fix a problem with commit c8e759b4215b ("libgomp/test: Fix compilation for build sysroot") that caused a regression in some standalone test environments where testsuite/libgomp-test-support.exp is used, but the compiler is expected to be determined by `[find_gcc]', and set the GCC_UNDER_TEST TCL variable in testsuite/libgomp-site-extra.exp instead. libgomp/ * configure.ac: Add testsuite/libgomp-site-extra.exp to output files. * configure: Regenerate. * testsuite/libgomp-site-extra.exp.in: New file. * testsuite/libgomp-test-support.exp.in (GCC_UNDER_TEST): Remove variable. * testsuite/Makefile.am (EXTRA_DEJAGNU_SITE_CONFIG): New variable. * testsuite/Makefile.in: Regenerate. --- Changes from v2: - Do not use `--tool_exec' with AM_RUNTESTFLAGS. - Move the definition of GCC_UNDER_TEST from testsuite/libgomp-test-support.exp to testsuite/libgomp-site-extra.exp. Applies on top of v1. --- libgomp/configure | 3 +++ libgomp/configure.ac | 1 + libgomp/testsuite/Makefile.am | 2 ++ libgomp/testsuite/Makefile.in | 6 +++++- libgomp/testsuite/libgomp-site-extra.exp.in | 1 + libgomp/testsuite/libgomp-test-support.exp.in | 2 -- 6 files changed, 12 insertions(+), 3 deletions(-) gcc-test-libgomp-site-extra.diff Index: gcc/libgomp/configure =================================================================== --- gcc.orig/libgomp/configure +++ gcc/libgomp/configure @@ -17047,6 +17047,8 @@ ac_config_files="$ac_config_files Makefi ac_config_files="$ac_config_files testsuite/libgomp-test-support.pt.exp:testsuite/libgomp-test-support.exp.in" +ac_config_files="$ac_config_files testsuite/libgomp-site-extra.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 @@ -18200,6 +18202,7 @@ do "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "libgomp.spec") CONFIG_FILES="$CONFIG_FILES libgomp.spec" ;; "testsuite/libgomp-test-support.pt.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libgomp-test-support.pt.exp:testsuite/libgomp-test-support.exp.in" ;; + "testsuite/libgomp-site-extra.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libgomp-site-extra.exp" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac Index: gcc/libgomp/configure.ac =================================================================== --- gcc.orig/libgomp/configure.ac +++ gcc/libgomp/configure.ac @@ -436,4 +436,5 @@ GCC_BASE_VER AC_CONFIG_FILES(omp.h omp_lib.h omp_lib.f90 libgomp_f.h) AC_CONFIG_FILES(Makefile testsuite/Makefile libgomp.spec) AC_CONFIG_FILES([testsuite/libgomp-test-support.pt.exp:testsuite/libgomp-test-support.exp.in]) +AC_CONFIG_FILES([testsuite/libgomp-site-extra.exp]) AC_OUTPUT Index: gcc/libgomp/testsuite/Makefile.am =================================================================== --- gcc.orig/libgomp/testsuite/Makefile.am +++ gcc/libgomp/testsuite/Makefile.am @@ -12,6 +12,8 @@ _RUNTEST = $(shell if test -f $(top_srcd echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXTRA_DEJAGNU_SITE_CONFIG = libgomp-site-extra.exp + # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the # following variables have to be "routed through" this Makefile, for expansion # of the several (Makefile) variables used therein. Index: gcc/libgomp/testsuite/Makefile.in =================================================================== --- gcc.orig/libgomp/testsuite/Makefile.in +++ gcc/libgomp/testsuite/Makefile.in @@ -111,7 +111,8 @@ am__configure_deps = $(am__aclocal_m4_de DIST_COMMON = $(srcdir)/Makefile.am mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = libgomp-test-support.pt.exp +CONFIG_CLEAN_FILES = libgomp-test-support.pt.exp \ + libgomp-site-extra.exp CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -310,6 +311,7 @@ _RUNTEST = $(shell if test -f $(top_srcd echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXTRA_DEJAGNU_SITE_CONFIG = libgomp-site-extra.exp all: all-am .SUFFIXES: @@ -344,6 +346,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( $(am__aclocal_m4_deps): libgomp-test-support.pt.exp: $(top_builddir)/config.status $(srcdir)/libgomp-test-support.exp.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +libgomp-site-extra.exp: $(top_builddir)/config.status $(srcdir)/libgomp-site-extra.exp.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo Index: gcc/libgomp/testsuite/libgomp-site-extra.exp.in =================================================================== --- /dev/null +++ gcc/libgomp/testsuite/libgomp-site-extra.exp.in @@ -0,0 +1 @@ +set GCC_UNDER_TEST {@CC@} Index: gcc/libgomp/testsuite/libgomp-test-support.exp.in =================================================================== --- gcc.orig/libgomp/testsuite/libgomp-test-support.exp.in +++ gcc/libgomp/testsuite/libgomp-test-support.exp.in @@ -1,5 +1,3 @@ -set GCC_UNDER_TEST {@CC@} - set cuda_driver_include "@CUDA_DRIVER_INCLUDE@" set cuda_driver_lib "@CUDA_DRIVER_LIB@" set hsa_runtime_lib "@HSA_RUNTIME_LIB@"