Remove the x86_64-rumprun-netbsd target

Closes #81514
This commit is contained in:
Simonas Kazlauskas 2021-02-27 17:55:22 +02:00
parent 8e863eb59a
commit a757fae245
10 changed files with 4 additions and 68 deletions

View File

@ -702,7 +702,6 @@ fn to_json(&self) -> Json {
("powerpc-unknown-netbsd", powerpc_unknown_netbsd), ("powerpc-unknown-netbsd", powerpc_unknown_netbsd),
("sparc64-unknown-netbsd", sparc64_unknown_netbsd), ("sparc64-unknown-netbsd", sparc64_unknown_netbsd),
("x86_64-unknown-netbsd", x86_64_unknown_netbsd), ("x86_64-unknown-netbsd", x86_64_unknown_netbsd),
("x86_64-rumprun-netbsd", x86_64_rumprun_netbsd),
("i686-unknown-haiku", i686_unknown_haiku), ("i686-unknown-haiku", i686_unknown_haiku),
("x86_64-unknown-haiku", x86_64_unknown_haiku), ("x86_64-unknown-haiku", x86_64_unknown_haiku),

View File

@ -1,25 +0,0 @@
use crate::spec::{LinkerFlavor, StackProbeType, Target, TargetOptions};
pub fn target() -> Target {
let mut base = super::netbsd_base::opts();
base.vendor = "rumprun".to_string();
base.cpu = "x86-64".to_string();
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
base.linker = Some("x86_64-rumprun-netbsd-gcc".to_string());
base.max_atomic_width = Some(64);
base.dynamic_linking = false;
base.has_rpath = false;
base.position_independent_executables = false;
base.disable_redzone = true;
base.stack_probes = StackProbeType::InlineOrCall { min_llvm_version_for_inline: (11, 0, 1) };
Target {
llvm_target: "x86_64-rumprun-netbsd".to_string(),
pointer_width: 64,
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
.to_string(),
arch: "x86_64".to_string(),
options: TargetOptions { mcount: "__mcount".to_string(), ..base },
}
}

View File

@ -34,7 +34,7 @@ fn drop(&mut self) {
target_os = "freebsd", target_os = "freebsd",
target_os = "solaris", target_os = "solaris",
target_os = "illumos", target_os = "illumos",
all(target_os = "netbsd", not(target_vendor = "rumprun")), target_os = "netbsd",
target_os = "openbsd" target_os = "openbsd"
))] ))]
mod imp { mod imp {
@ -218,7 +218,7 @@ pub unsafe fn drop_handler(handler: &mut Handler) {
target_os = "freebsd", target_os = "freebsd",
target_os = "solaris", target_os = "solaris",
target_os = "illumos", target_os = "illumos",
all(target_os = "netbsd", not(target_vendor = "rumprun")), target_os = "netbsd",
target_os = "openbsd", target_os = "openbsd",
)))] )))]
mod imp { mod imp {

View File

@ -202,7 +202,7 @@ fn drop(&mut self) {
not(target_os = "linux"), not(target_os = "linux"),
not(target_os = "freebsd"), not(target_os = "freebsd"),
not(target_os = "macos"), not(target_os = "macos"),
not(all(target_os = "netbsd", not(target_vendor = "rumprun"))), not(target_os = "netbsd"),
not(target_os = "openbsd"), not(target_os = "openbsd"),
not(target_os = "solaris") not(target_os = "solaris")
))] ))]
@ -222,7 +222,7 @@ pub unsafe fn init() -> Option<Guard> {
target_os = "linux", target_os = "linux",
target_os = "freebsd", target_os = "freebsd",
target_os = "macos", target_os = "macos",
all(target_os = "netbsd", not(target_vendor = "rumprun")), target_os = "netbsd",
target_os = "openbsd", target_os = "openbsd",
target_os = "solaris" target_os = "solaris"
))] ))]

View File

