diff options
author | Joseph Myers <joseph@codesourcery.com> | 2014-06-24 20:53:03 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2014-06-24 20:53:03 +0000 |
commit | 0ea5d373c7984a1da2d0e990c6e78e6d6c24f91b (patch) | |
tree | 94af1ef1dad42a63b52117a4e346477409f0d89b /sysdeps/unix/sysv/linux/configure | |
parent | 2307e1261e7ee784afd424a46ad08d3fbed33ba3 (diff) | |
download | glibc-0ea5d373c7984a1da2d0e990c6e78e6d6c24f91b.tar.gz glibc-0ea5d373c7984a1da2d0e990c6e78e6d6c24f91b.tar.xz glibc-0ea5d373c7984a1da2d0e990c6e78e6d6c24f91b.zip |
Move architecture cases out of sysdeps/unix/sysv/linux/configure.ac.
Continuing the process of making non-ex-ports architectures follow the preferred sysdeps practices followed by ex-ports architectures - that is, putting things in architecture-specific sysdeps files rather than having architecture-specific cases in architecture-independent files - this patch moves architecture cases out of sysdeps/unix/sysv/linux/configure.ac into (new or existing) configure fragments for each architecture. (In the case of the arch_minimum_kernel setting for x32, sysdeps/unix/sysv/linux/x86_64/x32/configure already has such a setting so the setting in sysdeps/unix/sysv/linux/configure.ac was a duplicate that could just be removed - though I haven't tested for x32.) Tested for x86_64 and x86 that the patch causes no changes to the installed shared libraries or ldd (or any part of the installation except for the parts that always change because the files contain timestamps - nscd and static libraries). * 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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/configure')
-rw-r--r-- | sysdeps/unix/sysv/linux/configure | 61 |
1 files changed, 1 insertions, 60 deletions
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). |