CI: Remove ifunc support.

tukaani-project · Apr 9, 2024 · 986865e · 986865e
1 parent 689ae24
commit 986865e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git 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
@@ -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"