From patchwork Wed Feb 21 18:34:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Karpov X-Patchwork-Id: 1902372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=microsoft.com header.i=@microsoft.com header.a=rsa-sha256 header.s=selector2 header.b=G1iwN0Ae; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4Tg4lT5tV5z20Qg for ; Thu, 22 Feb 2024 05:37:57 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9AD713858281 for ; Wed, 21 Feb 2024 18:37:55 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2105.outbound.protection.outlook.com [40.107.20.105]) by sourceware.org (Postfix) with ESMTPS id B3996385840E for ; Wed, 21 Feb 2024 18:34:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B3996385840E Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=microsoft.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=microsoft.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B3996385840E Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.20.105 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708540490; cv=pass; b=MLWy68Egs2iqvez3bbo90ZzHFgkUc/0NHsPYjwDuYa3U1YBBYhSKfGA3TYmiZ4m09uPh3PBz57BV63M6m15Y/yDKZlzH8Wa3ImdSnQoKT2u34NWX6MlJs2DHzbMgqOQ8ifwNAIUGUfLUWFFVlf5a349++SkV1MADto7GCZ6bGXY= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708540490; c=relaxed/simple; bh=2gKYrYXTaZam3tRNvx3vYDFrn2JgkMk29/UcLML4zBk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=IYPe+ubGx2aK9esCaw9SjF8iAKWa8B4+mc9r/jaZq7DeQyc18za0VgK+r9goZqqGe6xiPFPjtAgkj3y2+JnUCy+qJp54jNWEdKpQwUIv8+YFh7d1wyl98WP2t56NZ1rmGjxrmRupJoKZx57RfRdpiedZ4hkU5ntVSjxAu3VJXYE= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=esTwlTmYttqaVA3Vkn92jG55dTIef22ICAO0zNt7M6epr6/SfiSw/ZjZs0Jd4AZXdcNBePjiT0cvScK321wxWzBudHLiB1lSi47iu+Dy5SakYXUFPPfAwTfloWDLQ+kDBXM9ADxyCto3xUumMxtMUkslQLy2+GSRVqA1ROqo4mnDh+U6+9bSqy6gVH9sl+JUqLC6Pzrj/MoF3qvhP32ynFWGptgQB3g9mzlmHK/y/FaWibu0s56T4tOfYKHMtjUkU0ixhuUL8B2btauBFUzBHqKK68S8WPVtLS7Sx1WFrVDh+MiQQRyWuSFF7opG/qA7mnNOpLZUTC22+xs3HixRjg== 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=djUflxmTcQUleKyMynbf2ufpx4NJ0aHRheFKwKrXnBQ=; b=lKggc/+kITOnLKJWb7uIzjsU2Gk9M5waaRnPf312Kg0V5i3h3/0/uI9HVMEKUaet8eey0DgfJSGj7mwSpt/2yh/Qy//3lhy8bjymoY8jP7OhlA6h7MhVQ52nj51kwMwHEgkJI82xxjfaNQNpOUVodGrFjOmloXGxyzu+0h8xwTlSlMyD95oBZkKJEWcXc3Vcstcr+v0t7smQH3ZGtkRVZksqdWxTZ2XItO6UiV2zzMj+ID1uQNaIs0dUZGMOGM6cAMnMu9pulTS3jpxi8iQj373EYdvibc2ESYM4Cu51lO6ohJuYhI37Xi2OPplZhdQgTgi5R9NXdRGkznl/YDbdWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=djUflxmTcQUleKyMynbf2ufpx4NJ0aHRheFKwKrXnBQ=; b=G1iwN0AehkL0WhKyOclLeVwTuogWqYBLRA0lhr7yacQ+RJGRuOea3SJEPh0B0HYDPqsL7SsvxiBr38muZLe7dkukEcJ/6r6iqGQKPnXMEOxNu4frTxEyzpNUDesLXbmuMrPBrrmPmtpcXPpL6gyY/xVGqlOxu8yRM+uGVEpxAcI= Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com (2603:10a6:800:17f::6) by DBBPR83MB0614.EURPRD83.prod.outlook.com (2603:10a6:10:533::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.8; Wed, 21 Feb 2024 18:34:44 +0000 Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com ([fe80::7279:eea0:8540:a0f5]) by VI1PR83MB0431.EURPRD83.prod.outlook.com ([fe80::7279:eea0:8540:a0f5%7]) with mapi id 15.20.7339.007; Wed, 21 Feb 2024 18:34:43 +0000 From: Evgeny Karpov To: Evgeny Karpov , "gcc-patches@gcc.gnu.org" CC: "richard.sandiford@arm.com" , "10walls@gmail.com" <10walls@gmail.com>, Maxim Kuvyrkov , "mark@harmstone.com" , Zac Walker , Ron Riddle , Radek Barton Subject: [PATCH v1 05/13] Reuse MinGW from i386 for AArch64 Thread-Topic: [PATCH v1 05/13] Reuse MinGW from i386 for AArch64 Thread-Index: AQHaZPSjKTtfzuEGB0ucKYjHwZ6deA== Date: Wed, 21 Feb 2024 18:34:43 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=57576bd1-751e-4189-ac11-c600ca5b612b; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2024-02-21T17:14:30Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: VI1PR83MB0431:EE_|DBBPR83MB0614:EE_ x-ms-office365-filtering-correlation-id: 71a8753a-fb8a-420b-b477-08dc330bc5b0 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: DBpyROotEWxN+wG7RLmGfQSd68FM41mzutv50+VtysKUigo4VXzQwCpl0jpV5y9qk7q+Vy1zTLZwqZMS7vRgKjFoFkDS1KqmRtOpSaiFlNDmCI9EULcnPzTTy9mmxBMiDixpjhVWIKtTBBWNjvCX7Vxr0wFGgSJm0JpNgGhBuTDa44BNbCQOPBB9bU24e5qlLubYSD0xkaGV1sDuMrBHs7JGGo6KowDcr6J2n3UNhMJKch5LU6yfswnkU/D6TgYmOmK+pAUfCZAXwKDL0Y2VbdJRXqF3KuNjpXc+fxnOVhevdJ76gytGOhy89KDV/RhAl1uWa9q53kAOfWqMhUM92J0aZYv8+3SnkCAjuJMUAtw= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR83MB0431.EURPRD83.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: VkZUujGUU+cxhh0kKxL7rHyh1Tqje0L1Zd1pOFPgHDznwx+MEPxGaQuStiC4n9UsSLJO8Vv0Cj6iCOZLsf1k0SHYHpmAl8gmo3+Nrkab6eSPe70kZ3u3fabaphRPmX71RMAXrgtlTVALlDZ5+HdByy7uT2eVD291ZFEoN+uql55iOe78TFYj0eC6S7aat2jv7O+rB3lw50pg3ingTxlBJBrYoC/GON6rNA018OgNLLCs9ZhhHAA7PzwNGvYleL7RgAQLmC/SGdxXFB6kffF4lq2VqUSvgVdOvwn5WPJUJRxFYnqZEfMlCqr6Gia/JgPCnQClpKA9Gja8XJF6c0kW57N0vn3L/m2r+0gx0U5bw6cTj1Nlw6mMjFSYoEh89AYS3UmzrOw13O93xkPOhoZZHxmYFLV/UwSYCIgd6KwvCQEobG7b7/RUv/bTi1234ZO2fluItMN1rhkkEP95d7Z5/p02G+uTzkQKaeF3YMr1zXBWgU+CZJwqmEbLH/lmXmkWwCDfzNBUgvz4MDKDuOkmuIkIcdAN7CH59+EAphJ5syF53Q/sn2J9sBGE913KpeY8dO0TZW7uYkpj6RymNYkp4qXMN2XUkAD9KjtAI609VbvOYkYI7g24uYYzdsDVaz/fVDeyjFktfkC4LtDGdDRNmxqWgqCgR/Zd9gL+ElJRBWimOXLhUf4iPsdvgI3kmKaDdLaxvAgPg3i7rOvhlE7OU+0PCylelnbEW2gUBBorS47Pl2Wtnd94C2/M5ieAcaDl0bhIKpyXfvFIQFmb+oDG29pscYkvFS1AUH72MA+Te29u+UWJiCnP41odSyqEqWK3QI6jRRtwIH4Q5lpK8dNle0UqNSWTeKlMMBTPibZopJDvd3MijYr/umJIGun6ncMa1KZhmLXVvMtYLKkv7E4VdtgwgcyimaR5DS7NrrzC+lgIoapPWlsLH4ROagshg5hxjozJuos+xQU4JW98pNWta67pJazwEODqYitKXqjpW7oIPIxk97zhjeHkqw5XKuRO8BK0NKot1C3TwejwWWJrqc9dHjyKqaVyS5UMci9mRonwzKOasaY16S0PniUOrCnWE0NPXaKsc4W8H2iY+ao4XjMQ3U+CJPp1vYdQgnNh44YHLtCpQUR27+Vgv+Rk9shO0cbbNBGJierjpQOzMTeAeKPt0WcDYU+1p6HJesHaQnmjVPdg4v+JoR72HmdYPYnANj3zxx067x+q1gtvYczcTokLMMLzfQr7/pPBxZ+TChIcEAN651KaUKJ0lMODsmIvk70XD7k11gcC25sLegCGMgI1jbx9lZQnlGwyqCK1UMjK+hhQtUzqCByaQv9GUCjkK5BM1zp8um/ipVyqeSYRzJp3HJkLt4BJOSnqiLygWm+bt6i1LnwXB2StUqd+2UVp1S9qIuMrivnn8RG98C5BGRz92KB5T+6QDZ0AfuUVma6/4bM0YCELKnjppx9/s5C3ifq315UjqdtoFZokLhFH7fTRh6bcAeZDrDYZD7yqiWDkPNDQItTh6ksp073OseiaaUEQBw5Vy9xYJPh0H/n+moYT9DGfgVsenpX5W1om3acB578xJ1xOkmqA1/Avh5VT MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR83MB0431.EURPRD83.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71a8753a-fb8a-420b-b477-08dc330bc5b0 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2024 18:34:43.3533 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 5aSnZDI+CQeHzvAppNbBVMVU8nYQktabXX9PaVWNqonB0fOHdRSUzieEavfQe2LUGuooXExr+iXp2e87DfeitA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR83MB0614 X-Spam-Status: No, score=-11.0 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, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, 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 408ca45f7c5c6e58208a7b8004f764dc0c1afdd3 Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Tue, 20 Feb 2024 18:15:27 +0100 Subject: [PATCH v1 05/13] Reuse MinGW from i386 for AArch64 This patch creates a new config/mingw directory to share MinGW related definitions, and moves there the corresponding existing files from config/i386. It also makes uses of them on the new aarch64-w64-mingw32 target. gcc/ChangeLog: * config.gcc: Adjust targets after moving MinGW related files from i386 to mingw folder. * config/i386/cygming.opt: Moved to... * config/mingw/cygming.opt: ...here. * config/i386/cygming.opt.urls: Moved to... * config/mingw/cygming.opt.urls: ...here. * config/i386/cygwin-d.cc: Moved to... * config/mingw/cygwin-d.cc: ...here. * config/i386/mingw-stdint.h: Moved to... * config/mingw/mingw-stdint.h: ...here. * config/i386/mingw.opt: Moved to... * config/mingw/mingw.opt: ...here. * config/i386/mingw.opt.urls: Moved to... * config/mingw/mingw.opt.urls: ...here. * config/i386/mingw32.h: Moved to... * config/mingw/mingw32.h: ...here. * config/i386/msformat-c.cc: Moved to... * config/mingw/msformat-c.cc: ...here. * config/i386/t-cygming: Moved to... * config/mingw/t-cygming: ...here and updated. * config/i386/winnt-cxx.cc: Moved to... * config/mingw/winnt-cxx.cc: ...here. * config/i386/winnt-d.cc: Moved to... * config/mingw/winnt-d.cc: ...here. * config/i386/winnt-stubs.cc: Moved to... * config/mingw/winnt-stubs.cc: ...here. * config/i386/winnt.cc: Moved to... * config/mingw/winnt.cc: ...here. --- gcc/config.gcc | 25 ++++++++++++--------- gcc/config/{i386 => mingw}/cygming.opt | 0 gcc/config/{i386 => mingw}/cygming.opt.urls | 0 gcc/config/{i386 => mingw}/cygwin-d.cc | 0 gcc/config/{i386 => mingw}/mingw-stdint.h | 0 gcc/config/{i386 => mingw}/mingw.opt | 0 gcc/config/{i386 => mingw}/mingw.opt.urls | 0 gcc/config/{i386 => mingw}/mingw32.h | 0 gcc/config/{i386 => mingw}/msformat-c.cc | 0 gcc/config/{i386 => mingw}/t-cygming | 23 ++++++++++--------- gcc/config/{i386 => mingw}/winnt-cxx.cc | 0 gcc/config/{i386 => mingw}/winnt-d.cc | 0 gcc/config/{i386 => mingw}/winnt-stubs.cc | 0 gcc/config/{i386 => mingw}/winnt.cc | 0 14 files changed, 27 insertions(+), 21 deletions(-) rename gcc/config/{i386 => mingw}/cygming.opt (100%) rename gcc/config/{i386 => mingw}/cygming.opt.urls (100%) rename gcc/config/{i386 => mingw}/cygwin-d.cc (100%) rename gcc/config/{i386 => mingw}/mingw-stdint.h (100%) rename gcc/config/{i386 => mingw}/mingw.opt (100%) rename gcc/config/{i386 => mingw}/mingw.opt.urls (100%) rename gcc/config/{i386 => mingw}/mingw32.h (100%) rename gcc/config/{i386 => mingw}/msformat-c.cc (100%) rename gcc/config/{i386 => mingw}/t-cygming (73%) rename gcc/config/{i386 => mingw}/winnt-cxx.cc (100%) rename gcc/config/{i386 => mingw}/winnt-d.cc (100%) rename gcc/config/{i386 => mingw}/winnt-stubs.cc (100%) rename gcc/config/{i386 => mingw}/winnt.cc (100%) diff --git a/gcc/config.gcc b/gcc/config.gcc index 34c7be72fb6..498ee702607 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1265,7 +1265,10 @@ aarch64*-*-linux*) ;; aarch64*-*-mingw*) tm_file="${tm_file} aarch64/aarch64-coff.h" + tm_file="${tm_file} mingw/mingw32.h" + tm_file="${tm_file} mingw/mingw-stdint.h" tmake_file="${tmake_file} aarch64/t-aarch64" + target_gtfiles="$target_gtfiles \$(srcdir)/config/mingw/winnt.cc" case ${enable_threads} in "" | yes | win32) thread_file='win32' @@ -2161,9 +2164,9 @@ i[4567]86-wrs-vxworks*|x86_64-wrs-vxworks7*) i[34567]86-*-cygwin*) tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h i386/cygwin.h i386/cygwin-stdint.h" xm_file=i386/xm-cygwin.h - tmake_file="${tmake_file} i386/t-cygming t-slibgcc" - target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc" - extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt" + tmake_file="${tmake_file} mingw/t-cygming t-slibgcc" + target_gtfiles="$target_gtfiles \$(srcdir)/config/mingw/winnt.cc" + extra_options="${extra_options} mingw/cygming.opt i386/cygwin.opt" extra_objs="${extra_objs} winnt.o winnt-stubs.o" c_target_objs="${c_target_objs} msformat-c.o" cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o" @@ -2179,9 +2182,9 @@ x86_64-*-cygwin*) need_64bit_isa=yes tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h i386/cygwin.h i386/cygwin-w64.h i386/cygwin-stdint.h" xm_file=i386/xm-cygwin.h - tmake_file="${tmake_file} i386/t-cygming t-slibgcc" - target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc" - extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt" + tmake_file="${tmake_file} mingw/t-cygming t-slibgcc" + target_gtfiles="$target_gtfiles \$(srcdir)/config/mingw/winnt.cc" + extra_options="${extra_options} mingw/cygming.opt i386/cygwin.opt" extra_objs="${extra_objs} winnt.o winnt-stubs.o" c_target_objs="${c_target_objs} msformat-c.o" cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o" @@ -2217,7 +2220,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) if test x$enable_threads = xmcf ; then tm_file="${tm_file} i386/mingw-mcfgthread.h" fi - tm_file="${tm_file} i386/mingw32.h" + tm_file="${tm_file} mingw/mingw32.h" # This makes the logic if mingw's or the w64 feature set has to be used case ${target} in *-w64-*) @@ -2246,8 +2249,8 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) *) ;; esac - tm_file="${tm_file} i386/mingw-stdint.h" - tmake_file="${tmake_file} t-winnt i386/t-cygming t-slibgcc" + tm_file="${tm_file} mingw/mingw-stdint.h" + tmake_file="${tmake_file} t-winnt mingw/t-cygming t-slibgcc" case ${target} in x86_64-w64-*) tmake_file="${tmake_file} i386/t-mingw-w64" @@ -2257,8 +2260,8 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) ;; esac native_system_header_dir=/mingw/include - target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc" - extra_options="${extra_options} i386/cygming.opt i386/mingw.opt" + target_gtfiles="$target_gtfiles \$(srcdir)/config/mingw/winnt.cc" + extra_options="${extra_options} mingw/cygming.opt mingw/mingw.opt" case ${target} in *-w64-*) extra_options="${extra_options} i386/mingw-w64.opt" diff --git a/gcc/config/i386/cygming.opt b/gcc/config/mingw/cygming.opt similarity index 100% rename from gcc/config/i386/cygming.opt rename to gcc/config/mingw/cygming.opt diff --git a/gcc/config/i386/cygming.opt.urls b/gcc/config/mingw/cygming.opt.urls similarity index 100% rename from gcc/config/i386/cygming.opt.urls rename to gcc/config/mingw/cygming.opt.urls diff --git a/gcc/config/i386/cygwin-d.cc b/gcc/config/mingw/cygwin-d.cc similarity index 100% rename from gcc/config/i386/cygwin-d.cc rename to gcc/config/mingw/cygwin-d.cc diff --git a/gcc/config/i386/mingw-stdint.h b/gcc/config/mingw/mingw-stdint.h similarity index 100% rename from gcc/config/i386/mingw-stdint.h rename to gcc/config/mingw/mingw-stdint.h diff --git a/gcc/config/i386/mingw.opt b/gcc/config/mingw/mingw.opt similarity index 100% rename from gcc/config/i386/mingw.opt rename to gcc/config/mingw/mingw.opt diff --git a/gcc/config/i386/mingw.opt.urls b/gcc/config/mingw/mingw.opt.urls similarity index 100% rename from gcc/config/i386/mingw.opt.urls rename to gcc/config/mingw/mingw.opt.urls diff --git a/gcc/config/i386/mingw32.h b/gcc/config/mingw/mingw32.h similarity index 100% rename from gcc/config/i386/mingw32.h rename to gcc/config/mingw/mingw32.h diff --git a/gcc/config/i386/msformat-c.cc b/gcc/config/mingw/msformat-c.cc similarity index 100% rename from gcc/config/i386/msformat-c.cc rename to gcc/config/mingw/msformat-c.cc diff --git a/gcc/config/i386/t-cygming b/gcc/config/mingw/t-cygming similarity index 73% rename from gcc/config/i386/t-cygming rename to gcc/config/mingw/t-cygming index af01f69acd1..f5de941c8e5 100644 --- a/gcc/config/i386/t-cygming +++ b/gcc/config/mingw/t-cygming @@ -20,37 +20,40 @@ # doing the build, it may not be installed yet. LIMITS_H_TEST = true -winnt.o: $(srcdir)/config/i386/winnt.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ +winnt.o: $(srcdir)/config/mingw/winnt.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \ $(TM_P_H) $(HASH_TABLE_H) $(GGC_H) $(LTO_STREAMER_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/i386/winnt.cc + $(srcdir)/config/mingw/winnt.cc -winnt-cxx.o: $(srcdir)/config/i386/winnt-cxx.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ +winnt-cxx.o: $(srcdir)/config/mingw/winnt-cxx.cc $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h \ $(TM_H) $(TREE_H) flags.h \ $(TM_P_H) $(HASHTAB_H) $(GGC_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/i386/winnt-cxx.cc + $(srcdir)/config/mingw/winnt-cxx.cc -winnt-stubs.o: $(srcdir)/config/i386/winnt-stubs.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ +winnt-stubs.o: $(srcdir)/config/mingw/winnt-stubs.cc $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h \ $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \ $(TM_P_H) $(HASHTAB_H) $(GGC_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/i386/winnt-stubs.cc + $(srcdir)/config/mingw/winnt-stubs.cc -cygwin-d.o: $(srcdir)/config/i386/cygwin-d.cc +cygwin-d.o: $(srcdir)/config/mingw/cygwin-d.cc $(COMPILE) $< $(POSTCOMPILE) -winnt-d.o: $(srcdir)/config/i386/winnt-d.cc +winnt-d.o: $(srcdir)/config/mingw/winnt-d.cc $(COMPILE) $< $(POSTCOMPILE) -msformat-c.o: $(srcdir)/config/i386/msformat-c.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ +msformat-c.o: $(srcdir)/config/mingw/msformat-c.cc $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h \ $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \ $(TM_P_H) $(HASHTAB_H) $(GGC_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/i386/msformat-c.cc + $(srcdir)/config/mingw/msformat-c.cc STMP_FIXINC=stmp-fixinc diff --git a/gcc/config/i386/winnt-cxx.cc b/gcc/config/mingw/winnt-cxx.cc similarity index 100% rename from gcc/config/i386/winnt-cxx.cc rename to gcc/config/mingw/winnt-cxx.cc diff --git a/gcc/config/i386/winnt-d.cc b/gcc/config/mingw/winnt-d.cc similarity index 100% rename from gcc/config/i386/winnt-d.cc rename to gcc/config/mingw/winnt-d.cc diff --git a/gcc/config/i386/winnt-stubs.cc b/gcc/config/mingw/winnt-stubs.cc similarity index 100% rename from gcc/config/i386/winnt-stubs.cc rename to gcc/config/mingw/winnt-stubs.cc diff --git a/gcc/config/i386/winnt.cc b/gcc/config/mingw/winnt.cc similarity index 100% rename from gcc/config/i386/winnt.cc rename to gcc/config/mingw/winnt.cc