From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by sourceware.org (Postfix) with ESMTPS id A4E553857016 for ; Thu, 7 Sep 2023 13:38:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A4E553857016 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-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-401bbfc05fcso11035005e9.3 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=S7WuoMWj54kywW2isbdbjoC2Xu5806iD+f8YY0YT4W1R0mzh/ulHlpPkiI60dW/5Xn FZ+Q/rtpz+iYegW4xV5XdPnveFc9IQMBlvO3EcXf/4E/HLpzAAvBeJZ7+FC7JecRsTXc Vdyu6+Fu0lAjjbnaj82QlAy6fzO71fx5TOwUnoPI3vKpW3Nu0nrl1w+DRA0AtvaCtUmu otlnKKwzKVYX3o18Zzra+TGptlx5r0SenAzMgzQjueXqtg6i55K6TOkshkdSt6gnxGkD HeGazkjxqDOgXwVezQElRlAoAHzy5SQWhQWO4Yq4JzFqQ+TvYlAVnLesr/Zbj/2YdsxE wQvg== X-Gm-Message-State: AOJu0YwiBQ5yPr/W9jIlEoFhud33Ad7+azCeoCQR0DVh7HIr/zUenw02 ++LpuWNJM0NI7x9IUaUZmGJPY7XB5cEmdLFpAw== X-Google-Smtp-Source: AGHT+IGuuARXIN/wBPdXOXdRrx+AIqxb0D0o6NSwW1+F6urzPvavsxX/q+hvWgJaK+e9tbyfDlcn1A== 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 Cc: gcc-rust@gcc.gnu.org, ibuclaw@gdcproject.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> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: 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; -- 2.42.0