Auto merge of #131 - japaric:rustup, r=alexcrichton
CI: use a recent nightly - add #[no_mangle] to the panic_fmt lang item to adjust to changes in the visibility algorithm - adjust to changes in the layout of Cargo's target directory - use a newer Xargo to reduce the build time of the sysroot (only core is compiled as part of the sysroot now) r? @alexcrichton
This commit is contained in:
commit
0fd5e7549f
|
@ -1,8 +1,7 @@
|
||||||
cache: cargo
|
cache: cargo
|
||||||
dist: trusty
|
dist: trusty
|
||||||
language: rust
|
language: rust
|
||||||
# NOTE(nightly-2016-12-05) work around for rust-lang/rust#38281
|
rust: nightly
|
||||||
rust: nightly-2016-12-05
|
|
||||||
services: docker
|
services: docker
|
||||||
sudo: required
|
sudo: required
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
|
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
|
||||||
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
|
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
|
||||||
sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin
|
sh -s -- --git japaric/xargo --tag v0.3.1 --target x86_64-unknown-linux-gnu --to /usr/bin
|
||||||
ENV AR_thumbv6m_none_eabi=arm-none-eabi-ar \
|
ENV AR_thumbv6m_none_eabi=arm-none-eabi-ar \
|
||||||
CARGO_TARGET_THUMBV6M_NONE_EABI_LINKER=arm-none-eabi-gcc \
|
CARGO_TARGET_THUMBV6M_NONE_EABI_LINKER=arm-none-eabi-gcc \
|
||||||
CC_thumbv6m_none_eabi=arm-none-eabi-gcc \
|
CC_thumbv6m_none_eabi=arm-none-eabi-gcc \
|
||||||
|
|
|
@ -3,7 +3,7 @@ RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
|
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
|
||||||
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
|
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
|
||||||
sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin
|
sh -s -- --git japaric/xargo --tag v0.3.1 --target x86_64-unknown-linux-gnu --to /usr/bin
|
||||||
ENV AR_thumbv7em_none_eabi=arm-none-eabi-ar \
|
ENV AR_thumbv7em_none_eabi=arm-none-eabi-ar \
|
||||||
CARGO_TARGET_THUMBV7EM_NONE_EABI_LINKER=arm-none-eabi-gcc \
|
CARGO_TARGET_THUMBV7EM_NONE_EABI_LINKER=arm-none-eabi-gcc \
|
||||||
CC_thumbv7em_none_eabi=arm-none-eabi-gcc \
|
CC_thumbv7em_none_eabi=arm-none-eabi-gcc \
|
||||||
|
|
|
@ -3,7 +3,7 @@ RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
|
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
|
||||||
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
|
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
|
||||||
sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin
|
sh -s -- --git japaric/xargo --tag v0.3.1 --target x86_64-unknown-linux-gnu --to /usr/bin
|
||||||
ENV AR_thumbv7em_none_eabihf=arm-none-eabi-ar \
|
ENV AR_thumbv7em_none_eabihf=arm-none-eabi-ar \
|
||||||
CARGO_TARGET_THUMBV7EM_NONE_EABIHF_LINKER=arm-none-eabi-gcc \
|
CARGO_TARGET_THUMBV7EM_NONE_EABIHF_LINKER=arm-none-eabi-gcc \
|
||||||
CC_thumbv7em_none_eabihf=arm-none-eabi-gcc \
|
CC_thumbv7em_none_eabihf=arm-none-eabi-gcc \
|
||||||
|
|
|
@ -3,7 +3,7 @@ RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
|
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
|
||||||
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
|
RUN curl -LSfs https://japaric.github.io/trust/install.sh | \
|
||||||
sh -s -- --git japaric/xargo --tag v0.2.1 --target x86_64-unknown-linux-gnu --to /usr/bin
|
sh -s -- --git japaric/xargo --tag v0.3.1 --target x86_64-unknown-linux-gnu --to /usr/bin
|
||||||
ENV AR_thumbv7m_none_eabi=arm-none-eabi-ar \
|
ENV AR_thumbv7m_none_eabi=arm-none-eabi-ar \
|
||||||
CARGO_TARGET_THUMBV7M_NONE_EABI_LINKER=arm-none-eabi-gcc \
|
CARGO_TARGET_THUMBV7M_NONE_EABI_LINKER=arm-none-eabi-gcc \
|
||||||
CC_thumbv7m_none_eabi=arm-none-eabi-gcc \
|
CC_thumbv7m_none_eabi=arm-none-eabi-gcc \
|
||||||
|
|
22
ci/run.sh
22
ci/run.sh
|
@ -26,7 +26,7 @@ esac
|
||||||
# TODO(#79) fix the undefined references problem for debug-assertions+lto
|
# TODO(#79) fix the undefined references problem for debug-assertions+lto
|
||||||
case $1 in
|
case $1 in
|
||||||
thumb*)
|
thumb*)
|
||||||
RUSTFLAGS="-C debug-assertions=no -C link-arg=-nostartfiles" xargo rustc --no-default-features --features c --target $1 --bin intrinsics -- -C lto
|
RUSTFLAGS="-C debug-assertions=no" xargo rustc --no-default-features --features c --target $1 --bin intrinsics -- -C lto -C link-arg=-nostartfiles
|
||||||
xargo rustc --no-default-features --features c --target $1 --bin intrinsics --release -- -C lto
|
xargo rustc --no-default-features --features c --target $1 --bin intrinsics --release -- -C lto
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -61,18 +61,22 @@ case $TRAVIS_OS_NAME in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it
|
|
||||||
if [ $TRAVIS_OS_NAME = osx ]; then
|
if [ $TRAVIS_OS_NAME = osx ]; then
|
||||||
path=target/${1}/debug/libcompiler_builtins.rlib
|
path=target/${1}/debug/deps/libcompiler_builtins-*.rlib
|
||||||
else
|
else
|
||||||
path=/target/${1}/debug/libcompiler_builtins.rlib
|
path=/target/${1}/debug/deps/libcompiler_builtins-*.rlib
|
||||||
fi
|
fi
|
||||||
|
|
||||||
stdout=$($PREFIX$NM -g --defined-only $path)
|
for rlib in $(echo $path); do
|
||||||
|
stdout=$($PREFIX$NM -g --defined-only $rlib)
|
||||||
|
|
||||||
set +e
|
# NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it
|
||||||
echo "$stdout" | sort | uniq -d | grep -v __x86.get_pc_thunk | grep 'T __'
|
set +e
|
||||||
|
echo "$stdout" | sort | uniq -d | grep -v __x86.get_pc_thunk | grep 'T __'
|
||||||
|
|
||||||
if test $? = 0; then
|
if test $? = 0; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
true
|
||||||
|
|
|
@ -400,8 +400,10 @@ pub fn _Unwind_Resume() {}
|
||||||
// Lang items
|
// Lang items
|
||||||
#[cfg(not(test))]
|
#[cfg(not(test))]
|
||||||
#[lang = "eh_personality"]
|
#[lang = "eh_personality"]
|
||||||
|
#[no_mangle]
|
||||||
extern "C" fn eh_personality() {}
|
extern "C" fn eh_personality() {}
|
||||||
|
|
||||||
#[cfg(not(test))]
|
#[cfg(not(test))]
|
||||||
#[lang = "panic_fmt"]
|
#[lang = "panic_fmt"]
|
||||||
|
#[no_mangle]
|
||||||
extern "C" fn panic_fmt() {}
|
extern "C" fn panic_fmt() {}
|
||||||
|
|
Loading…
Reference in New Issue