Test

Amanieu · Mar 23, 2024 · 0feff28 · 0feff28
1 parent f1c2e6a
commit 0feff28
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 85 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,21 +9,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - target: aarch64-unknown-linux-gnu
-          os: ubuntu-latest
-          rust: nightly
-        - target: arm-unknown-linux-gnueabi
-          os: ubuntu-latest
-          rust: nightly
-        - target: arm-unknown-linux-gnueabihf
-          os: ubuntu-latest
-          rust: nightly
-        - target: i586-unknown-linux-gnu
-          os: ubuntu-latest
-          rust: nightly
-        - target: i686-unknown-linux-gnu
-          os: ubuntu-latest
-          rust: nightly
+        #- target: aarch64-unknown-linux-gnu
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: arm-unknown-linux-gnueabi
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: arm-unknown-linux-gnueabihf
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: i586-unknown-linux-gnu
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: i686-unknown-linux-gnu
+        #  os: ubuntu-latest
+        #  rust: nightly
         # MIPS targets disabled since they are dropped to tier 3.
         # See https://github.com/rust-lang/compiler-team/issues/648
         #- target: mips-unknown-linux-gnu
@@ -38,48 +38,48 @@ jobs:
         #- target: mipsel-unknown-linux-gnu
         #  os: ubuntu-latest
         #  rust: nightly
-        - target: powerpc-unknown-linux-gnu
-          os: ubuntu-latest
-          rust: nightly
-        - target: powerpc64-unknown-linux-gnu
-          os: ubuntu-latest
-          rust: nightly
-        - target: powerpc64le-unknown-linux-gnu
-          os: ubuntu-latest
-          rust: nightly
-        - target: thumbv6m-none-eabi
-          os: ubuntu-latest
-          rust: nightly
-        - target: thumbv7em-none-eabi
-          os: ubuntu-latest
-          rust: nightly
-        - target: thumbv7em-none-eabihf
-          os: ubuntu-latest
-          rust: nightly
-        - target: thumbv7m-none-eabi
-          os: ubuntu-latest
-          rust: nightly
-        - target: wasm32-unknown-unknown
-          os: ubuntu-latest
-          rust: nightly
-        - target: x86_64-unknown-linux-gnu
-          os: ubuntu-latest
-          rust: nightly
+        #- target: powerpc-unknown-linux-gnu
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: powerpc64-unknown-linux-gnu
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: powerpc64le-unknown-linux-gnu
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: thumbv6m-none-eabi
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: thumbv7em-none-eabi
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: thumbv7em-none-eabihf
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: thumbv7m-none-eabi
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: wasm32-unknown-unknown
+        #  os: ubuntu-latest
+        #  rust: nightly
+        #- target: x86_64-unknown-linux-gnu
+        #  os: ubuntu-latest
+        #  rust: nightly
         - target: x86_64-apple-darwin
           os: macos-latest
           rust: nightly
-        - target: i686-pc-windows-msvc
-          os: windows-latest
-          rust: nightly
-        - target: x86_64-pc-windows-msvc
-          os: windows-latest
-          rust: nightly
-        - target: i686-pc-windows-gnu
-          os: windows-latest
-          rust: nightly-i686-gnu
-        - target: x86_64-pc-windows-gnu
-          os: windows-latest
-          rust: nightly-x86_64-gnu
+        #- target: i686-pc-windows-msvc
+        #  os: windows-latest
+        #  rust: nightly
+        #- target: x86_64-pc-windows-msvc
+        #  os: windows-latest
+        #  rust: nightly
+        #- target: i686-pc-windows-gnu
+        #  os: windows-latest
+        #  rust: nightly-i686-gnu
+        #- target: x86_64-pc-windows-gnu
+        #  os: windows-latest
+        #  rust: nightly-x86_64-gnu
     steps:
     - uses: actions/checkout@v4
       with:

diff --git a/ci/run.sh b/ci/run.sh
@@ -22,8 +22,6 @@ else
     path=target/${1}/debug/deps/libcompiler_builtins-*.rlib
 fi
 
-rm -f $path
-
 cargo build --target $1
 cargo build --target $1 --release
 cargo build --target $1 --features c
@@ -49,35 +47,6 @@ if [ "$NM" = "" ]; then
   NM=${PREFIX}nm
 fi
 
-# Look out for duplicated symbols when we include the compiler-rt (C) implementation
-for rlib in $(echo $path); do
-    set +x
-    echo "================================================================"
-    echo checking $rlib for duplicate symbols
-    echo "================================================================"
-
-    stdout=$($NM -g --defined-only $rlib 2>&1)
-    # NOTE On i586, It's normal that the get_pc_thunk symbol appears several
-    # times so ignore it
-    #
-    # FIXME(#167) - we shouldn't ignore `__builtin_cl` style symbols here.
-    set +e
-    echo "$stdout" | \
-      sort | \
-      uniq -d | \
-      grep -v __x86.get_pc_thunk | \
-      grep -v __builtin_cl | \
-      grep -v __builtin_ctz | \
-      grep -v __builtin_sadd_overflow | \
-      grep 'T __'
-
-    if test $? = 0; then
-        exit 1
-    fi
-
-    set -ex
-done
-
 rm -f $path
 
 # Verify that we haven't drop any intrinsic/symbol