AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 14:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move base_machine and machine settings from configure.ac to sysdeps preconfigure fragments.

Browse Source 
This patch makes non-ex-ports architectures set base_machine and
machine based on the original configured machine value in preconfigure
fragments, like ex-ports architectures, rather than in the toplevel
configure.ac.

Tested x86 that the disassembly of installed shared libraries is
unchanged by the patch.

	* configure.ac (base_machine): Do not set specially for particular
	machines here.
	* configure: Regenerated.
	* sysdeps/powerpc/preconfigure: Move machine and base_machine
	settings from configure.ac.
	* sysdeps/i386/preconfigure: New file.
	* sysdeps/s390/preconfigure: Likewise.
	* sysdeps/sh/preconfigure: Likewise.
	* sysdeps/sparc/preconfigure: Likewise.
This commit is contained in:
Joseph Myers 2014-06-25 17:52:56 +00:00
parent 74836003ed
commit 3e239be647
8 changed files with 65 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2014-06-25 Joseph Myers <joseph@codesourcery.com>
* configure.ac (base_machine): Do not set specially for particular
machines here.
* configure: Regenerated.
* sysdeps/powerpc/preconfigure: Move machine and base_machine
settings from configure.ac.
* sysdeps/i386/preconfigure: New file.
* sysdeps/s390/preconfigure: Likewise.
* sysdeps/sh/preconfigure: Likewise.
* sysdeps/sparc/preconfigure: Likewise.
2014-06-25 Roland McGrath <roland@hack.frob.com>
* sysdeps/sparc/sparc64/nptl/cpu_relax.S: Moved ...

35
configure vendored
View File

@ -3965,39 +3965,8 @@ if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
esac
fi
# Expand the configuration machine name into a subdirectory by architecture
# type and particular chip. If an add-on configure fragment already set
# base_machine, we don't change it.
test -n "$base_machine" || case "$machine" in
i[4567]86) base_machine=i386 machine=i386/$machine ;;
powerpc64*) base_machine=powerpc machine=powerpc/powerpc64 ;;
powerpc*) base_machine=powerpc machine=powerpc/powerpc32 ;;
s390) base_machine=s390 machine=s390/s390-32 ;;
s390x) base_machine=s390 machine=s390/s390-64 ;;
sh3*) base_machine=sh machine=sh/sh3 ;;
sh4*) base_machine=sh machine=sh/sh4 ;;
sparc | sparcv[67])
base_machine=sparc machine=sparc/sparc32 ;;
sparcv8 | supersparc | hypersparc)
base_machine=sparc machine=sparc/sparc32/sparcv8 ;;
sparcv8plus | sparcv8plusa | sparcv9)
base_machine=sparc machine=sparc/sparc32/sparcv9 ;;
sparcv8plusb | sparcv9b)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9b ;;
sparcv9v)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v ;;
sparcv9v2)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v2 ;;
sparc64)
base_machine=sparc machine=sparc/sparc64 ;;
sparc64b)
base_machine=sparc machine=sparc/sparc64/sparcv9b ;;
sparc64v)
base_machine=sparc machine=sparc/sparc64/sparcv9v ;;
sparc64v2)
base_machine=sparc machine=sparc/sparc64/sparcv9v2 ;;
*) base_machine=$machine ;;
esac
# Set base_machine if not set by a preconfigure fragment.
test -n "$base_machine" || base_machine=$machine
if test "$base_machine" = "i386"; then

38
configure.ac
View File

