From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id B642A385828E; Wed, 19 Oct 2022 19:45:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B642A385828E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666208712; bh=HiWtDQ1GS+5T0JDGSw9j66d6a5FGHTNm8MVuaSbNOz0=; h=From:To:Subject:Date:From; b=ve7Wms8oH9lbgOdaNcrfcIeuKcOaPNM+GXK5/HyrWApmIcwY34ZudLTj/k/z2MrlZ ByqcKcj228//UneHxSpnM6l441k7SIUsno9KUBAr0Uqo3743WckgRSl7AQWJ1lEcfQ RmVXQSAWW2w+K8k1Ie887AIXqBhF0Hk33qDt1zOc= 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 *-*-vxworks* X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 1fc003cb99dd5064b03328420774f6cd25ca3d56 X-Git-Newrev: cbea188073c836ae64450942eb08c8534f6158ba Message-Id: <20221019194512.B642A385828E@sourceware.org> Date: Wed, 19 Oct 2022 19:45:12 +0000 (GMT) List-Id: https://gcc.gnu.org/g:cbea188073c836ae64450942eb08c8534f6158ba commit cbea188073c836ae64450942eb08c8534f6158ba Author: Iain Buclaw Date: Thu Oct 13 14:40:34 2022 +0200 rust: Implement TARGET_RUST_OS_INFO for *-*-vxworks* gcc/ChangeLog: * config.gcc (*-*-vxworks*): Set rust_target_objs and target_has_targetrustm. * config/t-vxworks (vxworks-rust.o): New rule. * config/vxworks-rust.cc: New file. Diff: --- gcc/config.gcc | 3 +++ gcc/config/t-vxworks | 4 ++++ gcc/config/vxworks-rust.cc | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/gcc/config.gcc b/gcc/config.gcc index 2816fe94e02..d33e5df597b 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1053,6 +1053,9 @@ case ${target} in extra_headers="${extra_headers} ../vxworks/vxworks-predef.h" target_has_targetcm="yes" + rust_target_objs="${rust_target_objs} vxworks-rust.o" + target_has_targetrustm=yes + # This private header exposes a consistent interface for checks on # the VxWorks version our runtime header files need to perform, based on # what the system headers adverstise: diff --git a/gcc/config/t-vxworks b/gcc/config/t-vxworks index 40c6cc4185b..7fb2adf2b95 100644 --- a/gcc/config/t-vxworks +++ b/gcc/config/t-vxworks @@ -24,6 +24,10 @@ vxworks-c.o: $(srcdir)/config/vxworks-c.cc $(COMPILE) $< $(POSTCOMPILE) +vxworks-rust.o: $(srcdir)/config/vxworks-rust.cc + $(COMPILE) $< + $(POSTCOMPILE) + # We leverage $sysroot to find target system headers only, distributed # in a VxWorks (a)typical fashion with a different set of headers for # rtp vs kernel mode. We setup SYSROOT_HEADERS_SUFFIX_SPEC to handle diff --git a/gcc/config/vxworks-rust.cc b/gcc/config/vxworks-rust.cc new file mode 100644 index 00000000000..76d618cdcd1 --- /dev/null +++ b/gcc/config/vxworks-rust.cc @@ -0,0 +1,40 @@ +/* VxWorks 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 VxWorks targets. */ + +static void +vxworks_rust_target_os_info (void) +{ + rust_add_target_info ("target_family", "unix"); + rust_add_target_info ("target_os", "vxworks"); + rust_add_target_info ("target_vendor", "wrs"); + rust_add_target_info ("target_env", "gnu"); +} + +#undef TARGET_RUST_OS_INFO +#define TARGET_RUST_OS_INFO vxworks_rust_target_os_info + +struct gcc_targetrustm targetrustm = TARGETRUSTM_INITIALIZER;