Skip to content

Commit 5233edc

Browse files
borsbors
committed
Auto merge of #82216 - kulikjak:fix-solaris-target, r=nagisa,Mark-Simulacrum
make x86_64-pc-solaris the default target for x86-64 Solaris This change makes `x86_64-pc-solaris` the default compilation target for x86-64 Solaris/Illumos (based on [this exchange](#68214 (comment)) with `@varkor).` I tried several ways of doing this (leveraging the alias support added with #61761 and improved/fixed with #80073) and found out that cross-compilation to the new one is by far the simplest way of doing this. It can be achieved by adding the following arguments: `--build x86_64-sun-solaris --host x86_64-pc-solaris --target x86_64-pc-solaris` and enabling the cross compilation with `PKG_CONFIG_ALLOW_CROSS=1` environment variable. I also removed alias support altogether - `x86_64-pc-solaris` and `x86_64-sun-solaris` are now two separate targets. The problem with aliases is that even if rust internally knows that two are the same, other tools building with rust don't know that, resulting in build issues like the one with firefox mentioned [here](#68214 (comment)). I think that once the dust settles and `x86_64-pc-solaris` becomes the default, `x86_64-sun-solaris` can be removed. If you agree with the above, I have two subsequent questions: 1. Is there a preferred way to display deprecation warnings when `x86_64-sun-solaris` is passed into the compiler as an argument? I am not sure whether target deprecation was done before. 2. Where would be the best way to document this change for those using rust on Solaris? Without the cross-compilation arguments (used once to build a new version), the build won't work. Should I add it into [RELEASES.md](https://github.com/rust-lang/rust/blob/master/RELEASES.md)? Thanks!
2 parents 09db057 + 47f291e commit 5233edc

File tree

11 files changed

+56
-39
lines changed

11 files changed

+56
-39
lines changed

‎compiler/rustc_session/src/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,7 @@ fn parse_target_triple(matches: &getopts::Matches, error_format: ErrorOutputType
15361536
early_error(error_format, &format!("target file {:?} does not exist", path))
15371537
})
15381538
}
1539-
Some(target) => TargetTriple::from_alias(target),
1539+
Some(target) => TargetTriple::TargetTriple(target),
15401540
_ => TargetTriple::from_triple(host_triple()),
15411541
}
15421542
}

‎compiler/rustc_target/src/spec/mod.rs

+2-21
Original file line numberDiff line numberDiff line change
@@ -736,9 +736,8 @@ supported_targets! {
736736
("armv7r-none-eabi", armv7r_none_eabi),
737737
("armv7r-none-eabihf", armv7r_none_eabihf),
738738

739-
// `x86_64-pc-solaris` is an alias for `x86_64_sun_solaris` for backwards compatibility reasons.
740-
// (See <https://github.com/rust-lang/rust/issues/40531>.)
741-
("x86_64-sun-solaris", "x86_64-pc-solaris", x86_64_sun_solaris),
739+
("x86_64-pc-solaris", x86_64_pc_solaris),
740+
("x86_64-sun-solaris", x86_64_sun_solaris),
742741
("sparcv9-sun-solaris", sparcv9_sun_solaris),
743742

744743
("x86_64-unknown-illumos", x86_64_unknown_illumos),
@@ -1986,24 +1985,6 @@ impl TargetTriple {
19861985
Ok(TargetTriple::TargetPath(canonicalized_path))
19871986
}
19881987

1989-
/// Creates a target triple from its alias
1990-
pub fn from_alias(triple: String) -> Self {
1991-
macro_rules! target_aliases {
1992-
( $(($alias:literal, $target:literal ),)+ ) => {
1993-
match triple.as_str() {
1994-
$( $alias => TargetTriple::from_triple($target), )+
1995-
_ => TargetTriple::TargetTriple(triple),
1996-
}
1997-
}
1998-
}
1999-
2000-
target_aliases! {
2001-
// `x86_64-pc-solaris` is an alias for `x86_64_sun_solaris` for backwards compatibility reasons.
2002-
// (See <https://github.com/rust-lang/rust/issues/40531>.)
2003-
("x86_64-pc-solaris", "x86_64-sun-solaris"),
2004-
}
2005-
}
2006-
20071988
/// Returns a string triple for this target.
20081989
///
20091990
/// If this target is a path, the file name (without extension) is returned.

‎compiler/rustc_target/src/spec/solaris_base.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use crate::spec::TargetOptions;
33
pub fn opts() -> TargetOptions {
44
TargetOptions {
55
os: "solaris".to_string(),
6-
vendor: "sun".to_string(),
76
dynamic_linking: true,
87
executables: true,
98
has_rpath: true,

‎compiler/rustc_target/src/spec/sparcv9_sun_solaris.rs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pub fn target() -> Target {
77
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]);
88
// llvm calls this "v9"
99
base.cpu = "v9".to_string();
10+
base.vendor = "sun".to_string();
1011
base.max_atomic_width = Some(64);
1112

1213
Target {

‎compiler/rustc_target/src/spec/x86_64_pc_solaris.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
use crate::spec::{LinkerFlavor, StackProbeType, Target};
2+
3+
pub fn target() -> Target {
4+
let mut base = super::solaris_base::opts();
5+
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]);
6+
base.cpu = "x86-64".to_string();
7+
base.vendor = "pc".to_string();
8+
base.max_atomic_width = Some(64);
9+
base.stack_probes = StackProbeType::InlineOrCall { min_llvm_version_for_inline: (11, 0, 1) };
10+
11+
Target {
12+
llvm_target: "x86_64-pc-solaris".to_string(),
13+
pointer_width: 64,
14+
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
15+
.to_string(),
16+
arch: "x86_64".to_string(),
17+
options: base,
18+
}
19+
}

‎compiler/rustc_target/src/spec/x86_64_sun_solaris.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ pub fn target() -> Target {
44
let mut base = super::solaris_base::opts();
55
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]);
66
base.cpu = "x86-64".to_string();
7+
base.vendor = "sun".to_string();
78
base.max_atomic_width = Some(64);
89
base.stack_probes = StackProbeType::InlineOrCall { min_llvm_version_for_inline: (11, 0, 1) };
910

