AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-09-21 09:00:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move architecture cases out of sysdeps/unix/sysv/linux/configure.ac.

Browse Source 
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.
This commit is contained in:
Joseph Myers 2014-06-24 20:53:03 +00:00
parent 2307e1261e
commit 0ea5d373c7
17 changed files with 83 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -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]

61
sysdeps/unix/sysv/linux/configure vendored
View File

@ -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).

61
sysdeps/unix/sysv/linux/configure.ac
View File

@ -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).

5
sysdeps/unix/sysv/linux/i386/configure vendored Normal file
View File

@ -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

5
sysdeps/unix/sysv/linux/i386/configure.ac Normal file
View File

@ -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

2
sysdeps/unix/sysv/linux/powerpc/configure vendored
View File

@ -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

2
sysdeps/unix/sysv/linux/powerpc/configure.ac
View File

@ -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

4
sysdeps/unix/sysv/linux/powerpc/powerpc32/configure vendored Normal file
View File

@ -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

4
sysdeps/unix/sysv/linux/powerpc/powerpc32/configure.ac Normal file
View File

@ -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

5
sysdeps/unix/sysv/linux/s390/configure vendored Normal file
View File

@ -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

5
sysdeps/unix/sysv/linux/s390/configure.ac Normal file
View File

@ -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

4
sysdeps/unix/sysv/linux/sh/configure vendored Normal file
View File

@ -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

4
sysdeps/unix/sysv/linux/sh/configure.ac Normal file
View File

@ -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

5
sysdeps/unix/sysv/linux/sparc/configure vendored Normal file
View File

@ -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

5
sysdeps/unix/sysv/linux/sparc/configure.ac Normal file
View File

@ -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

4
sysdeps/unix/sysv/linux/x86_64/configure vendored Normal file
View File

@ -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

4
sysdeps/unix/sysv/linux/x86_64/configure.ac Normal file
View File

@ -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