aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog23
-rw-r--r--sysdeps/unix/sysv/linux/configure61
-rw-r--r--sysdeps/unix/sysv/linux/configure.ac61
-rw-r--r--sysdeps/unix/sysv/linux/i386/configure5
-rw-r--r--sysdeps/unix/sysv/linux/i386/configure.ac5
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/configure2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/configure.ac2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/configure4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/configure.ac4
-rw-r--r--sysdeps/unix/sysv/linux/s390/configure5
-rw-r--r--sysdeps/unix/sysv/linux/s390/configure.ac5
-rw-r--r--sysdeps/unix/sysv/linux/sh/configure4
-rw-r--r--sysdeps/unix/sysv/linux/sh/configure.ac4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/configure5
-rw-r--r--sysdeps/unix/sysv/linux/sparc/configure.ac5
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/configure4
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/configure.ac4
17 files changed, 83 insertions, 120 deletions
diff --git a/ChangeLog b/ChangeLog
index aa98af8b16..04d7f76ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2014-06-24 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/configure.ac: Remove cases for
+ individual architectures.
+ * sysdeps/unix/sysv/linux/configure: Regenerated.
+ * sysdeps/unix/sysv/linux/i386/configure.ac: New file.
+ * sysdeps/unix/sysv/linux/i386/configure: New generated file.
+ * sysdeps/unix/sysv/linux/powerpc/configure.ac
+ (ldd_rewrite_script): Define variable.
+ * sysdeps/unix/sysv/linux/powerpc/configure: Regenerated.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/configure.ac: New
+ file.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/configure: New
+ generated file.
+ * sysdeps/unix/sysv/linux/s390/configure.ac: New file.
+ * sysdeps/unix/sysv/linux/s390/configure: New generated file.
+ * sysdeps/unix/sysv/linux/sh/configure.ac: New file.
+ * sysdeps/unix/sysv/linux/sh/configure: New generated file.
+ * sysdeps/unix/sysv/linux/sparc/configure.ac: New file.
+ * sysdeps/unix/sysv/linux/sparc/configure: New generated file.
+ * sysdeps/unix/sysv/linux/x86_64/configure.ac: New file.
+ * sysdeps/unix/sysv/linux/x86_64/configure: New generated file.
+
2014-06-24 Siddhesh Poyarekar <siddhesh@redhat.com>
[BZ #17084]
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 6ba2454d7e..57fda6c32d 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -208,43 +208,7 @@ fi
# set arch_minimum_kernel already, let that override our defaults here.
# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde
# if appropriate too.
-test -n "$arch_minimum_kernel" ||
-case "$machine" in
- i386*)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- x86_64/x32)
- arch_minimum_kernel=3.4.0
- ;;
- powerpc/powerpc32*)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- s390/s390-32)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- s390/s390-64)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- sh*)
- arch_minimum_kernel=2.6.32
- libc_cv_gcc_unwind_find_fde=yes
- ;;
- sparc/sparc64*)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- sparc*)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- *)
- arch_minimum_kernel=2.6.32
- ;;
-esac
+test -n "$arch_minimum_kernel" || arch_minimum_kernel=2.6.32
if test -n "$minimum_kernel"; then
user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
@@ -362,29 +326,6 @@ fi
# One Linux we use ldconfig.
use_ldconfig=yes
-# We need some extensions to the `ldd' script.
-
-case "$machine" in
- i[3456]86*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
- ;;
- s390*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
- ;;
- sparc*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
- ;;
- x86_64*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
- ;;
- powerpc*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
- ;;
- *)
- ;;
-esac
-
-
if test $host = $build; then
# If $prefix/include/{net,scsi} are symlinks, make install will
# clobber what they're linked to (probably a kernel tree).
diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac
index d182978544..e172ffe379 100644
--- a/sysdeps/unix/sysv/linux/configure.ac
+++ b/sysdeps/unix/sysv/linux/configure.ac
@@ -33,43 +33,7 @@ fi
# set arch_minimum_kernel already, let that override our defaults here.
# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde
# if appropriate too.
-test -n "$arch_minimum_kernel" ||
-case "$machine" in
- i386*)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- x86_64/x32)
- arch_minimum_kernel=3.4.0
- ;;
- powerpc/powerpc32*)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- s390/s390-32)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- s390/s390-64)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- sh*)
- arch_minimum_kernel=2.6.32
- libc_cv_gcc_unwind_find_fde=yes
- ;;
- sparc/sparc64*)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- sparc*)
- libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=2.6.32
- ;;
- *)
- arch_minimum_kernel=2.6.32
- ;;
-esac
+test -n "$arch_minimum_kernel" || arch_minimum_kernel=2.6.32
if test -n "$minimum_kernel"; then
changequote(,)
user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
@@ -164,29 +128,6 @@ fi
# One Linux we use ldconfig.
use_ldconfig=yes
-# We need some extensions to the `ldd' script.
-changequote(,)
-case "$machine" in
- i[3456]86*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
- ;;
- s390*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
- ;;
- sparc*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
- ;;
- x86_64*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
- ;;
- powerpc*)
- ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
- ;;
- *)
- ;;
-esac
-changequote([,])
-
if test $host = $build; then
# If $prefix/include/{net,scsi} are symlinks, make install will
# clobber what they're linked to (probably a kernel tree).
diff --git a/sysdeps/unix/sysv/linux/i386/configure b/sysdeps/unix/sysv/linux/i386/configure
new file mode 100644
index 0000000000..f119e62fc3
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/configure
@@ -0,0 +1,5 @@
+# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/i386.
+
+libc_cv_gcc_unwind_find_fde=yes
+ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/i386/configure.ac b/sysdeps/unix/sysv/linux/i386/configure.ac
new file mode 100644
index 0000000000..64ab2cc2c8
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/configure.ac
@@ -0,0 +1,5 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/sysv/linux/i386.
+
+libc_cv_gcc_unwind_find_fde=yes
+ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/powerpc/configure b/sysdeps/unix/sysv/linux/powerpc/configure
index 50e3639be5..6f883de396 100644
--- a/sysdeps/unix/sysv/linux/powerpc/configure
+++ b/sysdeps/unix/sysv/linux/powerpc/configure
@@ -75,3 +75,5 @@ $as_echo "$libc_cv_mabi_ibmlongdouble" >&6; }
as_fn_error $? "this configuration requires -mlong-double-128 IBM extended format support" "$LINENO" 5
fi
fi
+
+ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/powerpc/configure.ac b/sysdeps/unix/sysv/linux/powerpc/configure.ac
index 1768ab1f99..b8e5f9ac32 100644
--- a/sysdeps/unix/sysv/linux/powerpc/configure.ac
+++ b/sysdeps/unix/sysv/linux/powerpc/configure.ac
@@ -35,3 +35,5 @@ long double foobar (long double x) { return x; }],
AC_MSG_ERROR([this configuration requires -mlong-double-128 IBM extended format support])
fi
fi
+
+ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc32/configure
new file mode 100644
index 0000000000..eb58187ff4
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/configure
@@ -0,0 +1,4 @@
+# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/powerpc32.
+
+libc_cv_gcc_unwind_find_fde=yes
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc32/configure.ac
new file mode 100644
index 0000000000..e1c4c0d357
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/configure.ac
@@ -0,0 +1,4 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/sysv/linux/powerpc/powerpc32.
+
+libc_cv_gcc_unwind_find_fde=yes
diff --git a/sysdeps/unix/sysv/linux/s390/configure b/sysdeps/unix/sysv/linux/s390/configure
new file mode 100644
index 0000000000..1d735d7b9c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/configure
@@ -0,0 +1,5 @@
+# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/s390.
+
+libc_cv_gcc_unwind_find_fde=yes
+ldd_rewrite_script=sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/s390/configure.ac b/sysdeps/unix/sysv/linux/s390/configure.ac
new file mode 100644
index 0000000000..978450c94b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/configure.ac
@@ -0,0 +1,5 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/sysv/linux/s390.
+
+libc_cv_gcc_unwind_find_fde=yes
+ldd_rewrite_script=sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/sh/configure b/sysdeps/unix/sysv/linux/sh/configure
new file mode 100644
index 0000000000..6c31f5e249
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sh/configure
@@ -0,0 +1,4 @@
+# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/sh.
+
+libc_cv_gcc_unwind_find_fde=yes
diff --git a/sysdeps/unix/sysv/linux/sh/configure.ac b/sysdeps/unix/sysv/linux/sh/configure.ac
new file mode 100644
index 0000000000..85ef0f8ffd
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sh/configure.ac
@@ -0,0 +1,4 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/sysv/linux/sh.
+
+libc_cv_gcc_unwind_find_fde=yes
diff --git a/sysdeps/unix/sysv/linux/sparc/configure b/sysdeps/unix/sysv/linux/sparc/configure
new file mode 100644
index 0000000000..00fb21e156
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/configure
@@ -0,0 +1,5 @@
+# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/sparc.
+
+libc_cv_gcc_unwind_find_fde=yes
+ldd_rewrite_script=sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/sparc/configure.ac b/sysdeps/unix/sysv/linux/sparc/configure.ac
new file mode 100644
index 0000000000..7e2af9847a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/configure.ac
@@ -0,0 +1,5 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/sysv/linux/sparc.
+
+libc_cv_gcc_unwind_find_fde=yes
+ldd_rewrite_script=sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/x86_64/configure b/sysdeps/unix/sysv/linux/x86_64/configure
new file mode 100644
index 0000000000..cb904876ab
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/configure
@@ -0,0 +1,4 @@
+# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/x86_64.
+
+ldd_rewrite_script=sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/x86_64/configure.ac b/sysdeps/unix/sysv/linux/x86_64/configure.ac
new file mode 100644
index 0000000000..4a34e9458a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/configure.ac
@@ -0,0 +1,4 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/sysv/linux/x86_64.
+
+ldd_rewrite_script=sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 03:58:06 +0000