From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2076.outbound.protection.outlook.com [40.107.102.76]) by sourceware.org (Postfix) with ESMTPS id 570CF384604F for ; Wed, 3 Apr 2024 14:45:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 570CF384604F Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=amd.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 570CF384604F Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.102.76 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712155507; cv=pass; b=F/3QcLenmHq/Dt8u5C7Oah5jEtctmLBqKgb+rPT/zrp3UgOerA7pACvoWbN4EHAA4f4f1v1FrXhXP8zacDNpRAhgNoaP7W18jwE7uMArfKoZpmbaSZcPof91BTJiL6m/peBuV2fQlzrR4vJlfOJyoaDNNjj3AOnXKicrD29Dv1s= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712155507; c=relaxed/simple; bh=u4Md/alIQB4ClgLMokleSY0+05p3XYBxATP1gLqp6kI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=nKYH2LUF9psuKZUCVxdbtFArCrrqZvMpGQks5S0GQbkGky+9bAFMlTiDeK1fBzG+PPC83Iu9YmaVDqIsMQq7pMuoMG0L9gCjf2jvVSQ6EdQ+e8XW+KC6QNXllbEhQS2QhFHExA8OEe78MLPXNyxDRXJwffF6DRVrT6YSXAHnmSU= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YUeAw5Hp+ItA68PP8ndWRi/yu5O3SVprfIWC7ag2iBtiAGuz9r2iJSfiA8Bla7nye53yERSxD/dMLKkE50fy5zMc/Apl4cCGr2VATj4lJqQFt2lsrUzUMwMEVlnnHJLFCQVDP05majQzwvyZRzwFvM1uh4C1l73TWa8eG6yr61q3vo/W3ZX/SizghnNlD61NKtnzDe+fcewbkwwOW0bBF3ZitiDU3o6nhRmyj+VgZbqQHJV1CcvZQLW/OQHP2pQf0XDNz+XRR0VfNOfUVpXVO522QGDUYjHJmxTfzYrjMRoIsGOfN5uEVJOFvmJyRLybuGEKn5/sfFaSC0woYeMM7Q== 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=dKBVKNGX9fkfekfX0SSiVzSF49Xwm5XIFAm2ISgVPko=; b=a7LEl7ME1/CeTG5z0qDVhj14a+KE9PqhmCqH//FM52Gv6KK4V28xHjSgmm+VlvbwrAZOzf5KM7Ui/5SBeaTHf2KDmr/UaRsT1YNK/6JW1uhjkm4ZXtuWaeLEvj3Cu6puxXckGCP9swiSEGuRd/+8/n8zfdSt2/ORC7v/Gb17FOJn5jYs+gRXY43hfntkwwDdrHgLD+NqET1YfRalOo8VWKZweHESaUxoCjdYvO2xTO321iMVHzW6rleScOo5mIhgkGmAY/LogzRqGC0K+GCz55l7QQu05ORWRVJRjpR24htcxfwoNMbe/GiVJiwa/cMPBDVOuUu3+5sLxcwonmQgaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=sourceware.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dKBVKNGX9fkfekfX0SSiVzSF49Xwm5XIFAm2ISgVPko=; b=FOljfD1RYixv0jShJrUOFH36yPq/RVx/H5agNW+lareLN73dP3l765Zl3ftvqg03ikgTQhM0P8V9MWx740zsBqcVAr94upJSGZssNPBB9qB8mmRzODGHxzmW4vRCfQ2vu+IxYLT0QHLjpMcmKItGxOBrWWaa/TswQhKcPKZsBjQ= Received: from CH0PR03CA0225.namprd03.prod.outlook.com (2603:10b6:610:e7::20) by MN2PR12MB4064.namprd12.prod.outlook.com (2603:10b6:208:1d3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 3 Apr 2024 14:45:01 +0000 Received: from DS3PEPF0000C37E.namprd04.prod.outlook.com (2603:10b6:610:e7:cafe::55) by CH0PR03CA0225.outlook.office365.com (2603:10b6:610:e7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46 via Frontend Transport; Wed, 3 Apr 2024 14:45:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF0000C37E.mail.protection.outlook.com (10.167.23.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Wed, 3 Apr 2024 14:45:01 +0000 Received: from khazad-dum.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 3 Apr 2024 09:44:59 -0500 From: Lancelot SIX To: , CC: Lancelot SIX Subject: [PATCH] Revert "gdb/compile: Use std::filesystem::remove_all in cleanup" Date: Wed, 3 Apr 2024 15:44:46 +0100 Message-ID: <20240403144446.39094-1-lancelot.six@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C37E:EE_|MN2PR12MB4064:EE_ X-MS-Office365-Filtering-Correlation-Id: fb1df93c-86e5-4803-b7b7-08dc53eca47a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: utK7PoAV0453K8oJ3ChN68d46fylj9RnKeP602UGa7umB+PfeYBc2fTF3Kwq58noSsyvW9aheYkINwXmnaQBRR2HSyVKelpMznHa2o68vcAYlvbtAhbafJkLLhtd0EmI5e8m91PjL1Nsx+CsppBHPFq3hgjxCPKqsfyQH4SahhdIEnfm54MPTdxNA8l8Lm1gHZB7hmCdx9WSr2rqoIvTnc/0jtbapna2S3SnyzBtqeNcpJT/IvfQGS0FxwPyl1AsSxNBoYjnAEr/HT1jhlia1/GDf3mN8FUAyxKHzd0tP3T3Sfbb9zmRCyihkQJhQc3FdHsreNbu66GkmLG5fZM3Lfj8kfg+pChjpm5ilD14slzmSpuOHi1djBEZOq/Bs5nfVieYo8BcnW8FX1mbyja6Ee0bp/K0rKfuGwGX6afhtXkC/i/3YG/X9CvwG3wfkge9qvl6DWzijJWLIT/9EFm++YsdIBZKGAOx/kW6Gbj3MncwU26qXBkiWNL/XJkoMKAZx+pVtvadQ5x5+jgf20dKy09T5Z6XTjKQz61nExfODX4CjF8v36L0VD+YFrLceOBTWNsuxcNVvjsj1698dAR8fD1vA0mj/PC0n5/cy0spE6SlFQCwHtMbiHtunDiPSkDfS6BlW+2Nzs6GQMjX4mrc/DuD1w9dds/8ajK2kMnVndUbNeXQC/JkJdEEQ0jKRbeT6B/7NUboI5zFVWT2c/p/TA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(376005)(82310400014)(1800799015)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2024 14:45:01.4004 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fb1df93c-86e5-4803-b7b7-08dc53eca47a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C37E.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4064 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,GIT_PATCH_0,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: This reverts commit 7bba0ad08576309763e3f41193eaa93025e10b8b. Tom de Vries reported that 7bba0ad0857 (gdb/compile: Use std::filesystem::remove_all in cleanup) broke builds with gcc-7.5.0 which mostly supports c++17, but not std::filesystem[1]. As this change is not critical, revert it to maintain compatibility. [1] https://inbox.sourceware.org/gdb-patches/a06e6483-aa2e-4b8a-854f-e369a1e961ea@suse.de/ Change-Id: I58150bd27600c95052bdf1bbbd6b44718a5a0bbf --- gdb/compile/compile.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c index bff69a5092d..2d97a1b2005 100644 --- a/gdb/compile/compile.c +++ b/gdb/compile/compile.c @@ -39,9 +39,7 @@ #include "osabi.h" #include "gdbsupport/gdb_wait.h" #include "valprint.h" -#include #include -#include #include "gdbsupport/gdb_unlinker.h" #include "gdbsupport/pathstuff.h" #include "gdbsupport/scoped_ignore_signal.h" @@ -451,11 +449,15 @@ get_compile_file_tempdir (void) tempdir_name = xstrdup (tempdir_name); add_final_cleanup ([] () { - std::error_code error; - if (std::filesystem::remove_all (tempdir_name, error) - == static_cast (-1)) - warning (_("Could not remove temporary directory %s (%s)"), - tempdir_name, error.message ().c_str ()); + char *zap; + int wstat; + + gdb_assert (startswith (tempdir_name, TMP_PREFIX)); + zap = concat ("rm -rf ", tempdir_name, (char *) NULL); + wstat = system (zap); + if (wstat == -1 || !WIFEXITED (wstat) || WEXITSTATUS (wstat) != 0) + warning (_("Could not remove temporary directory %s"), tempdir_name); + XDELETEVEC (zap); }); return tempdir_name; } base-commit: 7bba0ad08576309763e3f41193eaa93025e10b8b -- 2.34.1