diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-06-25 17:52:56 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-06-25 17:52:56 +0000 |
| commit | 3e239be647036760563e62639ea574a2c55b9191 (patch) | |
| tree | b7fb407a91afacdb0922dba986c98a6ef1b6c2b7 /sysdeps/powerpc | |
| parent | 74836003ed4f2613f5c47a654bdd38a366076c15 (diff) | |
| download | glibc-3e239be647036760563e62639ea574a2c55b9191.tar.gz glibc-3e239be647036760563e62639ea574a2c55b9191.tar.xz glibc-3e239be647036760563e62639ea574a2c55b9191.zip | |
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.
Diffstat (limited to 'sysdeps/powerpc')
| -rw-r--r-- | sysdeps/powerpc/preconfigure | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure index 1741c251f1..0c6fdde7aa 100644 --- a/sysdeps/powerpc/preconfigure +++ b/sysdeps/powerpc/preconfigure @@ -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 ;; |