Merge pull request #286 from alexcrichton/fix-dupe

Fix duplicate symbol __clzsi2
This commit is contained in:
Alex Crichton 2019-05-02 17:17:52 -05:00 committed by GitHub
commit 4addb9bab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions

View File

@ -42,6 +42,10 @@ else
$run --release $run --release
$run --features c $run --features c
$run --features c --release $run --features c --release
cargo build --target $1
cargo build --target $1 --release
cargo build --target $1 --features c
cargo build --target $1 --release --features c
fi fi
PREFIX=$(echo $1 | sed -e 's/unknown-//')- PREFIX=$(echo $1 | sed -e 's/unknown-//')-
@ -68,6 +72,10 @@ fi
# Look out for duplicated symbols when we include the compiler-rt (C) implementation # Look out for duplicated symbols when we include the compiler-rt (C) implementation
for rlib in $(echo $path); do for rlib in $(echo $path); do
set +x set +x
echo "================================================================"
echo checking $rlib for duplicate symbols
echo "================================================================"
stdout=$($PREFIX$NM -g --defined-only $rlib 2>&1) stdout=$($PREFIX$NM -g --defined-only $rlib 2>&1)
# NOTE On i586, It's normal that the get_pc_thunk symbol appears several # NOTE On i586, It's normal that the get_pc_thunk symbol appears several
@ -86,6 +94,7 @@ for rlib in $(echo $path); do
if test $? = 0; then if test $? = 0; then
exit 1 exit 1
fi fi
set -ex set -ex
done done

View File

@ -83,6 +83,7 @@ intrinsics! {
#[use_c_shim_if(any( #[use_c_shim_if(any(
all(target_arch = "x86", not(target_env = "msvc")), all(target_arch = "x86", not(target_env = "msvc")),
all(target_arch = "x86_64", not(windows)), all(target_arch = "x86_64", not(windows)),
all(target_arch = "x86_64", target_env = "msvc"),
))] ))]
#[arm_aeabi_alias = __aeabi_l2f] #[arm_aeabi_alias = __aeabi_l2f]
pub extern "C" fn __floatdisf(i: i64) -> f32 { pub extern "C" fn __floatdisf(i: i64) -> f32 {

View File

@ -302,6 +302,7 @@ impl_wide_int!(u32, u64, 32);
impl_wide_int!(u64, u128, 64); impl_wide_int!(u64, u128, 64);
intrinsics! { intrinsics! {
#[use_c_shim_if(/* always if C compilation is enabled */)]
#[cfg(any( #[cfg(any(
target_pointer_width = "16", target_pointer_width = "16",
target_pointer_width = "32", target_pointer_width = "32",