‎src/bootstrap/bootstrap.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,16 @@ def default_build_triple(verbose):
240240
else:
241241
ostype = 'unknown-linux-gnu'
242242
elif ostype == 'SunOS':
243-
ostype = 'sun-solaris'
243+
ostype = 'pc-solaris'
244244
# On Solaris, uname -m will return a machine classification instead
245245
# of a cpu type, so uname -p is recommended instead. However, the
246246
# output from that option is too generic for our purposes (it will
247247
# always emit 'i386' on x86/amd64 systems). As such, isainfo -k
248248
# must be used instead.
249249
cputype = require(['isainfo', '-k']).decode(default_encoding)
250+
# sparc cpus have sun as a target vendor
251+
if 'sparc' in cputype:
252+
ostype = 'sun-solaris'
250253
elif ostype.startswith('MINGW'):
251254
# msys' `uname` does not print gcc configuration, but prints msys
252255
# configuration. so we cannot believe `uname -m`:

‎src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ ENV \
3939
AR_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-ar \
4040
CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-gcc \
4141
CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-g++ \
42-
AR_x86_64_sun_solaris=x86_64-sun-solaris2.10-ar \
43-
CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \
44-
CXX_x86_64_sun_solaris=x86_64-sun-solaris2.10-g++ \
42+
AR_x86_64_pc_solaris=x86_64-pc-solaris2.10-ar \
43+
CC_x86_64_pc_solaris=x86_64-pc-solaris2.10-gcc \
44+
CXX_x86_64_pc_solaris=x86_64-pc-solaris2.10-g++ \
4545
CC_armv7_unknown_linux_gnueabi=arm-linux-gnueabi-gcc-8 \
4646
CXX_armv7_unknown_linux_gnueabi=arm-linux-gnueabi-g++-8 \
4747
AR_x86_64_fortanix_unknown_sgx=ar \
@@ -100,7 +100,7 @@ ENV TARGETS=$TARGETS,aarch64-fuchsia
100100
ENV TARGETS=$TARGETS,wasm32-unknown-unknown
101101
ENV TARGETS=$TARGETS,wasm32-wasi
102102
ENV TARGETS=$TARGETS,sparcv9-sun-solaris
103-
ENV TARGETS=$TARGETS,x86_64-sun-solaris
103+
ENV TARGETS=$TARGETS,x86_64-pc-solaris
104104
ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnux32
105105
ENV TARGETS=$TARGETS,x86_64-fortanix-unknown-sgx
106106
ENV TARGETS=$TARGETS,nvptx64-nvidia-cuda

‎src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh

+21-8
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,27 @@ APT_ARCH=$3
99
BINUTILS=2.28.1
1010
GCC=6.5.0
1111

