From patchwork Thu Sep 7 13:36:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 137636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp2964894vqo; Thu, 7 Sep 2023 06:43:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuV3aSgdYvizcR5wIH+kIdtN8NV+Q+ajyqANRoBZ6OLEilGWwHje0ErvFdlPxXM/L2ARDX X-Received: by 2002:a17:906:5385:b0:9a1:b967:aca8 with SMTP id g5-20020a170906538500b009a1b967aca8mr4459420ejo.4.1694094190991; Thu, 07 Sep 2023 06:43:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694094190; cv=none; d=google.com; s=arc-20160816; b=BmiCenOxqQra4PjX619hJg4blz74L33C4NrPUSW26g4rdIsiytrGE45wWIGu8JUWJ+ Y6+vLkFLI9Mq3AIOZYEVvM3Ces9QellCve5wHEfSYAlku+mSU+0dL2nZM1qJmf8NpnXv FLei9TDiPNwdI1kGr0z/cFeN4/a3tLuAhA4HgpEOtqHuigrmTqmzkAw9H/kZ6a8/QgCg 6pwDtOAzgNVYefpSu2mUtIOebVbHxIKx/nxpJglDH1jKAqSokCGc+hB326dVznYalQ6v TFFGRc7SyvO0S8PASalbuE5tibSCcFNqEFoDAoErVMZmxLkqZbxuhxtef4uG7yACIz4J X7uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature:dmarc-filter :delivered-to; bh=5OUb6XOi8LrUq/fON5R8EIZc/EGukvOJpN++0jE/FMY=; fh=wFq7tT6aDoWtju83L9lDAhBMEFwd5hWtfnM+XVolLD0=; b=rZ3vS9t6VLrWEEKhvPX/hbwTIDvj8cICAl4Rfmv18zGTV7lR0OmaDlwjV/rLYl/Pz0 yjvhV8S1A4uJ9jCqxIDXG3fZKHxrQr4/qR4/YVgTCQ5W2uyYARRIxulRwexxSVURJrVx ofSPZC+z3Jw1/gQgn3x+xLuiLUWYC7mYQnQyZwChP/iMXI9WwKlPzV1sCIgPaqAw/Laa xR6tU8fHl+PZN4mTKhPtNxJSEkCBwqc6rpme34Y5kUs9+B4z736o5qWEvB3yIgRmQzFc K/6R8/a781GH1aReXrD0n8JHYujQ1puEmwjZDLSsPmaeIcsaDaI8p1FuFg5LIl6va+L1 OD8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@embecosm.com header.s=google header.b=MjdnFLaP; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id s21-20020a170906961500b0098e31cd141dsi3844442ejx.744.2023.09.07.06.43.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 06:43:10 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=fail header.i=@embecosm.com header.s=google header.b=MjdnFLaP; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CAE4F3940CF9 for ; Thu, 7 Sep 2023 13:39:53 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id E42343857BB2 for ; Thu, 7 Sep 2023 13:38:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E42343857BB2 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-31768ce2e81so941694f8f.1 for ; Thu, 07 Sep 2023 06:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1694093914; x=1694698714; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=5OUb6XOi8LrUq/fON5R8EIZc/EGukvOJpN++0jE/FMY=; b=MjdnFLaPY0DKN2KJSQVjLhzLGX24h4FXLd8jOyRy6/Mb9wFNpEOaYbZTlY+RMSOnl0 fb9poUPoT5iPRKd0Dg+A3alrBxi7dVSeXx3ZPqOQwFQAYtSI51klw1VC2NLQoZJPxh5g HU8DgrVZpdJJ8SU76/TbW+jJsZTu9m0D43Q+uvVZFRZr3drBXUH7BzG9P2hDe/B8fW5m ObRFSIC3TSruluOijBUrEhPHI/DlaZ1viwipyD/fVeE8o5qaL4TVLbse19f0ES1xmyVV DAjwYARspxXr7AjkVyGie3rswbE5y3HJ5ushRjvd3Oyv2X11hsPmWQeUhxlDgDke5qgo EwJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694093914; x=1694698714; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=5OUb6XOi8LrUq/fON5R8EIZc/EGukvOJpN++0jE/FMY=; b=kaPc2vQcYZWxkwIXAkBhbtAMG2Px5lfl+v2XBdcODBmqEE9uSGztaoRVtZFs88h+cJ ZJzPpmR8fdhGHo4M+8VjYrc7RoaDuE+TS855vmkm3oj6QqOV+8N/1ydSYeBdQD5aZLfr nX89OPxfwQSa6TWWMcop1OCbHUGhE9izDH0VtKjLQ17PSkpzuWQyBsVPWSp56xUztpLe /mEmp1JTNvNQ5pBPquX5mFV/HBEETMfRR3sD8KBZgiOpRD5eLe7ngq2XxpMjooYuLq0g RW9+y+Ret6IQBeeJFrmQm9WYl8LfTpM/Kkl3sOFy3v9RrPttYB9cVo06Qdo6vfJIP3rs q5Xg== X-Gm-Message-State: AOJu0YxgeeDnVd97HEQOP6MWvwaHnA9FFH4kZq2CB+yLYbiLhS8psYUd w65/lvAuqNjNhU+cV/6UvLDQDzIWaOwNo3VRWg== X-Received: by 2002:a5d:670d:0:b0:31c:887f:82f3 with SMTP id o13-20020a5d670d000000b0031c887f82f3mr4310589wru.40.1694093914467; Thu, 07 Sep 2023 06:38:34 -0700 (PDT) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id bt12-20020a056000080c00b0031433443265sm17693052wrb.53.2023.09.07.06.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 06:38:34 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Subject: [PATCH 13/14] rust: Implement TARGET_RUST_OS_INFO for i[34567]86-*-mingw* and x86_64-*-mingw*. Date: Thu, 7 Sep 2023 15:36:39 +0200 Message-ID: <20230907133729.2518969-14-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230907133729.2518969-2-arthur.cohen@embecosm.com> References: <20230907133729.2518969-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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: , Reply-To: arthur.cohen@embecosm.com Cc: gcc-rust@gcc.gnu.org Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776386510358533350 X-GMAIL-MSGID: 1776386510358533350 From: Iain Buclaw gcc/ChangeLog: * config.gcc (i[34567]86-*-mingw* | x86_64-*-mingw*): Set rust_target_objs and target_has_targetrustm. * config/t-winnt (winnt-rust.o): New rule. * config/winnt-rust.cc: New file. --- gcc/config.gcc | 2 ++ gcc/config/t-winnt | 4 ++++ gcc/config/winnt-rust.cc | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 gcc/config/winnt-rust.cc diff --git a/gcc/config.gcc b/gcc/config.gcc index a512eb37275..a7a36fccd8d 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2170,6 +2170,8 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) d_target_objs="${d_target_objs} winnt-d.o" target_has_targetcm="yes" target_has_targetdm="yes" + rust_target_objs="${rust_target_objs} winnt-rust.o" + target_has_targetrustm="yes" case ${target} in x86_64-*-* | *-w64-*) need_64bit_isa=yes diff --git a/gcc/config/t-winnt b/gcc/config/t-winnt index 73ce48af12b..b70c7f799e4 100644 --- a/gcc/config/t-winnt +++ b/gcc/config/t-winnt @@ -20,3 +20,7 @@ winnt-c.o: config/winnt-c.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(C_TARGET_H) $(C_TARGET_DEF_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ $< $(OUTPUT_OPTION) + +winnt-rust.o: $(srcdir)/config/winnt-rust.cc + $(COMPILE) $< + $(POSTCOMPILE) diff --git a/gcc/config/winnt-rust.cc b/gcc/config/winnt-rust.cc new file mode 100644 index 00000000000..190584d3961 --- /dev/null +++ b/gcc/config/winnt-rust.cc @@ -0,0 +1,40 @@ +/* Windows support needed only by Rust front-end. + Copyright (C) 2022 Free Software Foundation, Inc. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +. */ + +#include "config.h" +#include "system.h" +#include "coretypes.h" +#include "tm.h" +#include "tm_rust.h" +#include "rust/rust-target.h" +#include "rust/rust-target-def.h" + +/* Implement TARGET_RUST_OS_INFO for Windows targets. */ + +static void +winnt_rust_target_os_info (void) +{ + rust_add_target_info ("target_family", "windows"); + rust_add_target_info ("target_os", "windows"); + rust_add_target_info ("target_vendor", "pc"); + rust_add_target_info ("target_env", "gnu"); +} + +#undef TARGET_RUST_OS_INFO +#define TARGET_RUST_OS_INFO winnt_rust_target_os_info + +struct gcc_targetrustm targetrustm = TARGETRUSTM_INITIALIZER;