From 3e239be647036760563e62639ea574a2c55b9191 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 25 Jun 2014 17:52:56 +0000 Subject: Move base_machine and machine settings from configure.ac to sysdeps preconfigure fragments. 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. --- configure.ac | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index babfe5713c..2d5b902a49 100644 --- a/configure.ac +++ b/configure.ac @@ -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 -- cgit 1.4.1