@ -582,42 +582,8 @@ if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
esac
fi
dnl We need to use [ and ] for other purposes for a while now.
changequote(,)dnl
# Expand the configuration machine name into a subdirectory by architecture
# type and particular chip. If an add-on configure fragment already set
# base_machine, we don't change it.
test -n "$base_machine" || case "$machine" in
i[4567]86) base_machine=i386 machine=i386/$machine ;;
powerpc64*) base_machine=powerpc machine=powerpc/powerpc64 ;;
powerpc*) base_machine=powerpc machine=powerpc/powerpc32 ;;
s390) base_machine=s390 machine=s390/s390-32 ;;
s390x) base_machine=s390 machine=s390/s390-64 ;;
sh3*) base_machine=sh machine=sh/sh3 ;;
sh4*) base_machine=sh machine=sh/sh4 ;;
sparc | sparcv[67])
base_machine=sparc machine=sparc/sparc32 ;;
sparcv8 | supersparc | hypersparc)
base_machine=sparc machine=sparc/sparc32/sparcv8 ;;
sparcv8plus | sparcv8plusa | sparcv9)
base_machine=sparc machine=sparc/sparc32/sparcv9 ;;
sparcv8plusb | sparcv9b)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9b ;;
sparcv9v)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v ;;
sparcv9v2)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v2 ;;
sparc64)
base_machine=sparc machine=sparc/sparc64 ;;
sparc64b)
base_machine=sparc machine=sparc/sparc64/sparcv9b ;;
sparc64v)
base_machine=sparc machine=sparc/sparc64/sparcv9v ;;
sparc64v2)
base_machine=sparc machine=sparc/sparc64/sparcv9v2 ;;
*) base_machine=$machine ;;
esac
changequote([,])dnl
# Set base_machine if not set by a preconfigure fragment.
test -n "$base_machine" || base_machine=$machine
AC_SUBST(base_machine)
if test "$base_machine" = "i386"; then

5
sysdeps/i386/preconfigure Normal file
View File

@ -0,0 +1,5 @@
# preconfigure fragment for i386.
case "$machine" in
i[4567]86) base_machine=i386 machine=i386/$machine ;;
esac

10
sysdeps/powerpc/preconfigure
View File

@ -1,10 +1,16 @@
# Check for e500.
# preconfigure fragment for powerpc.
case "$machine" in
powerpc)
powerpc64*)
base_machine=powerpc machine=powerpc/powerpc64
;;
powerpc*)
# Check for e500.
$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null > conftest.i
if grep -q __NO_FPRS__ conftest.i && ! grep -q _SOFT_FLOAT conftest.i; then
base_machine=powerpc machine=powerpc/powerpc32/e500
else
base_machine=powerpc machine=powerpc/powerpc32
fi
rm -f conftest.i
;;

6
sysdeps/s390/preconfigure Normal file
View File

@ -0,0 +1,6 @@
# preconfigure fragment for s390.
case "$machine" in
s390) base_machine=s390 machine=s390/s390-32 ;;
s390x) base_machine=s390 machine=s390/s390-64 ;;
esac

6
sysdeps/sh/preconfigure Normal file
View File

@ -0,0 +1,6 @@
# preconfigure fragment for sh.
case "$machine" in
sh3*) base_machine=sh machine=sh/sh3 ;;
sh4*) base_machine=sh machine=sh/sh4 ;;
esac

24
sysdeps/sparc/preconfigure Normal file
View File

@ -0,0 +1,24 @@
# preconfigure fragment for sparc.
case "$machine" in
sparc | sparcv[67])
base_machine=sparc machine=sparc/sparc32 ;;
sparcv8 | supersparc | hypersparc)
base_machine=sparc machine=sparc/sparc32/sparcv8 ;;
sparcv8plus | sparcv8plusa | sparcv9)
base_machine=sparc machine=sparc/sparc32/sparcv9 ;;
sparcv8plusb | sparcv9b)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9b ;;
sparcv9v)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v ;;
sparcv9v2)
base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9v2 ;;
sparc64)
base_machine=sparc machine=sparc/sparc64 ;;
sparc64b)
base_machine=sparc machine=sparc/sparc64/sparcv9b ;;
sparc64v)
base_machine=sparc machine=sparc/sparc64/sparcv9v ;;
sparc64v2)
base_machine=sparc machine=sparc/sparc64/sparcv9v2 ;;
esac