about summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xsysdeps/mach/hurd/configure9
-rw-r--r--sysdeps/mach/hurd/configure.in9
2 files changed, 16 insertions, 2 deletions
diff --git a/sysdeps/mach/hurd/configure b/sysdeps/mach/hurd/configure
index 6289cacda4..0bf301305e 100755
--- a/sysdeps/mach/hurd/configure
+++ b/sysdeps/mach/hurd/configure
@@ -12,7 +12,14 @@ fi
 
 case "$machine" in
   i386*)
-    if test -z "$oldest_abi" || test "$oldest_abi" \< "2.2.5"; then
+    # With --enable-libio, the default oldest ABI is 2.5.5;
+    # without --enable-libio, the default oldest ABI is 2.0.
+    # We only need a "yes" here if the oldest ABI supported will be < 2.2.5.
+    if if test "$stdio" = libio; then
+         test "$oldest_abi" != default && test "$oldest_abi" \< "2.2.5"
+       else
+         test "$oldest_abi" = default || test "$oldest_abi" \< "2.2.5"
+       fi; then
       libc_cv_gcc_unwind_find_fde=yes
     fi
     ;;
diff --git a/sysdeps/mach/hurd/configure.in b/sysdeps/mach/hurd/configure.in
index 06a90d27f8..9d023dfe32 100644
--- a/sysdeps/mach/hurd/configure.in
+++ b/sysdeps/mach/hurd/configure.in
@@ -14,7 +14,14 @@ fi
 
 case "$machine" in
   i386*)
-    if test -z "$oldest_abi" || test "$oldest_abi" \< "2.2.5"; then
+    # With --enable-libio, the default oldest ABI is 2.5.5;
+    # without --enable-libio, the default oldest ABI is 2.0.
+    # We only need a "yes" here if the oldest ABI supported will be < 2.2.5.
+    if if test "$stdio" = libio; then
+         test "$oldest_abi" != default && test "$oldest_abi" \< "2.2.5"
+       else
+         test "$oldest_abi" = default || test "$oldest_abi" \< "2.2.5"
+       fi; then
       libc_cv_gcc_unwind_find_fde=yes
     fi
     ;;