diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2024-04-09 17:47:01 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2024-04-09 18:22:27 +0300 |
| commit | 986865ea2f9d1f8dbef4a130926df106b0f6d41a (patch) | |
| tree | 5c737d2154eead46024033e56fae0f40523f6b25 | |
| parent | liblzma: Remove ifunc support. (diff) | |
| download | xz-986865ea2f9d1f8dbef4a130926df106b0f6d41a.tar.xz | |
CI: Remove ifunc support.
| -rw-r--r-- | .github/workflows/ci.yml | 13 | ||||
| -rwxr-xr-x | build-aux/ci_build.sh | 5 |
2 files changed, 4 insertions, 14 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95fa5af6..cbf3b7d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,25 +77,18 @@ jobs: ./build-aux/ci_build.sh -b autotools -p test -f "-m32" -n 32_bit cd ../xz_build && make distclean - # ifunc must be disabled for this test because __attribute__ ifunc is - # incompatible with -fsanitize=address. - # - # The sandbox must also be disabled because it will prevent access to + # The sandbox must be disabled because it will prevent access to # the /proc/ filesystem on Linux, which is used by the sanitizer's # instrumentation. - name: Build with -fsanitize=address,undefined if: ${{ matrix.os == 'ubuntu-latest' && matrix.build_system == 'autotools' }} - run: ./build-aux/ci_build.sh -b autotools -p build -f "-fsanitize=address,undefined" -d ifunc,sandbox + run: ./build-aux/ci_build.sh -b autotools -p build -f "-fsanitize=address,undefined" -d sandbox - name: Test with -fsanitize=address,undefined if: ${{ matrix.os == 'ubuntu-latest' && matrix.build_system == 'autotools' }} run: | - ./build-aux/ci_build.sh -b autotools -p test -f "-fsanitize=address,undefined" -d ifunc,sandbox + ./build-aux/ci_build.sh -b autotools -p test -f "-fsanitize=address,undefined" -d sandbox cd ../xz_build && make distclean - # musl libc has some slight differences compared to glibc, including - # the lack of ifunc support. This tests if the ifunc detection - # functions properly since musl-gcc can compile with ifunc support, - # but will fail at runtime. - name: Build with musl libc if: ${{ matrix.os == 'ubuntu-latest'}} run: ./build-aux/ci_build.sh -b ${{ matrix.build_system }} -p build -m "/usr/bin/musl-gcc" diff --git a/build-aux/ci_build.sh b/build-aux/ci_build.sh index 73fcca30..9e2a7f8b 100755 --- a/build-aux/ci_build.sh +++ b/build-aux/ci_build.sh @@ -18,7 +18,7 @@ USAGE="Usage: $0 -a [autogen flags] -b [autotools|cmake] -c [crc32|crc64|sha256] - -d [encoders|decoders|bcj|delta|threads|shared|nls|small|ifunc|clmul|sandbox] + -d [encoders|decoders|bcj|delta|threads|shared|nls|small|clmul|sandbox] -f [CFLAGS] -l [destdir] -m [compiler] @@ -41,7 +41,6 @@ THREADS="y" SHARED="y" NATIVE_LANG_SUPPORT="y" SMALL="n" -IFUNC="y" CLMUL="y" SANDBOX="y" SRC_DIR="$ABS_DIR/../" @@ -87,7 +86,6 @@ while getopts a:b:c:d:l:m:n:s:p:f:h opt; do shared) SHARED="n";; nls) NATIVE_LANG_SUPPORT="n";; small) SMALL="y";; - ifunc) IFUNC="n";; clmul) CLMUL="n";; sandbox) SANDBOX="n";; *) echo "Invalid disable value: $disable_arg"; exit 1 ;; @@ -211,7 +209,6 @@ then add_extra_option "$SHARED" "" "--disable-shared" add_extra_option "$NATIVE_LANG_SUPPORT" "" "--disable-nls" add_extra_option "$SMALL" "--enable-small" "" - add_extra_option "$IFUNC" "" "--disable-ifunc" add_extra_option "$CLMUL" "" "--disable-clmul-crc" add_extra_option "$SANDBOX" "" "--enable-sandbox=no" |