From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 5B5F23836D14 for ; Fri, 16 Dec 2022 13:26:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5B5F23836D14 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BGBr8ct022038 for ; Fri, 16 Dec 2022 13:26:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=bdCFeqDUwV4FLjefhtsqsuXdQH5XXkRR+FB9N5+pby0=; b=NrNJxK9FBGOpAFV/dKwXRm64voDYGFrJpKxg51LanqtvQEl5Wc0aNfhJCFLjE1iePVdR 49lmMee23X3WxZkqEDifnySasLcFFRjW/iCCzTVvzhQUhEorzZjcEIRjSW1XamF3VHLX yWBEP2oc8yQ2GmzRjp9yuZO0vaN8tTMsjdBFb9OhR0TrBSC2Gy8NcJArW+RrK3vYnnr7 EMRe0jIII8NcPuGosaFbQcyFFGiuGZMck9Zlik1WBhDI7ms8dpYleI9+Kx1qG04I0S7F xx/89az3KqUqyhjQZNl27dTY2zlvAXfPViErkYoAw14ETS1YWA6mhmQHSp5EqG39w2tY Wg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3meyewyg11-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 16 Dec 2022 13:26:09 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2BGBauAO027793 for ; Fri, 16 Dec 2022 13:26:08 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2173.outbound.protection.outlook.com [104.47.55.173]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3meyf0aka1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 16 Dec 2022 13:26:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hCKd59afHQ/FC8f0QN5HAoX5uWg31JH0BAjoB7W4XxB2PgTErF4MzFPizJL01ufhtFisywjF2VWnybS6BW5w5WF+OVY7X+ryEfQVdgvz4j8dWHMW6XcC5yR52bHDCoYGEju4Rj0Sob86q8t73H4yUR9SUM32e4JQG9EzCWHtcu+Z25Kxxw5e9e+VBkSBhyC23eSk1uLFPJWY2twOf25fDnjqp66ITaCL4F0gPMO94ijJ6bylY0up/0ZfKD3UpkZ6MpnDgYLaxEDDiLyS4qzJKNCywqNK6e8UmxM1QaVguZCtkwpERZGau8xGUcJAs7xhwJumkqnld6U0RBgJGSR7kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bdCFeqDUwV4FLjefhtsqsuXdQH5XXkRR+FB9N5+pby0=; b=KzSJpDvG4UljqsREaZN/Ln7wlJrpKuXbNcy5/Jcd2LJJu+7yvezWnEvBL0JLmORj9sVwPcf05p/p7I/w/vuK+5W5VGrWKOgOb6+icd71uH9NMv+er1RxRXvFHyFZ2km1XDvovI0FjuPbcm0Gx7lPCHvRmTr3zG88UFzHLFFamB2s32iiE/Lkq7w/q/wjqgBe34w7XdxruNwKayOXedc2jHdlLVI4zrgfglHU8D8EPDLMLS9hCawSfGyo5DQl0miSGl9ZLFEW008xtR1WLXySC+e0TfXdEKeBVyJRNEBgJRRyQYv0NZ4KT0XZW+spZNA3g0RWt/T1aWzcThHRiOGaHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bdCFeqDUwV4FLjefhtsqsuXdQH5XXkRR+FB9N5+pby0=; b=H0pRryyiFi438azUhvtPQOS1QwN6QLzesCethPaji6SlVm7VcbcN6MITLTcqPRO/D/wbMQ49E94yTgZAe4nRfc0IbDyWjHbxSnr6nq/kEEgMPcN+/LrbnnHheZFPIly8hSBvCBU9FBYvX6YL0yGvhSv8DHdW38oNVLaRPmFJv7w= Received: from DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) by IA1PR10MB5898.namprd10.prod.outlook.com (2603:10b6:208:3d6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.15; Fri, 16 Dec 2022 13:26:06 +0000 Received: from DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::6e94:e2a2:ca1f:2a7]) by DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::6e94:e2a2:ca1f:2a7%9]) with mapi id 15.20.5924.012; Fri, 16 Dec 2022 13:26:06 +0000 From: Nick Alcock To: binutils@sourceware.org Subject: [PATCH 4/4] libctf: skip the testsuite from inside dejagnu Date: Fri, 16 Dec 2022 13:25:41 +0000 Message-Id: <20221216132541.45791-5-nick.alcock@oracle.com> X-Mailer: git-send-email 2.39.0.267.g7648178303 In-Reply-To: <20221216132541.45791-1-nick.alcock@oracle.com> References: <20221216132541.45791-1-nick.alcock@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LNXP123CA0012.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::24) To DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB6798:EE_|IA1PR10MB5898:EE_ X-MS-Office365-Filtering-Correlation-Id: 804168ec-9c69-405a-0fcb-08dadf69164b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rFMPmOdpCmd6HhUBx5N/gre17H0I8uBrvXKSoLsAm0X3LTSkbmTOa1+CNDlliUbAfa2PE/wRQZbDbkkr6FrRFkbPncLSAJLbw6T937BoTxL55CbW4vuU85oBpuExYS0lElJ3InLE2T2ppS+0ftGPZPKVHMVpfw5X1a5d82ASvZl26NF/WS0Jv4P0CXPapq5T6jYwns7SAUe153zqDYUZNSSXgt2FP5q0Zm8LLrCwODFGMbn4luEu53V7aO2rHGhdi4IHdh//NiWgYyvyStLObUwzEoOfZ9Qor7V0xjzVkD4T/YpbdjIGMU1foLwrd3o+Ibmu/QB6OLC3xyk+BfGUY5yg8BIKEHdtV7rDZVe4fBRcEQNAZu96DDDsS+E0CXzNUnsLNTM6tEvVVk3A1qZFBvRGMJx33LemKE/X10zl6MzeZsONe2xsqeKP5v3STaJeFBU3ZgqdE59YbmvDxjXjQr6069qBQCxxFgRv3LpBCxzWfXqxzCzxuIojRS7uJHBhs73aiIUTkninwEidFDxUbz7SyrM6hFYehOhcQruvDbMNwQGYKQ4H8xpNHC4gvHsMTr6IBY6duiJ/DoWhUq0XVLWacPbQSuJfSjgq54savk7AxUJL47mWjHJuK+poWVfI7S3mjE7S56SP+Hor5zYudQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB6798.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(39860400002)(366004)(376002)(396003)(346002)(451199015)(86362001)(36756003)(478600001)(6486002)(6506007)(6512007)(186003)(6666004)(66946007)(30864003)(5660300002)(66556008)(66476007)(8936002)(316002)(6916009)(2906002)(44832011)(8676002)(41300700001)(38100700002)(83380400001)(2616005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5i/gTBMZERYYc8Xeybj+lhnYbQRm/1FFoKTBoiEDbgQK6nTN9CARYzV5hWTs?= =?us-ascii?Q?RA9vGCRHp3u5rs+DEx9qNulFjR0820L8r/uPK0H1Lol8v8aX0WvP3D58f/wq?= =?us-ascii?Q?ozExh8yxCbbJkE/fQkhwG21hM3cplt5/dEAp/UPU+4hZKzBmOSZdjsIKDDAr?= =?us-ascii?Q?TXtLLyvCRTc23MW8oyID5wnGQ9wQrqYLd7uejzi+dcsm/5pv7o8Z9k8kBotI?= =?us-ascii?Q?VqqBBuVz+n2sLRCe2gAVufzqStzzetah5UYG2ISawoLkAIQeuTGwki+R9rne?= =?us-ascii?Q?z08KnpVd7Q/FDA65y/SWv/7RwnZRCLNQLw11G2o7DCt2ma09/syt/ORYI4+I?= =?us-ascii?Q?nGQTblpemQbA3UoBgRerVqCao4pFpirAbR/b6xkli1PnpuTpMZSoV5Vu1sos?= =?us-ascii?Q?tj5vIxlTWrL2rpRNL+AAGd4qULHyOe1CXGGdovMEajn/Xjby1j6xOodxhojD?= =?us-ascii?Q?QBmNlSem7C+oB3UwztfjLwBkgvjrN3DJCiOaJxqWQIbXBobVoLh3vOMfpCuh?= =?us-ascii?Q?k9un7rX3w4DCi5QPKA5RnYNOSRCM0cSzzvgg4rA36GFmuio6z1eVGZQ9Ixh3?= =?us-ascii?Q?LSDJTBrD7iUvBvQwG7l/Atxm+rtP6woN5tl6rabRnwAfi3qnnfkzv4fO0aSs?= =?us-ascii?Q?7/0qOjAuWC67nq2wTasEb89P6lgAz3BJ21ANOonxzpasE1stOI5NBtcdFjhT?= =?us-ascii?Q?J4QJc6am2Ny+E0siBYUGRxwIayyaTID5+JtC+NUBxSrIpDyBLT8Cr/2Q2aWf?= =?us-ascii?Q?6pP2/sZ/4V5c8a/oSmN9/EwcxN61mvankfzABSXh3wb2gqT5ouz4k0ij2xi6?= =?us-ascii?Q?WXPHKImnQSGN8p9htGifUJOll9xXAv1BR4B1tTubmSDhiuFaZ3N3+YWAUIEP?= =?us-ascii?Q?VmmWFlayxv+4N4cThcJ+N1zxToRIvWVjuUzaZlITQmZGO9oMGG99fGTgPo4s?= =?us-ascii?Q?6w+rnqoySzeizzh1nSiZhMFmEhKW531jPWh5oBHQKjQBLRIa5p60Ejbam7ui?= =?us-ascii?Q?Xk64VWN38G9jIhJNasoecS3Kf+71MuEh/83zfxJAj5kKxVbZ5D8RD8rBHypS?= =?us-ascii?Q?KzG26BB9BgsYDa7Q++urQJ7x/IzB4xSIV4SjZkCNfq7QjWclzbiVvhbU2D1C?= =?us-ascii?Q?8dZgWOn82tsIViKq7nbuQWuWesworWNKdIC9bvwjlZ/aoQ+E7EbTWihoc26g?= =?us-ascii?Q?3uUp4v25IVNfLZA1eTy8yZKngeFnk+gCW6GVzppi2FOoU2Zhbi3p0hOzUjHX?= =?us-ascii?Q?kFDjV4+H7kn5oHnCFUwffbmglskvH2u/vYFppEC8vVQwuENtKJe+eRCD6qtq?= =?us-ascii?Q?/4wwn9zjFQNs1ZUwBhJxmORTuH+fkyCdZLxhRsFIiwuURYXvCNqaoodNa1pA?= =?us-ascii?Q?AlM0B5op8JRIDJb5k8j3P8Kld2QGwRo+cnsN2KVt3TxlMWD4tNjooQb48m03?= =?us-ascii?Q?FOo4qP/zWUUFnG9YQTj5uLY7X4Plcgn64MV4KBS5YxvjzFYbCbQZJ1NUwN6q?= =?us-ascii?Q?xtXQHsvbxg38Fga78VVgHTj2jbvLSgVwZM54c8r4kVBhpzrJxqlO4UNDxLVT?= =?us-ascii?Q?qkqEBZMK928MrEuK/ZSU6ylDO9DDcdkSJCmkv6iuHqa1mH0X/j3ajYjZsENN?= =?us-ascii?Q?LA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 804168ec-9c69-405a-0fcb-08dadf69164b X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB6798.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2022 13:26:06.6783 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 69vR4UcakqSou6ainHrZZX6H67s2qdTwz6dhfvT3dzHW1xEUlwM0W+f12TOwjdLDLgUsNmGcudthc+5L3O5/Yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB5898 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-16_08,2022-12-15_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2212160117 X-Proofpoint-GUID: rKw2jJKCSs0YNcuSugy1V7Si4CD9jlfB X-Proofpoint-ORIG-GUID: rKw2jJKCSs0YNcuSugy1V7Si4CD9jlfB X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The libctf testsuite uses Tcl try/catch to trap run_output errors. This is only supported in reasonably recent Tcls, so we detect the lack of try/catch and suppress the testsuite via an Automake conditional in its absence. But this turns out not to work: Automake produces a check-DEJAGNU target regardless of the value of this conditional and sticks it in an unconditionally-executed part of the makefile, so the testsuite gets executed anyway, and fails with a nasty-looking syntax error. We can't disable it by taking "dejagnu" out of AUTOMAKE_OPTIONS, because if you do that Automake stops you using RUNTEST, RUNTESTFLAGS and other variables users would expect to work. So move to disabling the testsuite from inside the testsuite itself, importing the value of the former Automake conditional as a Tcl variable and exiting very early in default.exp if it's false. * configure.ac (TCL_TRY): No longer an Automake conditional. Rename to... (HAVE_TCL_TRY): ... this. * Makefile.am: Drop TCL_TRY. (development.exp): Set have_tcl_try. * testsuite/config/default.exp: Exit if have_tcl_try is false. * configure: Regenerated. * Makefile.in: Likewise. --- libctf/Makefile.am | 3 +- libctf/Makefile.in | 95 +++++++++++++---------------- libctf/configure | 21 +++---- libctf/configure.ac | 7 ++- libctf/testsuite/config/default.exp | 5 ++ 5 files changed, 61 insertions(+), 70 deletions(-) diff --git a/libctf/Makefile.am b/libctf/Makefile.am index 27e90f0ba36..f86e910718c 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am @@ -72,7 +72,6 @@ EXPECT = expect RUNTEST = runtest RUNTESTFLAGS = -if TCL_TRY CC_FOR_TARGET = ` \ if [ -f $$r/../gcc/xgcc ] ; then \ if [ -f $$r/../newlib/Makefile ] ; then \ @@ -105,6 +104,7 @@ check-DEJAGNU: site.exp development.exp development.exp: $(BFDDIR)/development.sh $(AM_V_GEN)$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \ | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@ + echo "set have_tcl_try @HAVE_TCL_TRY@" >> $@ # development.sh is used to determine -Werror default. CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh @@ -112,6 +112,5 @@ CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh EXTRA_DEJAGNU_SITE_CONFIG = development.exp DISTCLEANFILES += site.exp development.exp -endif include doc/local.mk diff --git a/libctf/Makefile.in b/libctf/Makefile.in index 1984f50867a..5ad5dae440f 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in @@ -127,10 +127,9 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @NEED_CTF_QSORT_R_TRUE@am__append_1 = ctf-qsort_r.c -@TCL_TRY_TRUE@am__append_2 = site.exp development.exp -@BUILD_INFO_TRUE@am__append_3 = doc/ctf-spec.texi -@BUILD_INFO_TRUE@am__append_4 = texput.log -@BUILD_INFO_TRUE@am__append_5 = doc/ctf-spec.info +@BUILD_INFO_TRUE@am__append_2 = doc/ctf-spec.texi +@BUILD_INFO_TRUE@am__append_3 = texput.log +@BUILD_INFO_TRUE@am__append_4 = doc/ctf-spec.info subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ @@ -312,7 +311,7 @@ DVIS = doc/ctf-spec.dvi PDFS = doc/ctf-spec.pdf PSS = doc/ctf-spec.ps HTMLS = doc/ctf-spec.html -TEXINFOS = $(am__append_3) +TEXINFOS = $(am__append_2) TEXI2DVI = texi2dvi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html @@ -407,6 +406,7 @@ FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +HAVE_TCL_TRY = @HAVE_TCL_TRY@ INCINTL = @INCINTL@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -522,9 +522,9 @@ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd AUTOMAKE_OPTIONS = dejagnu foreign info-in-builddir no-texinfo.tex # Variables that we might accumulate conditionally or in subdirs. -info_TEXINFOS = $(am__append_3) -DISTCLEANFILES = $(am__append_2) $(am__append_4) -MAINTAINERCLEANFILES = $(am__append_5) +info_TEXINFOS = $(am__append_2) +DISTCLEANFILES = site.exp development.exp $(am__append_3) +MAINTAINERCLEANFILES = $(am__append_4) # This is where we get zlib from. zlibdir is -L../zlib and zlibinc is # -I../zlib, unless we were configured with --with-system-zlib, in which @@ -559,25 +559,25 @@ libctf_la_LDFLAGS = $(libctf_ldflags_nover) @VERSION_FLAGS@ libctf_la_SOURCES = $(libctf_nobfd_la_SOURCES) ctf-open-bfd.c RUNTEST = runtest RUNTESTFLAGS = -@TCL_TRY_TRUE@CC_FOR_TARGET = ` \ -@TCL_TRY_TRUE@ if [ -f $$r/../gcc/xgcc ] ; then \ -@TCL_TRY_TRUE@ if [ -f $$r/../newlib/Makefile ] ; then \ -@TCL_TRY_TRUE@ echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \ -@TCL_TRY_TRUE@ else \ -@TCL_TRY_TRUE@ echo $$r/../gcc/xgcc -B$$r/../gcc/; \ -@TCL_TRY_TRUE@ fi; \ -@TCL_TRY_TRUE@ else \ -@TCL_TRY_TRUE@ if [ "@host@" = "@target@" ] ; then \ -@TCL_TRY_TRUE@ echo $(CC); \ -@TCL_TRY_TRUE@ else \ -@TCL_TRY_TRUE@ echo gcc | sed '$(transform)'; \ -@TCL_TRY_TRUE@ fi; \ -@TCL_TRY_TRUE@ fi` +CC_FOR_TARGET = ` \ + if [ -f $$r/../gcc/xgcc ] ; then \ + if [ -f $$r/../newlib/Makefile ] ; then \ + echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \ + else \ + echo $$r/../gcc/xgcc -B$$r/../gcc/; \ + fi; \ + else \ + if [ "@host@" = "@target@" ] ; then \ + echo $(CC); \ + else \ + echo gcc | sed '$(transform)'; \ + fi; \ + fi` # development.sh is used to determine -Werror default. -@TCL_TRY_TRUE@CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh -@TCL_TRY_TRUE@EXTRA_DEJAGNU_SITE_CONFIG = development.exp +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh +EXTRA_DEJAGNU_SITE_CONFIG = development.exp @BUILD_INFO_TRUE@AM_MAKEINFOFLAGS = --no-split all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1235,18 +1235,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - -@TCL_TRY_FALSE@check-DEJAGNU: site.exp -@TCL_TRY_FALSE@ srcdir='$(srcdir)'; export srcdir; \ -@TCL_TRY_FALSE@ EXPECT=$(EXPECT); export EXPECT; \ -@TCL_TRY_FALSE@ if $(SHELL) -c "$(RUNTEST) --version" > /dev/null 2>&1; then \ -@TCL_TRY_FALSE@ exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ -@TCL_TRY_FALSE@ if $(RUNTEST) $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ -@TCL_TRY_FALSE@ then :; else exit_status=1; fi; \ -@TCL_TRY_FALSE@ done; \ -@TCL_TRY_FALSE@ else echo "WARNING: could not find '$(RUNTEST)'" 1>&2; :;\ -@TCL_TRY_FALSE@ fi; \ -@TCL_TRY_FALSE@ exit $$exit_status site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) @echo 'Making a new site.exp file ...' @echo '## these variables are automatically generated by make ##' >site.tmp @@ -1685,23 +1673,24 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \ .PRECIOUS: Makefile -@TCL_TRY_TRUE@check-DEJAGNU: site.exp development.exp -@TCL_TRY_TRUE@ srcroot=`cd $(srcdir) && pwd`; export srcroot; \ -@TCL_TRY_TRUE@ r=`pwd`; export r; \ -@TCL_TRY_TRUE@ LC_ALL=C; export LC_ALL; \ -@TCL_TRY_TRUE@ EXPECT=$(EXPECT); export EXPECT; \ -@TCL_TRY_TRUE@ runtest=$(RUNTEST); \ -@TCL_TRY_TRUE@ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ -@TCL_TRY_TRUE@ $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \ -@TCL_TRY_TRUE@ CC="$(CC)" CC_FOR_TARGET="$(CC_FOR_TARGET)" \ -@TCL_TRY_TRUE@ CFLAGS="$(CFLAGS) -I$(INCDIR) -I$(srcdir) -I$(builddir) -I$(builddir)/../bfd $(ZLIBINC)" \ -@TCL_TRY_TRUE@ LIBS="$(libctf_nobfd_la_LIBADD) $(LIBS)" $(RUNTESTFLAGS); \ -@TCL_TRY_TRUE@ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ -@TCL_TRY_TRUE@ fi - -@TCL_TRY_TRUE@development.exp: $(BFDDIR)/development.sh -@TCL_TRY_TRUE@ $(AM_V_GEN)$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \ -@TCL_TRY_TRUE@ | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@ +check-DEJAGNU: site.exp development.exp + srcroot=`cd $(srcdir) && pwd`; export srcroot; \ + r=`pwd`; export r; \ + LC_ALL=C; export LC_ALL; \ + EXPECT=$(EXPECT); export EXPECT; \ + runtest=$(RUNTEST); \ + if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \ + CC="$(CC)" CC_FOR_TARGET="$(CC_FOR_TARGET)" \ + CFLAGS="$(CFLAGS) -I$(INCDIR) -I$(srcdir) -I$(builddir) -I$(builddir)/../bfd $(ZLIBINC)" \ + LIBS="$(libctf_nobfd_la_LIBADD) $(LIBS)" $(RUNTESTFLAGS); \ + else echo "WARNING: could not find \`runtest'" 1>&2; :;\ + fi + +development.exp: $(BFDDIR)/development.sh + $(AM_V_GEN)$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \ + | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@ + echo "set have_tcl_try @HAVE_TCL_TRY@" >> $@ @BUILD_INFO_TRUE@html-local: doc/ctf-spec/index.html @BUILD_INFO_TRUE@doc/ctf-spec/index.html: doc/ctf-spec.texi doc/$(am__dirstamp) diff --git a/libctf/configure b/libctf/configure index cf63ded9eec..466fb3c4970 100755 --- a/libctf/configure +++ b/libctf/configure @@ -637,8 +637,7 @@ LTLIBOBJS LIBOBJS VERSION_FLAGS_NOBFD VERSION_FLAGS -TCL_TRY_FALSE -TCL_TRY_TRUE +HAVE_TCL_TRY EXPECT CTF_LIBADD SHARED_LDFLAGS @@ -11635,7 +11634,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11638 "configure" +#line 11637 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11741,7 +11740,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11744 "configure" +#line 11743 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14978,12 +14977,10 @@ fi` fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libctf_tcl_try" >&5 $as_echo "$ac_cv_libctf_tcl_try" >&6; } - if test "${ac_cv_libctf_tcl_try}" = yes; then - TCL_TRY_TRUE= - TCL_TRY_FALSE='#' -else - TCL_TRY_TRUE='#' - TCL_TRY_FALSE= + +HAVE_TCL_TRY=false +if test "${ac_cv_libctf_tcl_try}" = "yes"; then + HAVE_TCL_TRY=true fi @@ -15211,10 +15208,6 @@ if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then as_fn_error $? "conditional \"BUILD_INFO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TCL_TRY_TRUE}" && test -z "${TCL_TRY_FALSE}"; then - as_fn_error $? "conditional \"TCL_TRY\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/libctf/configure.ac b/libctf/configure.ac index 65686fedc5a..a698aeac204 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac @@ -241,7 +241,12 @@ if @<:@llength @<:@info commands try@:>@@:>@ then { puts yes } else { puts no } EOF fi` ]) -AM_CONDITIONAL(TCL_TRY, test "${ac_cv_libctf_tcl_try}" = yes) + +HAVE_TCL_TRY=false +if test "${ac_cv_libctf_tcl_try}" = "yes"; then + HAVE_TCL_TRY=true +fi +AC_SUBST(HAVE_TCL_TRY) # Use a version script, if possible, or an -export-symbols-regex otherwise. decommented_version_script= diff --git a/libctf/testsuite/config/default.exp b/libctf/testsuite/config/default.exp index 29d31363071..13dd3ded3dd 100644 --- a/libctf/testsuite/config/default.exp +++ b/libctf/testsuite/config/default.exp @@ -21,6 +21,11 @@ # Written by Jeffrey Wheat (cassidy@cygnus.com) # +# Don't run anything if Tcl is too old to have try / catch. +if { ! $have_tcl_try } { + log_and_exit +} + if ![info exists ld] then { set ld [findfile $base_dir/../ld/ld-new $base_dir/../ld/ld-new [transform ld]] } -- 2.39.0.267.g7648178303