@ -22,8 +22,6 @@ fn main() {
} }
} else if target.contains("freebsd") { } else if target.contains("freebsd") {
println!("cargo:rustc-link-lib=gcc_s"); println!("cargo:rustc-link-lib=gcc_s");
} else if target.contains("rumprun") {
println!("cargo:rustc-link-lib=unwind");
} else if target.contains("netbsd") { } else if target.contains("netbsd") {
println!("cargo:rustc-link-lib=gcc_s"); println!("cargo:rustc-link-lib=gcc_s");
} else if target.contains("openbsd") { } else if target.contains("openbsd") {

View File

@ -44,9 +44,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
WORKDIR /build WORKDIR /build
COPY host-x86_64/dist-various-1/build-rumprun.sh /build
RUN ./build-rumprun.sh
COPY host-x86_64/dist-various-1/install-x86_64-redox.sh /build COPY host-x86_64/dist-various-1/install-x86_64-redox.sh /build
RUN ./install-x86_64-redox.sh RUN ./install-x86_64-redox.sh
@ -112,7 +109,6 @@ ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabihf
ENV TARGETS=asmjs-unknown-emscripten ENV TARGETS=asmjs-unknown-emscripten
ENV TARGETS=$TARGETS,wasm32-unknown-emscripten ENV TARGETS=$TARGETS,wasm32-unknown-emscripten
ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd
ENV TARGETS=$TARGETS,mips-unknown-linux-musl ENV TARGETS=$TARGETS,mips-unknown-linux-musl
ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl
ENV TARGETS=$TARGETS,mips64-unknown-linux-muslabi64 ENV TARGETS=$TARGETS,mips64-unknown-linux-muslabi64

View File

@ -1,29 +0,0 @@
#!/usr/bin/env bash
set -ex
hide_output() {
set +x
on_err="
echo ERROR: An error was encountered with the build.
cat /tmp/build.log
exit 1
"
trap "$on_err" ERR
bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
PING_LOOP_PID=$!
"$@" &> /tmp/build.log
trap - ERR
kill $PING_LOOP_PID
rm /tmp/build.log
set -x
}
git clone https://github.com/rumpkernel/rumprun
cd rumprun
git reset --hard b04d42225a12a6fae57a78a9c1cf23642e46cd00
git submodule update --init
# Disable -Werror, to avoid breaking the build with newer compilers.
CC=cc NOGCCERROR=1 hide_output ./build-rr.sh -d /usr/local hw
cd ..
rm -rf rumprun

View File

@ -133,7 +133,6 @@ target | std | host | notes
`x86_64-fortanix-unknown-sgx` | ✓ | | [Fortanix ABI] for 64-bit Intel SGX `x86_64-fortanix-unknown-sgx` | ✓ | | [Fortanix ABI] for 64-bit Intel SGX
`x86_64-fuchsia` | ✓ | | 64-bit Fuchsia `x86_64-fuchsia` | ✓ | | 64-bit Fuchsia
`x86_64-linux-android` | ✓ | | 64-bit x86 Android `x86_64-linux-android` | ✓ | | 64-bit x86 Android
`x86_64-rumprun-netbsd` | ✓ | | 64-bit NetBSD Rump Kernel
`x86_64-sun-solaris` | ✓ | | 64-bit Solaris 10/11, illumos `x86_64-sun-solaris` | ✓ | | 64-bit Solaris 10/11, illumos
`x86_64-unknown-freebsd` | ✓ | ✓ | 64-bit FreeBSD `x86_64-unknown-freebsd` | ✓ | ✓ | 64-bit FreeBSD
`x86_64-unknown-illumos` | ✓ | ✓ | illumos `x86_64-unknown-illumos` | ✓ | ✓ | illumos

View File

@ -505,7 +505,6 @@ fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
(sym::target_vendor, Some(vendor)) => match &*vendor.as_str() { (sym::target_vendor, Some(vendor)) => match &*vendor.as_str() {
"apple" => "Apple", "apple" => "Apple",
"pc" => "PC", "pc" => "PC",
"rumprun" => "Rumprun",
"sun" => "Sun", "sun" => "Sun",
"fortanix" => "Fortanix", "fortanix" => "Fortanix",
_ => "", _ => "",

View File

@ -139,7 +139,6 @@
"x86_64-linux-android", "x86_64-linux-android",
"x86_64-pc-windows-gnu", "x86_64-pc-windows-gnu",
"x86_64-pc-windows-msvc", "x86_64-pc-windows-msvc",
"x86_64-rumprun-netbsd",
"x86_64-sun-solaris", "x86_64-sun-solaris",
"x86_64-pc-solaris", "x86_64-pc-solaris",
"x86_64-unknown-freebsd", "x86_64-unknown-freebsd",