From patchwork Thu Apr 11 13:51: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: 1922555 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=Sr5ItGcc; dkim-atps=neutral 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 4VFh2j4tBkz1yYL for ; Thu, 11 Apr 2024 23:52:13 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C5A10385840E for ; Thu, 11 Apr 2024 13:52:11 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2128.outbound.protection.outlook.com [40.107.14.128]) by sourceware.org (Postfix) with ESMTPS id CFAC03858D20 for ; Thu, 11 Apr 2024 13:51:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CFAC03858D20 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 CFAC03858D20 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.14.128 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712843510; cv=pass; b=YhiFN0XAFN1QwNdMWKsnYeG9Y4Q+WuN6muSCWSgwmy5w4c9QuY1wuYIr9dhQTGGQk33fpKmaH6loe94w+k45Gs2yoVGY39bD/JCpvvOMG+1yiY4qLmcGymqhrksGKvF9kU9uirNP+OC5rAvcSkhdIJuzp7Upg+GEu7OkIFXmLd4= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712843510; c=relaxed/simple; bh=DWAQ0Bcpkg2DSJ1hC2t6TFwDEBXB5ZzdClvsapsrjfM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=BE9fiHI1pzmQuiJydTEeS93yPaf9wFPewd73fkLru5s/hzZFdffpmQSpYtchH7hytfJ6quPPVKv1XtWJFJpnXkcyQgANpOlx4P/ljh2/uvMCAXO/ucbT6spHaXS60pK+fzt1/OM957ds4m71fw0fN3BHe8b2dgCTc9kiRJ5fOEE= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kK93K0GO75cxNkAaYhdXUl9aLC0TTLdgZ3msO8DpdQb9P5jkakux0rx9BZkQyu43kWc+cLLaL6eBZ5bAMLBiMdH6JJPjeN0u54x+ptuIe0NNgeAUdvNhLMO23sLzKIyzzFPNaQrQdQdtL8Jm/GvA0jfSP3v2gETCoYgZ1IeDsA/MGNBTGwlT3fQFLOM/ECGFmXwXTLQFmEOjIU+/24Rn8LKGkXQv40SDfH6uLeJarzczUNKGkxn2LQ8VR5gjFaVzGXf+inJ4luY5WdIgmbhS10n2noAqaZQ9fMZ8zV/3nU05fmUtEGWffbKisFtLftJMwHvUXMT3q6aWJ0gQeFcnSw== 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=tBruoQGdmlXURaQelo16QrWJ9xdnpP4CrHDwWgE5UkI=; b=W7wphrtl9aypQF57JT/HA4zzxxX2QUiT2UQCo7IWcqgmzLVP7aPO+jrfVDH3zByF0xiWqoZ48Pe7cvOx5JaN0W+XgEUoy6bhpbXcDSDYuXphRPgO9Jim/xlq/h5D7NSyUX7NL2cWKDivbydZSv3bSKE8nO+P1xVToxPyPNM7jbICZzN/hMLMrjYpagDj9tZDf6mq6xhjCrbA8Jek8XUeScorAAMw243RmaEHEjThBpvV2aTr9zMbm6gqZk6BHZeMhKXT7tLJ55LL2KoTbCq4W7SSxaZroeG1jGUXytvbUyBeQz4Cq8NTlvoGt/SORD6E/fPBUAKo+zp7CyZp+7X1Dg== 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=tBruoQGdmlXURaQelo16QrWJ9xdnpP4CrHDwWgE5UkI=; b=Sr5ItGcc96eDH3WnViHHc8FnZx4Vr0HY7l6wuLN1+3rMP8M26hcM+ysWBbY+TT5duReu0gjlXhb/Io+hW3jVstbp4JpxxsslmKruLGAO7Bsvuc20Sr+C0qp5hgk/O7KxwiPmRcNE0k3eH9LTMeRfTruTaQc00Xbh6dM+wFfnGRM= Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com (2603:10a6:800:17f::6) by PA4PR83MB0525.EURPRD83.prod.outlook.com (2603:10a6:102:26a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.12; Thu, 11 Apr 2024 13:51:43 +0000 Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com ([fe80::7147:b7f9:31fb:39f7]) by VI1PR83MB0431.EURPRD83.prod.outlook.com ([fe80::7147:b7f9:31fb:39f7%6]) with mapi id 15.20.7495.011; Thu, 11 Apr 2024 13:51:43 +0000 From: Evgeny Karpov To: Evgeny Karpov , "gcc-patches@gcc.gnu.org" CC: "richard.sandiford@arm.com" , "Richard Earnshaw (lists)" , Maxim Kuvyrkov , Radek Barton Subject: [PATCH v3 04/12] Reuse MinGW from i386 for AArch64 Thread-Topic: [PATCH v3 04/12] Reuse MinGW from i386 for AArch64 Thread-Index: AQHajBdiOzeBSdpG6kuk+I9gl7SYyw== Date: Thu, 11 Apr 2024 13:51:43 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=ee10a91a-ecb0-4ef6-a7aa-22b9c54f3645; 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-04-11T13:35:01Z; 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_|PA4PR83MB0525:EE_ x-ms-office365-filtering-correlation-id: 200ea45b-bb3a-40d8-9d51-08dc5a2e8554 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LJ5m2+VtgRj1v1FdgkJ0Cy/Q43IyY0RfbC2reykLccVN85F0GFNSqStUSFCR7IWSVMnB+kcLeJzULf6nWmJLDNBONHfyGvu2YaId1YZ2oVX0tJey+1pbQour53UE3AvJrSvQkA3TPhfBPQ0kwW8nEeQrRbdQqVqm93IAG1XH0cotkYT9Wf8wb6JcUwTxqccgSisl9dj/DzDlWP5+sqVlYwoYr/ZKFi5cH4eNqk6kO5nEiBrQ6gf8YrHGNmqvsSgUv1BvxYwvgy4DaWWStABy039aa/RHF9BtlN9FYVM+tHjEzK+GLYqcQZhFbjTfh3Me64LdWXbqS8fsirybYYBOLkLpGKlNyhyD1vu3aGL62GVhEJYumffj9qR+SwB2N84GE9Q9WhzxjIsN1fchw5sAwyB/u2O9lMXhMqWj1+DiuLc3ZRWtPJmKNJCu0s3gP0SVRbabxiUbDeScBcTojemXFDo71xsiy55jVmpnymD/HwkYgM8XSjy+CyJ/7ydxpIFjYwvo4EGG3Nwc+lbI2J55aEqQFqA8kt3t330o6WUkdQNRoCt7XJZYqg3k2VNJIX+a/BqwYIZriwi/srdvw++iiZ6Yxjysj87oV94/irQ/td/MmML4MwQ8PvjchPzH9LhLZApdj2Bj+QalVyfxlJ36hAQ8D0gUPQLY3kiQBfwLIK7BPsg4slyUPAhAvVYs2LKpKKjuz6gv3NJ+aPgVFqnYAD81h5GaBhW51D1bGfVJrp8= 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)(1800799015)(376005)(366007)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 43//Ha3ptroD4tJ0F89ZlZrmoud5fr3yb+GSARmSAcAJzh2WK08SmRJiDNsMahcbwwc0EHWA6IMEK2KNd9QMg/JMZ7kP/6EzvaWo+3eIhTcGTCzcc05eRMXs/Q+zE36FJjp6OC3tyAxgZCfj59xZaiZc/D9cHZNzmoe5VImQEAvsTfAPUbnF3JZmT8ID3TbnaSoNs4MJPiIWJPz1+M1xG+VwwWVXA+NMrHcaQI5Lj7GSCxni+YYZO1PVvM37lzTAEubAdc9Xj7CT1de9KhMsk57jKm3mwb0qUkGDimi7tRsGyJ4y1RnPxU2ZoDTNGBDUf+WutcFY8oln/yfldzhDPlbNvuboTbjIu7GOPRyBLprm5Dkm+lw6Lbqt3U0UM5nKyr1lS5Rj6K6WtYsy5g7N5LeGxJ86hmQa+SbwuIVKsfFOD3AV1q79MlJkImSGJg6pAQdxNHCzuSc7aq9svSsDDPfBQ8PXCkSndEseSD6BUE6eZjoSg2c3KQ94FhurC1dCpxeHzSQVsYbL8nTKrY1wZi6l7ENYVw4GgqpEvdu1hoMrSQYsEepCUhxeAUa7oz3e5mdisctmV71Hqk1+s0QJ5Mh6jv8U/0SE3KVjlu66yl2yvv+Q6Amfy5b/B4K5nfk0INtLctbBDtCRhuPJFaVVr96CZJYkeApc5FS7uFpRiWD3qKPe0/XKv575W4sM9VLRFNQiJ4kW2/G3u8S09Sa4rek3U5425ZbSz/Yoj6zqcTMk42IkD/obuU9eBwZg/hS4qZM4ksG5IZyCHubIOYMyF0nMit+zb5YnKnHKmUgau8mAcXzX/ZG7BWxCTCaAXj6KsWcxEWO4JiEX3u2QRW2VSozOLtRCbUCbOAvdAKwZXlGKpySzsKEjSs5dXIxMlZ6SFOzWc3Uo8K/s0+Rcr5U0YYRaVlrhc6c+/qxPOCIcgCzzknI+qPUJdRkNLQMR19x9f6M2XNmKwuVI8RF0Kh8q4vPWDAFb4UuJKMzTYDMzSNWntTVMn4AAf9IKSPJjHBTfdJQRcZ3wN8IzIClA/dr+MWcTXt8PncKg82kIzLGEPHdphvNx9qM4469rGPt8tbrxUkTNFdLa0jaZD/m1hKGVj8oAbWD7XjZTQSIV+rj72W6wg4UZcyUXQMVqCkUyKzr0+S6XNgcHk0BgKqVRRDWVceMIiZ7TZtBZg4vhD1Cn3C7DB87H4LOVGyyoTjawES3kTsAfBHFtbLnKEfC6SzkwDqtNbFCQY5Z2OwN0n80DSOKVKRZDwOpUWF0JIME4ZRSwGX7l5tkFn37LZEP/vJIwSOqAOUF8pqR+fP4WOR96swSWKv99Ss7BNsCaZrKALUbZJMSkZ273cLtVe+RW0ipxn5vqDkiOij+3pDhWnQXCQe7c6We6+MhEE4fkrMP0Or4O9TZV5YcK9d8jLvTjp7b4XAnNtPSt9rfSnbVVFFnO3G6LhzaNfTj8RDwqka+s9wTz55qZhEcZqpEcn9fADp0jtK1IskuPAwbGWRBXt/I/M5vwyvTwyQ8KJFjCVuQEd/YdD0SQ8cRygrGpQbMcaZaBuVPn4qmfdv8jw3Acn6NUq3UTIIso66bGWfCG40TXc0lb 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: 200ea45b-bb3a-40d8-9d51-08dc5a2e8554 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2024 13:51:43.1596 (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: bbc9BKBlGaQe7J6sz9xp47f6O5nIg77GigUQZjK3q17mIfLoKHTIUtzErtbXE0lhk5/Xrt8Qp3SVoa2TfdkaSw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR83MB0525 X-Spam-Status: No, score=-10.9 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_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 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: Zac Walker Date: Fri, 1 Mar 2024 02:41:50 +0100 Subject: [PATCH v3 04/12] 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. gcc/ChangeLog: * config.gcc: Adjust targets after moving MinGW related files from i386 to mingw folder. * config/i386/cygming.opt: Move to... * config/mingw/cygming.opt: ...here. * config/i386/cygming.opt.urls: Move to... * config/mingw/cygming.opt.urls: ...here. * config/i386/cygwin-d.cc: Move to... * config/mingw/cygwin-d.cc: ...here. * config/i386/mingw-stdint.h: Move to... * config/mingw/mingw-stdint.h: ...here. * config/i386/mingw.opt: Move to... * config/mingw/mingw.opt: ...here. * config/i386/mingw.opt.urls: Move to... * config/mingw/mingw.opt.urls: ...here. * config/i386/mingw32.h: Move to... * config/mingw/mingw32.h: ...here. * config/i386/msformat-c.cc: Move to... * config/mingw/msformat-c.cc: ...here. * config/i386/t-cygming: Move to... * config/mingw/t-cygming: ...here and updated. * config/i386/winnt-cxx.cc: Move to... * config/mingw/winnt-cxx.cc: ...here. * config/i386/winnt-d.cc: Move to... * config/mingw/winnt-d.cc: ...here. * config/i386/winnt-stubs.cc: Move to... * config/mingw/winnt-stubs.cc: ...here. * config/i386/winnt.cc: Move to... * config/mingw/winnt.cc: ...here. --- gcc/config.gcc | 22 ++++++++++---------- 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, 24 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 dffc041cc18..1712441429c 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2168,9 +2168,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" @@ -2186,9 +2186,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" @@ -2224,7 +2224,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-*) @@ -2253,8 +2253,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" @@ -2264,8 +2264,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