12+
# Choose correct target based on the $ARCH
13+
case "$ARCH" in
14+
x86_64)
15+
TARGET=x86_64-pc-solaris2.10
16+
;;
17+
sparcv9)
18+
TARGET=sparcv9-sun-solaris2.10
19+
;;
20+
*)
21+
printf 'ERROR: unknown architecture: %s\n' "$ARCH"
22+
exit 1
23+
esac
24+
1225
# First up, build binutils
1326
mkdir binutils
1427
cd binutils
1528

1629
curl https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS.tar.xz | tar xJf -
1730
mkdir binutils-build
1831
cd binutils-build
19-
hide_output ../binutils-$BINUTILS/configure --target=$ARCH-sun-solaris2.10
32+
hide_output ../binutils-$BINUTILS/configure --target=$TARGET
2033
hide_output make -j10
2134
hide_output make install
2235

@@ -62,13 +75,13 @@ patch -p0 << 'EOF'
6275
-extern size_t strnlen(const char *, size_t);
6376
EOF
6477

65-
mkdir /usr/local/$ARCH-sun-solaris2.10/usr
66-
mv usr/include /usr/local/$ARCH-sun-solaris2.10/usr/include
67-
mv usr/lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib
68-
mv lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib
78+
mkdir /usr/local/$TARGET/usr
79+
mv usr/include /usr/local/$TARGET/usr/include
80+
mv usr/lib/$LIB_ARCH/* /usr/local/$TARGET/lib
81+
mv lib/$LIB_ARCH/* /usr/local/$TARGET/lib
6982

70-
ln -s usr/include /usr/local/$ARCH-sun-solaris2.10/sys-include
71-
ln -s usr/include /usr/local/$ARCH-sun-solaris2.10/include
83+
ln -s usr/include /usr/local/$TARGET/sys-include
84+
ln -s usr/include /usr/local/$TARGET/include
7285

7386
cd ..
7487
rm -rf solaris
@@ -84,7 +97,7 @@ mkdir ../gcc-build
8497
cd ../gcc-build
8598
hide_output ../gcc-$GCC/configure \
8699
--enable-languages=c,c++ \
87-
--target=$ARCH-sun-solaris2.10 \
100+
--target=$TARGET \
88101
--with-gnu-as \
89102
--with-gnu-ld \
90103
--disable-multilib \

‎src/ci/docker/scripts/illumos-toolchain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ x86_64)
1818
exit 1
1919
esac
2020

21-
BUILD_TARGET="$ARCH-sun-solaris2.10"
21+
BUILD_TARGET="$ARCH-pc-solaris2.10"
2222

2323
#
2424
# The illumos and the Solaris build both use the same GCC-level host triple,

‎src/doc/rustc/src/platform-support.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ target | std | host | notes
133133
`x86_64-fortanix-unknown-sgx` | ✓ | | [Fortanix ABI] for 64-bit Intel SGX
134134
`x86_64-fuchsia` | ✓ | | 64-bit Fuchsia
135135
`x86_64-linux-android` | ✓ | | 64-bit x86 Android
136-
`x86_64-sun-solaris` | ✓ | | 64-bit Solaris 10/11, illumos
136+
`x86_64-pc-solaris` | ✓ | | 64-bit Solaris 10/11, illumos
137137
`x86_64-unknown-freebsd` | ✓ | ✓ | 64-bit FreeBSD
138138
`x86_64-unknown-illumos` | ✓ | ✓ | illumos
139139
`x86_64-unknown-linux-gnux32` | ✓ | | 64-bit Linux (x32 ABI) (kernel 4.15, glibc 2.27)
@@ -218,7 +218,7 @@ target | std | host | notes
218218
`x86_64-apple-ios-macabi` | ✓ | | Apple Catalyst on x86_64
219219
`x86_64-apple-tvos` | * | | x86 64-bit tvOS
220220
`x86_64-linux-kernel` | * | | Linux kernel modules
221-
`x86_64-pc-solaris` | ? | |
221+
`x86_64-sun-solaris` | ? | | Deprecated target for 64-bit Solaris 10/11, illumos
222222
`x86_64-pc-windows-msvc` | ✓ | | 64-bit Windows XP support
223223
`x86_64-unknown-dragonfly` | ✓ | ✓ | 64-bit DragonFlyBSD
224224
`x86_64-unknown-haiku` | ✓ | ✓ | 64-bit Haiku

0 commit comments

Comments
 (0)