From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 5AD8B3858283; Wed, 19 Oct 2022 19:45:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AD8B3858283 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666208723; bh=FdazsWeMRKDMtFUzs0G5DqQ7rAik1shkABxdtzuaq1A=; h=From:To:Subject:Date:From; b=MI2tYFeoDZxhIJuYhrpxoUWgysQ8IeSdpb/2rSW7WL/eTB1o95JAir4uqmjsJM5lN gbUryaor2tGX6BELq1ulY5PqhzATt53+Y7Rm2nc5wQzRsAJWq04USeqTrOVYiUx0G+ DFWQWuzCjFm7jUXI2WKluUlH1nMXD6V+tP8Scdck= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] rust: Implement TARGET_RUST_OS_INFO for i[34567]86-*-mingw* and x86_64-*-mingw*. X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: ff87a2fbd01117771ff4ff5cf5a6c6db03e249e2 X-Git-Newrev: 89babdf7914439b3276b44ad6a7960373cc7df28 Message-Id: <20221019194523.5AD8B3858283@sourceware.org> Date: Wed, 19 Oct 2022 19:45:23 +0000 (GMT) List-Id: https://gcc.gnu.org/g:89babdf7914439b3276b44ad6a7960373cc7df28 commit 89babdf7914439b3276b44ad6a7960373cc7df28 Author: Iain Buclaw Date: Thu Oct 13 16:38:21 2022 +0200 rust: Implement TARGET_RUST_OS_INFO for i[34567]86-*-mingw* and x86_64-*-mingw*. 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. Diff: --- gcc/config.gcc | 2 ++ gcc/config/t-winnt | 4 ++++ gcc/config/winnt-rust.cc | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/gcc/config.gcc b/gcc/config.gcc index d297c441c0f..3996ede2287 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2116,6 +2116,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 c44e9bfe822..3c7c953f5c1 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;