Skip to content

Commit 33e6df4

Browse files
borsbors
committed
Auto merge of #57130 - VardhanThigle:Vardhan/x86_64-fortanix-unknown-sgx-tier2_support, r=alexcrichton
Upgrade x86_64-fortanix-unknown-sgx platform support to tier 2 ## Overview 1. This PR upgrades x86_64-fortanix-unknown-sgx platform support to tier 2 (std only) by setting up build automation for this target. 1. For supporting unwinding, this target needs to link to a port of LLVM's libunwind (more details could be found in #56979), which will be distributed along with the Rust binaries (similar to the extra musl objects) ### Building and copying libunwind: We have added a new build script (`build-x86_64-fortanix-unknown-sgx-toolchain.sh`) that will run while the container is built. This will build `libunwind.a` from git source. While the container is built, the persistent volumes where obj/ gets created aren't yet mapped. As a workaround, we copy the built `libunwind.a` to `obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-fortanix-unknown-sgx/lib/` after x.py runs. If any reviewer knows of a better solution, please do tell. r? @Mark-Simulacrum
2 parents aea9f0a + 99fbd1b commit 33e6df4

File tree

7 files changed

+134
-20
lines changed

7 files changed

+134
-20
lines changed

‎src/bootstrap/compile.rs

+33-20
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,8 @@ impl Step for Std {
7878
builder.info(&format!("Uplifting stage1 std ({} -> {})", from.host, target));
7979

8080
// Even if we're not building std this stage, the new sysroot must
81-
// still contain the musl startup objects.
82-
if target.contains("musl") {
83-
let libdir = builder.sysroot_libdir(compiler, target);
84-
copy_musl_third_party_objects(builder, target, &libdir);
85-
}
81+
// still contain the third party objects needed by various targets.
82+
copy_third_party_objects(builder, &compiler, target);
8683

8784
builder.ensure(StdLink {
8885
compiler: from,
@@ -92,10 +89,7 @@ impl Step for Std {
9289
return;
9390
}
9491

95-
if target.contains("musl") {
96-
let libdir = builder.sysroot_libdir(compiler, target);
97-
copy_musl_third_party_objects(builder, target, &libdir);
98-
}
92+
copy_third_party_objects(builder, &compiler, target);
9993

10094
let mut cargo = builder.cargo(compiler, Mode::Std, target, "build");
10195
std_cargo(builder, &compiler, target, &mut cargo);
@@ -116,17 +110,36 @@ impl Step for Std {
116110
}
117111
}
118112

119-
/// Copies the crt(1,i,n).o startup objects
120-
///
121-
/// Since musl supports fully static linking, we can cross link for it even
122-
/// with a glibc-targeting toolchain, given we have the appropriate startup
123-
/// files. As those shipped with glibc won't work, copy the ones provided by
124-
/// musl so we have them on linux-gnu hosts.
125-
fn copy_musl_third_party_objects(builder: &Builder,
126-
target: Interned<String>,
127-
into: &Path) {
128-
for &obj in &["crt1.o", "crti.o", "crtn.o"] {
129-
builder.copy(&builder.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj));
113+
/// Copies third pary objects needed by various targets.
114+
fn copy_third_party_objects(builder: &Builder, compiler: &Compiler, target: Interned<String>) {
115+
let libdir = builder.sysroot_libdir(*compiler, target);
116+
117+
// Copies the crt(1,i,n).o startup objects
118+
//
119+
// Since musl supports fully static linking, we can cross link for it even
120+
// with a glibc-targeting toolchain, given we have the appropriate startup
121+
// files. As those shipped with glibc won't work, copy the ones provided by
122+
// musl so we have them on linux-gnu hosts.
123+
if target.contains("musl") {
124+
for &obj in &["crt1.o", "crti.o", "crtn.o"] {
125+
builder.copy(
126+
&builder.musl_root(target).unwrap().join("lib").join(obj),
127+
&libdir.join(obj),
128+
);
129+
}
130+
}
131+
132+
// Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx.
133+
//
134+
// This target needs to be linked to Fortanix's port of llvm's libunwind.
135+
// libunwind requires support for rwlock and printing to stderr,
136+
// which is provided by std for this target.
137+
if target == "x86_64-fortanix-unknown-sgx" {
138+
let src_path_env = "X86_FORTANIX_SGX_LIBS";
139+
let obj = "libunwind.a";
140+
let src = env::var(src_path_env).expect(&format!("{} not found in env", src_path_env));
141+
let src = Path::new(&src).join(obj);
142+
builder.copy(&src, &libdir.join(obj));
130143
}
131144
}
132145

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

+7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ RUN /tmp/build-fuchsia-toolchain.sh
2929
COPY dist-various-2/build-solaris-toolchain.sh /tmp/
3030
RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386
3131
RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc
32+
COPY dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/
33+
# We pass the commit id of the port of LLVM's libunwind to the build script.
34+
# Any update to the commit id here, should cause the container image to be re-built from this point on.
35+
RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh "bbe23902411be88d7388f381becefadd6e3ef819"
3236

3337
COPY scripts/sccache.sh /scripts/
3438
RUN sh /scripts/sccache.sh
@@ -65,6 +69,9 @@ ENV TARGETS=$TARGETS,wasm32-unknown-unknown
6569
ENV TARGETS=$TARGETS,x86_64-sun-solaris
6670
ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnux32
6771
ENV TARGETS=$TARGETS,x86_64-unknown-cloudabi
72+
ENV TARGETS=$TARGETS,x86_64-fortanix-unknown-sgx
73+
74+
ENV X86_FORTANIX_SGX_LIBS="/x86_64-fortanix-unknown-sgx/lib/"
6875

6976
ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs
7077
ENV SCRIPT python2.7 ../x.py dist --target $TARGETS

‎src/ci/docker/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/bin/bash
2+
3+
set -eu
4+
source shared.sh
5+
6+
if [ -z "$1" ]; then
7+
echo "Usage: ${0} <commit_id>"
8+
exit -1
9+
fi
10+
11+
target="x86_64-fortanix-unknown-sgx"
12+
url="https://github.com/fortanix/llvm-project/archive/${1}.tar.gz"
13+
repo_name="llvm-project"
14+
15+
install_prereq()
16+
{
17+
apt-get update
18+
apt-get install -y --no-install-recommends \
19+
build-essential \
20+
ca-certificates \
21+
cmake \
22+
git
23+
}
24+
25+
# Clone Fortanix's port of llvm-project to build libunwind that would link with this target.
26+
# The below method to download a single commit from llvm-project is based on fetch_submodule
27+
# from init_repo.sh
28+
fetch_llvm_commit()
29+
{
30+
cached="download-${repo_name}.tar.gz"
31+
curl -f -sSL -o ${cached} ${url}
32+
tar -xvzf ${cached}
33+
mkdir "./${repo_name}" && tar -xf ${cached} -C ${repo_name} --strip-components 1
34+
}
35+
36+
build_unwind()
37+
{
38+
dir_name="${target}_temp"
39+
rm -rf "./${dir_name}"
40+
mkdir -p ${dir_name}
41+
cd ${dir_name}
42+
43+
retry fetch_llvm_commit
44+
cd "${repo_name}/libunwind"
45+
46+
# Build libunwind
47+
mkdir -p build
48+
cd build
49+
cmake -DCMAKE_BUILD_TYPE="RELEASE" -DRUST_SGX=1 -G "Unix Makefiles" -DLLVM_PATH=../../llvm/ ../
50+
make unwind_static
51+
install -D "lib/libunwind.a" "/${target}/lib/libunwind.a"
52+
rm -rf ${dir_name}
53+
}
54+
55+
set -x
56+
hide_output install_prereq
57+
hide_output build_unwind

‎src/ci/docker/dist-various-2/shared.sh

+18
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,21 @@ exit 1
1313
kill $PING_LOOP_PID
1414
set -x
1515
}
16+
17+
function retry {
18+
echo "Attempting with retry:" "$@"
19+
local n=1
20+
local max=5
21+
while true; do
22+
"$@" && break || {
23+
if [[ $n -lt $max ]]; then
24+
sleep $n # don't retry immediately
25+
((n++))
26+
echo "Command failed. Attempt $n/$max:"
27+
else
28+
echo "The command has failed after $n attempts."
29+
return 1
30+
fi
31+
}
32+
done
33+
}

‎src/libstd/sys/sgx/abi/entry.S

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
.global IMAGE_BASE
55
IMAGE_BASE:
66

7+
.section ".note.x86_64-fortanix-unknown-sgx", "", @note
8+
.align 4
9+
.long 1f - 0f /* name length (not including padding) */
10+
.long 3f - 2f /* desc length (not including padding) */
11+
.long 1 /* type = NT_VERSION */
12+
0: .asciz "toolchain-version" /* name */
13+
1: .align 4
14+
2: .long 0 /* desc - toolchain version number, 32-bit LE */
15+
3: .align 4
16+
717
.section .rodata
818
/* The XSAVE area needs to be a large chunk of readable memory, but since we are */
919
/* going to restore everything to its initial state (XSTATE_BV=0), only certain */

‎src/libstd/sys/sgx/time.rs

+8
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ impl Instant {
2525
pub fn checked_sub_duration(&self, other: &Duration) -> Option<Instant> {
2626
Some(Instant(self.0.checked_sub(*other)?))
2727
}
28+
29+
pub fn actually_monotonic() -> bool {
30+
false
31+
}
32+
33+
pub const fn zero() -> Instant {
34+
Instant(Duration::from_secs(0))
35+
}
2836
}
2937

3038
impl SystemTime {

‎src/libstd/sys/sgx/waitqueue.rs

+1
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ mod spin_mutex {
456456
}
457457
}
458458

459+
/// Lock the Mutex or return false.
459460
pub macro try_lock_or_false {
460461
($e:expr) => {
461462
if let Some(v) = $e.try_lock() {

0 commit comments

Comments
 (0)