From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 42AD33858C00; Mon, 10 Oct 2022 07:33:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 42AD33858C00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665387213; bh=+PUM/Y74QrcnAnEcGYSroaDG0yltr5FaONng9x0U46k=; h=From:To:Subject:Date:From; b=na578W9U6CRyu62ss+B4Jn0uPaFsGE55Im9w9Dse2wtcx6X2WUCJifVuv/ouNrzq1 fCK1xO2MD5tFAoiqkos2zpIYRliXxhA0vJZ5v3c64zMisEvfTYBgQcYZ1kv/14jviq iIH65EEwP80QSU+/nZgZeHay2PCgwuymrYxYO5m8= 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 *-*-darwin* X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: f334e18a1f123357071684ee1b43477627c600d9 X-Git-Newrev: bb5efc657ae66a96cf83604efa069ca76b5dd8e4 Message-Id: <20221010073333.42AD33858C00@sourceware.org> Date: Mon, 10 Oct 2022 07:33:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:bb5efc657ae66a96cf83604efa069ca76b5dd8e4 commit bb5efc657ae66a96cf83604efa069ca76b5dd8e4 Author: Iain Buclaw Date: Thu Sep 29 10:30:42 2022 +0200 rust: Implement TARGET_RUST_OS_INFO for *-*-darwin* gcc/ChangeLog: * config.gcc (*-*-darwin*): Set rust_target_objs and target_has_targetrustm. * config/t-darwin (darwin-rust.o): New rule. * config/darwin-rust.cc: New file. Diff: --- gcc/config.gcc | 2 ++ gcc/config/darwin-rust.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++ gcc/config/t-darwin | 4 ++++ 3 files changed, 50 insertions(+) diff --git a/gcc/config.gcc b/gcc/config.gcc index da0c71d63ab..4cd81c85caf 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -756,8 +756,10 @@ case ${target} in cxx_target_objs="${cxx_target_objs} darwin-c.o" d_target_objs="${d_target_objs} darwin-d.o" fortran_target_objs="darwin-f.o" + rust_target_objs="${rust_target_objs} darwin-rust.o" target_has_targetcm=yes target_has_targetdm=yes + target_has_targetrustm=yes extra_objs="${extra_objs} darwin.o" extra_gcc_objs="darwin-driver.o" default_use_cxa_atexit=yes diff --git a/gcc/config/darwin-rust.cc b/gcc/config/darwin-rust.cc new file mode 100644 index 00000000000..4b014b88c52 --- /dev/null +++ b/gcc/config/darwin-rust.cc @@ -0,0 +1,44 @@ +/* Darwin 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 Darwin targets. */ + +static void +darwin_rust_target_os_info (void) +{ + rust_add_target_info ("target_family", "unix"); + + /* TODO: rust actually has "macos", "ios", and "tvos" for darwin targets, but + gcc seems to have no current support for them, so assuming that target_os + is always macos for now. */ + rust_add_target_info ("target_os", "macos"); + rust_add_target_info ("target_vendor", "apple"); + rust_add_target_info ("target_env", ""); +} + +#undef TARGET_RUST_OS_INFO +#define TARGET_RUST_OS_INFO darwin_rust_target_os_info + +struct gcc_targetrustm targetrustm = TARGETRUSTM_INITIALIZER; diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin index 879539e9b87..6862e5a7fa5 100644 --- a/gcc/config/t-darwin +++ b/gcc/config/t-darwin @@ -34,6 +34,10 @@ darwin-f.o: $(srcdir)/config/darwin-f.cc $(COMPILE) $< $(POSTCOMPILE) +darwin-rust.o: $(srcdir)/config/darwin-rust.cc + $(COMPILE) $< + $(POSTCOMPILE) + darwin-driver.o: $(srcdir)/config/darwin-driver.cc $(COMPILE) $< $(POSTCOMPILE)