From patchwork Fri Sep 6 13:11:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepthi.Hemraj@windriver.com X-Patchwork-Id: 1981905 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X0c8T5Wppz1y1D for ; Fri, 6 Sep 2024 23:12:25 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 92830384A45F for ; Fri, 6 Sep 2024 13:12:23 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by sourceware.org (Postfix) with ESMTPS id 169E0385828B for ; Fri, 6 Sep 2024 13:11:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 169E0385828B Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=windriver.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=windriver.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 169E0385828B Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.178.238 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1725628321; cv=pass; b=uryQLJAY4sPT33bc/wHGAevcCiEqSoMLxz4rFjTyyf2yZtbRj/q0d07HDuth+w2iMXdoqnY2U7B+l/2dm7Vcf58wB767FpQqpHnUjEDk0EkvBGh6WmlPaP8fqEbAPI6VpUnz0kfkBF3Qw5SfP0tHZu3nQr2IzWOiFEqGBOWCJ+s= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1725628321; c=relaxed/simple; bh=5cPhJPGQKWxSsbdLTy67dKhDZKFrTaA/k+Wbgt4PRZQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=ehX2hS138rjCkk5TqQUxC7c7l/W7yleozhMtO9xezfa9IpxXY6a4iLCEqM2bujwvNkDFDeSnanfYsq+qo58AiDMKiLQtxZA7jtqWOgfX1BJdvV4zAlil2bH+rxBouF4cVs07iRlWJ+DJB5BLgoXt4SbHHbbIZ1UYWSOGfeb8JX4= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 486AdrbA001167; Fri, 6 Sep 2024 13:11:58 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 41fhy8guv0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Sep 2024 13:11:58 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ky8TFXhVju7l6CHoVsHk7/IajasHBuQ9RoXHD3hlIQz8po9eGfoM7xaJNtQrLTHNpBvMWaFE/kKEhXWAuV7zVJHzSvDXF1Sr5vRsVm/K9U7u8S9U5NxfAhZP1cfFvX4fCMU9qbgsevoKGIJunLeYdUgUO9MFTWDzXnO5gwM/Zx5AfibW0ZAlQBEvyYsBM3uyN39Bx2zXYNMlhCTiAIi3n3fWThHLOuObUY171VLw9bNXJ/3t+zC/3+dkccVBDG//XfROzRTmJoSwnwsDqGRsaGlQaGx0mgjejSQv1NFJ66wy/dMMFtlFfqazY4rzAOO5uJG4W89vFhxRnmKjUgd6mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=alMu4K0HWG58X/NP5TPyuTtQSB3SmEDcF0Jokere8kI=; b=NbDq741mhVCd3S/JOFsU5rU/EV0Beg7aRWSf5wFVw0Gpq3Bzb3NkYDfS8hXhFy3PEgQVK+I5YxM/rb2gXazCVcicjdsnAoBgsNwPgZ43nlKSs8Rt+Njj9FhkqWwDtMPNA5n40Z0+Sh1Qw8VxUshJ2auPp1NAnXKH9+kZw1+Dxy8ge8dTXroPIpx7gR9xUcq6EC6XLLO1E/qRCq2kBvmZ8PqmLYSP9UaH4ISig3LRQ3Pchb0kgWa5A1HXnaaWWww7UX0qRnJhu8eq7IO4nnwvbFAkqcicxCTTvhLYqQHCrj6Au3lTiDpVsKLUdLzLrwj+cNQLmJjckLdIoHb2Joisxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from LV3PR11MB8602.namprd11.prod.outlook.com (2603:10b6:408:1b3::11) by PH7PR11MB6356.namprd11.prod.outlook.com (2603:10b6:510:1fc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.25; Fri, 6 Sep 2024 13:11:50 +0000 Received: from LV3PR11MB8602.namprd11.prod.outlook.com ([fe80::5e20:4508:a523:df39]) by LV3PR11MB8602.namprd11.prod.outlook.com ([fe80::5e20:4508:a523:df39%6]) with mapi id 15.20.7918.024; Fri, 6 Sep 2024 13:11:50 +0000 From: Deepthi.Hemraj@windriver.com To: gcc-patches@gcc.gnu.org Cc: rguenther@suse.de, jeffreyalaw@gmail.com, josmyers@redhat.com, Randy.MacLeod@windriver.com, Naveen.Gowda@windriver.com, SunilKumar.Dora@windriver.com Subject: [PATCH v3] GCC Driver : Enable very long gcc command-line option Date: Fri, 6 Sep 2024 06:11:29 -0700 Message-ID: <20240906131129.2171941-1-Deepthi.Hemraj@windriver.com> X-Mailer: git-send-email 2.43.0 X-ClientProxiedBy: SJ0PR13CA0064.namprd13.prod.outlook.com (2603:10b6:a03:2c4::9) To LV3PR11MB8602.namprd11.prod.outlook.com (2603:10b6:408:1b3::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV3PR11MB8602:EE_|PH7PR11MB6356:EE_ X-MS-Office365-Filtering-Correlation-Id: 638cfc4d-6a5b-4f3d-b112-08dcce75781c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: JCDCmG9Jw/gbZg43HBRQ9H+23J1yCENTxrVkUVgsR5OvlUejk5Z0UDb4jHw7WaL/mSdryAOd6VMNLSVMIh+TNdf7sZ5iDyfKifHVtUTO2dbpmrjFkS8KRljErt/rpxsf+w5WchxScyYnw/Fg/DvRxo7gUR4FnMvVwbguW5gV+nFNawJw88h77rSeBp0f1ZlSx62BelJ6kru8bhiwbnVtmqvaW/GoiNlYap4TR6gm9f1MOdlQWm4FS+8LVvaOIhsLczAzIAssCRuTe9RHqyOg5EHBy+ODm3bXMIcut8DrOnngECL7GcO+rr8RZcmRJETHf02xuj1Jp/XZXIEzlIFgHUiDDIl7bRHXkLte/hsWdTzMzrUllRD0Q0q2/tD7t3QbQTZLmkR5wKhDSKU6eSZyKawoTId0wasMSyCk5ml5hcs0zmDtazAcsZFoKbu7WjQ/oDOY8VUbh166nZE3HjrwSJNTa4AK1otMOzhhwzyn79YLDL/gfzqKpx4MRBYaplIJqv3/GPrQogfFIr2fVgvztj7fGvpwuG6qAAI9Lx+LEM50h7f3dhOPH8rfrCUnlwwUiHIUB9JlcOlAACDBY3U71y8Y9NrO7gLMLHRTd/qmFhgX1mCoU9RYNc0uPkbxeaJUBuooMfRT1NYTvr0Y/oUPcSxi6B7Z81BW7p4hUWIArArGaou6UpzTM38hZjOd5k5hCwmcbtNnG+c299rqB0tFxzb/8/t+9MbAvrzfYE4gUYomxRMDAzC2BO7K43eJau/Zj8pPnihXQfnFz7Jm6CO+wAUcYvre1BjX79Fo6fQOnlBQy6VnFWC4iFfUzAzC5NTliPO9JW/oFLJ9rrkS2AyywKur0NogpCiyz+YCpCE6kMcc9esVbM2sLOhsKQ1+9BXqmDo1inlbx32K7SNrfjbQhl3Nrg1E9qVLjFYCukBu/YtZ2Svjs6miZHs9rwdMqwGSZKQIPEjmhYg6Y+7zwaGfLF+OOAkBT8YC/4nA5LaimK4SSgA0dhIWqWDO/saBRcR5UxVo+wLn/hrf0NT80ihaT3fxHLvjHE3X1tfKXSsJWu+pV8dPuQRrIBt5VAsAPC54IVk9PIMBDALXVeKA0YglIcjjICWrOEQ7fgsrSBE0rbmSYbyH1hFc7DUZx70EQExPlemZzsiGepy2sG9nTs/Ry86bBWh87mMybPbW6OHc8+VTJCuaFtXSEnZsjYY1rF7m1EN7VC0t6806OfSX3NqSjTWWodl/ZmKXdafRKeQQiURAvW06pBivD1yW9wi4FfPEIv7h4d6zvlLg4EKlAXoz3U/ONXVpXUAZ8qqBfVB31D3UD8PRtEqWe6R2BMbLbfyPxNNBhFQLpWMKflLJqnU9IOwf2sM3FEVerud7H0RjKIeJkLt3I6bT4WqrmQ2sm+Bkh71dEu7vPyBER0wNG1za9g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:LV3PR11MB8602.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(52116014)(376014)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XgMCRgqwwb1d5mXHg5LD0rNJ5az2IHSn77FsP4d3T9V1qvBx1LipsJi9jR1tRrviHX9m7euSk2Ms6aq1JGP/oZYPPMnRBbV96i0HIoqzwF2No+hv/9wtrh7kGAWxAzaCvLdUplRK1rj1eMtn7jEdeOrzDkq9M5wZGkP12/n8ugU8Zk89wBZgPYwvqwHqCV5DFO1a4/jK0fs53q/GrbgbKzfMwWoJkAy1EGgJPJDxDVhPsZHgEvqLSaVfkyDjIxAYYp0NxAh0Yx6G3M/2Hkgkn2Tfi/qgeM7kYxE9iQAiDwU+HFgM+Ua6LmKM4g7v8/4R7/vvbjqrLXwZoVhcmkzABnm7l8HQkX6/aa6Ep5cfYSJc1Lj6T6ChS4KLV16OU8zl8Geli3OFZV/0URdrjkrU7KhdzAu+Pdm6nvFlGrT0GTmwBm/L5jPFtS41NL9frOJHgn+iH+F/JZi/NiZ3ZEoD5S3RIjVBCC2pW4A0mT6KCggLJ13HuOQeSjLMWCdIs3KLse0JSayP1nUOMJEaUtYXcs5J06kuaQoTp0FOXM455R+kZHZe7ziknMrk7T5vzr4tnZ3+PFGr3bvovdVlJwso4wMpwd4DRkqylaQFc61ZGi9URHMRfHiVujePStx0W71gMBtfgXcG/0LfHyyoc+TiYSTWiVs3cimsa92svK7tw1IILryKXXHO+EgIxl8ZWzbq+Nf5gHL7bJFWRWbDlq65X2OmG3H2SoAuaq3GintIb96IdTAzSz4k8oMc1xkXgnVAF46vufME4UIBHpza6wI4GuHkF7C9OY+4xSXJsZmmF+wGwA/qlHtZ2A4V+c3VKoCfx2oHE7ojX5aG0jsReYJKSkwuZ8N4WqSll9E6+XRQZ0TT8fbeXRXVyKOPAaayYx3JETBQZoeSwzpNv4SLHr+AxItl0CFFQCQIxtAbERg9EJLcjKANzeSdzV8e1xXLxXIRcm+B2o5gYPHB9pQkVeJqb3n+GxdUZi94iHentBv5/VGdtiS3mFnr40k+JYoNoV9AnOLs4f7kvFm1jvTm3wcIkVzAAl0gXB2bGc8zJHhlapxkEIOHGb8l/p/WDazF8MJIajfkpcgS7QSe2P30qjDXn2skH9FQquPUVxXiE9dmhi6TRewsUWhyHHZH/v+ye9YqN6Or1i6dNNOJnCfDaYP4EFBmpdTVw/28ePZp1pSUk+EWTbs6ecOpn8fLjNkIbVHiqgGm79/SRwGcbagP7jxTa5WKICA0kttqRA5jA0uMsBPEG5VKzOfq0AZuUj8dBhXCDgi/1XsRt3HjWj98cN1PuPV2kpLQEBQJKXMT4NOHEaqhgmJSiaxiHVMmBIWxilo3MT/QIMxc9dI+4wQ2ojgrOW07X4Hwej2VBWuMElQr6rjPD3KAx3AfEDpv0Scgb/gUWGrfWeKXlrLJkxX+Fv1Ff7KL7mesvCQNC1wWvEwOF2jl0otfzLGzL5kNSbqwcy6JCdx3rZ74xAZItvwRwb+fT9nTEyfeqmlBFTHM6DmBJhHOGpEdL5hHoiG/92kaBQ1ZHnAa7+dz9KON0Kjm2yLzbQyCU7quipDysHajSC9DYwoufw7XnBOWtQIlnCmb97qOuWOOg7+oU8QwwujPrHY50w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 638cfc4d-6a5b-4f3d-b112-08dcce75781c X-MS-Exchange-CrossTenant-AuthSource: LV3PR11MB8602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2024 13:11:50.4129 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3Zg3F7Rb1NjeGRbYtDlyK0tcet1hZraqpEFjCta16AcDn5jb7ZODU0Q2qsx0nq03Cz/slIMK71w8bAixh2wmKyJk3lfuZBdT6Tr5JMlVQJ4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6356 X-Proofpoint-GUID: _4cPaxVJCa0MqHk-3q-53o6NrSMJZDbx X-Proofpoint-ORIG-GUID: _4cPaxVJCa0MqHk-3q-53o6NrSMJZDbx X-Authority-Analysis: v=2.4 cv=f6gaB/yM c=1 sm=1 tr=0 ts=66daff9e cx=c_pps a=28bFCgguF5sZfysLuYgbMw==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=EaEq8P2WXUwA:10 a=bRTqI5nwn0kA:10 a=t7CeM3EgAAAA:8 a=mDV3o1hIAAAA:8 a=9qxNCY_qAAAA:8 a=5XxngPURnMwgJoPhwwsA:9 a=3ZKOabzyN94A:10 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_02,2024-09-05_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2408220000 definitions=main-2409060096 X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org From: Deepthi Hemraj For excessively long environment variables i.e >128KB Store the arguments in a temporary file and collect them back together in collect2. This commit patches for COLLECT_GCC_OPTIONS issue: GCC should not limit the length of command line passed to collect2. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111527 The Linux kernel has the following limits on shell commands: I. Total number of bytes used to specify arguments must be under 128KB. II. Each environment variable passed to an executable must be under 128 KiB In order to circumvent these limitations, many build tools support response-files, i.e. files that contain the arguments for the executed command. These are typically passed using @ syntax. Gcc uses the COLLECT_GCC_OPTIONS environment variable to transfer the expanded command line to collect2. With many options, this exceeds the limit II. GCC : Added Testcase for PR111527 TC1 : If the command line argument less than 128kb, gcc should use COLLECT_GCC_OPTION to communicate and compile fine. TC2 : If the command line argument in the range of 128kb to 2mb, gcc should copy arguments in a file and use FILE_GCC_OPTIONS to communicate and compile fine. TC3 : If the command line argument greater thean 2mb, gcc shuld fail the compile and report error. (Expected FAIL) Signed-off-by: sunil dora Signed-off-by: Topi Kuutela --- gcc/collect2.cc | 42 ++++++++++++++++++++-- gcc/gcc.cc | 37 +++++++++++++++++-- gcc/testsuite/gcc.dg/longcmd/longcmd.exp | 16 +++++++++ gcc/testsuite/gcc.dg/longcmd/pr111527-1.c | 44 +++++++++++++++++++++++ gcc/testsuite/gcc.dg/longcmd/pr111527-2.c | 9 +++++ gcc/testsuite/gcc.dg/longcmd/pr111527-3.c | 10 ++++++ gcc/testsuite/gcc.dg/longcmd/pr111527-4.c | 10 ++++++ 7 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/longcmd/longcmd.exp create mode 100644 gcc/testsuite/gcc.dg/longcmd/pr111527-1.c create mode 100644 gcc/testsuite/gcc.dg/longcmd/pr111527-2.c create mode 100644 gcc/testsuite/gcc.dg/longcmd/pr111527-3.c create mode 100644 gcc/testsuite/gcc.dg/longcmd/pr111527-4.c diff --git a/gcc/collect2.cc b/gcc/collect2.cc index 902014a9cc1..5b5f16ab46c 100644 --- a/gcc/collect2.cc +++ b/gcc/collect2.cc @@ -376,6 +376,42 @@ typedef int scanfilter; static void scan_prog_file (const char *, scanpass, scanfilter); +char* getenv_extended (const char* var_name) +{ + int file_size; + char* buf = NULL; + const char* prefix = "@"; + size_t prefix_len = strlen(prefix); + + char* string = getenv (var_name); + if (strncmp (string, prefix, prefix_len) == 0) + { + FILE *fptr; + char *new_string = xstrdup(string + prefix_len); + fptr = fopen (new_string, "r"); + if (fptr == NULL) + return (0); + /* Copy contents from temporary file to buffer */ + if (fseek (fptr, 0, SEEK_END) == -1) + return (0); + file_size = ftell (fptr); + rewind (fptr); + buf = (char *) xmalloc (file_size + 1); + if (buf == NULL) + return (0); + if (fread ((void *) buf, file_size, 1, fptr) <= 0) + { + free (buf); + fatal_error (input_location, "fread failed"); + return (0); + } + buf[file_size] = '\0'; + free(new_string); + return buf; + } + return string; +} + /* Delete tempfiles and exit function. */ @@ -1004,7 +1040,7 @@ main (int argc, char **argv) /* Now pick up any flags we want early from COLLECT_GCC_OPTIONS The LTO options are passed here as are other options that might be unsuitable for ld (e.g. -save-temps). */ - p = getenv ("COLLECT_GCC_OPTIONS"); + p = getenv_extended ("COLLECT_GCC_OPTIONS"); while (p && *p) { const char *q = extract_string (&p); @@ -1200,7 +1236,7 @@ main (int argc, char **argv) AIX support needs to know if -shared has been specified before parsing commandline arguments. */ - p = getenv ("COLLECT_GCC_OPTIONS"); + p = getenv_extended ("COLLECT_GCC_OPTIONS"); while (p && *p) { const char *q = extract_string (&p); @@ -1594,7 +1630,7 @@ main (int argc, char **argv) fprintf (stderr, "o_file = %s\n", (o_file ? o_file : "not found")); - ptr = getenv ("COLLECT_GCC_OPTIONS"); + ptr = getenv_extended ("COLLECT_GCC_OPTIONS"); if (ptr) fprintf (stderr, "COLLECT_GCC_OPTIONS = %s\n", ptr); diff --git a/gcc/gcc.cc b/gcc/gcc.cc index ae1d80fe00a..98c1dff6335 100644 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc @@ -2953,12 +2953,43 @@ add_to_obstack (char *path, void *data) return NULL; } -/* Add or change the value of an environment variable, outputting the - change to standard error if in verbose mode. */ +/* Add or change the value of an environment variable, + * outputting the change to standard error if in verbose mode. */ static void xputenv (const char *string) { - env.xput (string); + static const size_t MAX_ENV_VAR_LEN = 128*1024; + const char *prefix = "COLLECT_GCC_OPTIONS="; + size_t prefix_len = strlen (prefix); + FILE *fptr; + + const size_t string_length = strlen (string); + if ( string_length < MAX_ENV_VAR_LEN ) + { + env.xput (string); + return; + } + /* For excessively long environment variables i.e >128KB + Store the arguments in a temporary file and collect + them back together in collect2 */ + if (strncmp (string, prefix, prefix_len) == 0) + { + const char *data_to_write = string + prefix_len; + char *temp_file = make_at_file (); + fptr = fopen (temp_file, "w"); + if (fptr == NULL) + { + fatal_error (input_location, "Cannot open temporary file"); + return; + } + /* Copy contents into temporary file */ + fwrite (data_to_write, sizeof(char), strlen(data_to_write), fptr); + char *env_val = (char *) xmalloc (strlen (temp_file) + strlen(prefix) + 2); + sprintf (env_val, "COLLECT_GCC_OPTIONS=@%s", temp_file); + env.xput (env_val); + record_temp_file (temp_file, !save_temps_flag, !save_temps_flag); + fclose (fptr); + } } /* Build a list of search directories from PATHS. diff --git a/gcc/testsuite/gcc.dg/longcmd/longcmd.exp b/gcc/testsuite/gcc.dg/longcmd/longcmd.exp new file mode 100644 index 00000000000..bac8b6d6fff --- /dev/null +++ b/gcc/testsuite/gcc.dg/longcmd/longcmd.exp @@ -0,0 +1,16 @@ +# GCC testsuite that uses the `dg.exp' driver. +# Load support procs. +load_lib gcc-dg.exp + +# If a testcase doesn't have special options, use these. +global DEFAULT_CFLAGS +if ![info exists DEFAULT_CFLAGS] then { + set DEFAULT_CFLAGS "" +} + +dg-init + +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \ + "" $DEFAULT_CFLAGS + +dg-finish diff --git a/gcc/testsuite/gcc.dg/longcmd/pr111527-1.c b/gcc/testsuite/gcc.dg/longcmd/pr111527-1.c new file mode 100644 index 00000000000..a5373f57790 --- /dev/null +++ b/gcc/testsuite/gcc.dg/longcmd/pr111527-1.c @@ -0,0 +1,44 @@ +/* { dg-do run } */ + +#include +#include +#include +#include + +#define ARGV_LIMIT_SIZE 128 * 1024 +#define SYSTEM_LIMIT_SIZE 2 * 1024 * 1024 +#define STR_TO_WRITE "-DTEST " +void create_large_response_file () +{ + FILE *fp1, *fp2; + char buffer[1024]; + + strcpy (buffer, STR_TO_WRITE); + + fp1 = fopen ("options_128kb_to_2mb.txt", "wb"); + if (fp1 == NULL) + { + abort (); + } + while (ftell (fp1) < (ARGV_LIMIT_SIZE + 10)) + { + fwrite (buffer, strlen (buffer), 1, fp1); + } + fclose (fp1); + + fp2 = fopen ("options_greater_then_2mb.txt", "wb"); + if (fp2 == NULL) + { + abort (); + } + while (ftell (fp2) < (SYSTEM_LIMIT_SIZE +10)) + { + fwrite (buffer, strlen (buffer), 1, fp2); + } + fclose (fp2); +} + +int main() +{ + create_large_response_file (); +} diff --git a/gcc/testsuite/gcc.dg/longcmd/pr111527-2.c b/gcc/testsuite/gcc.dg/longcmd/pr111527-2.c new file mode 100644 index 00000000000..397d70f7b03 --- /dev/null +++ b/gcc/testsuite/gcc.dg/longcmd/pr111527-2.c @@ -0,0 +1,9 @@ +/* { dg-do run } */ + +#include + +int main() +{ + printf("Hello World\n"); +} +/* { dg-final { output-exists { target *-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/longcmd/pr111527-3.c b/gcc/testsuite/gcc.dg/longcmd/pr111527-3.c new file mode 100644 index 00000000000..394e54b1074 --- /dev/null +++ b/gcc/testsuite/gcc.dg/longcmd/pr111527-3.c @@ -0,0 +1,10 @@ +/* { dg-do run } */ +/* { dg-options "@options_128kb_to_2mb.txt" } */ + +#include + +int main() +{ + printf("Hello world\n"); +} +/* { dg-final { output-exists { target *-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/longcmd/pr111527-4.c b/gcc/testsuite/gcc.dg/longcmd/pr111527-4.c new file mode 100644 index 00000000000..eaa427f24a4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/longcmd/pr111527-4.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "@options_greater_then_2mb.txt" } */ +/* { dg-excess-errors "warnings about argument list too long" } */ + +#include + +int main() +{ + /* { xfail *-*-* } */ +}