From 83195ff5ba73779514e3d06b1457d45f849c7fc2 Mon Sep 17 00:00:00 2001

From: Karel Gardas <karel.gardas@centrum.cz>

Date: Wed, 25 Apr 2012 09:04:50 +0200

Subject: [PATCH] add support for ARM hard-float ABI (fixes #5914)

This patch enhances Platform's ArchARM to include ARM ABI value. It also

tweaks configure machinery to detect hard-float ABI and to set it wherever

needed. Finally when hard-float ABI is in use, pass appropriate compiler

option to the LLVM's llc. Fixes #5914.

---

 aclocal.m4                                         |    2 +-

 compiler/main/DriverPipeline.hs                    |   16 +-

 compiler/nativeGen/AsmCodeGen.lhs                  |    2 +-

 compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs |   56 ++--

 compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs     |   14 +-

 compiler/nativeGen/RegAlloc/Linear/Main.hs         |   14 +-

 compiler/nativeGen/TargetReg.hs                    |   70 ++--

 compiler/utils/Platform.hs                         |   12 +-

 config.guess                                       |  482 ++++++++++----------

 configure.ac                                       |   14 +

 10 files changed, 345 insertions(+), 337 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4

index 5652185..c196bdf 100644

--- a/aclocal.m4

+++ b/aclocal.m4

@@ -171,7 +171,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],

             ;;

         arm)

             GET_ARM_ISA()

-            test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, armISAExt = \$ARM_ISA_EXT}\""

+            test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, armISAExt = \$ARM_ISA_EXT, armABI = \$ARM_ABI}\""

             ;;

         alpha|mips|mipseb|mipsel|hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sparc64|vax)

             test -z "[$]2" || eval "[$]2=ArchUnknown"

diff -u ghc-7.4.1.20120508/compiler/main/DriverPipeline.hs.arm ghc-7.4.1.20120508/compiler/main/DriverPipeline.hs

--- ghc-7.4.1.20120508/compiler/main/DriverPipeline.hs.arm	2012-05-15 02:10:41.000000000 +0900

+++ ghc-7.4.1.20120508/compiler/main/DriverPipeline.hs	2012-05-18 12:19:22.779955285 +0900

@@ -1366,7 +1366,8 @@

                     SysTools.FileOption "" input_fn,

                     SysTools.Option "-o", SysTools.FileOption "" output_fn]

                 ++ map SysTools.Option lc_opts

-                ++ map SysTools.Option fpOpts)

+                ++ map SysTools.Option fpOpts

+                ++ map SysTools.Option abiOpts)

     return (next_phase, output_fn)

   where

@@ -1378,12 +1379,19 @@

         -- while compiling GHC source code. It's probably due to fact that it

         -- does not enable VFP by default. Let's do this manually here

         fpOpts = case platformArch (targetPlatform dflags) of 

-                   ArchARM ARMv7 ext -> if (elem VFPv3 ext)

+                   ArchARM ARMv7 ext _ -> if (elem VFPv3 ext)

                                       then ["-mattr=+v7,+vfp3"]

                                       else if (elem VFPv3D16 ext)

                                            then ["-mattr=+v7,+vfp3,+d16"]

                                            else []

                    _               -> []

+        -- On Ubuntu/Debian with ARM hard float ABI, LLVM's llc still

+        -- compiles into soft-float ABI. We need to explicitly set abi

+        -- to hard

+        abiOpts = case platformArch (targetPlatform dflags) of

+                    ArchARM ARMv7 _ HARD -> ["-float-abi=hard"]

+                    ArchARM ARMv7 _ _    -> []

+                    _                    -> []

 -----------------------------------------------------------------------------

 -- LlvmMangle phase

@@ -1532,8 +1540,8 @@

             elfSectionNote :: String

             elfSectionNote = case platformArch (targetPlatform dflags) of

-                               ArchARM _ _ -> "%note"

-                               _           -> "@note"

+                               ArchARM _ _ _ -> "%note"

+                               _             -> "@note"

 -- The "link info" is a string representing the parameters of the

 -- link.  We save this information in the binary, and the next time we

diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs

index 1ad1242..e976e58 100644

--- a/compiler/nativeGen/AsmCodeGen.lhs

+++ b/compiler/nativeGen/AsmCodeGen.lhs

@@ -200,7 +200,7 @@ nativeCodeGen dflags h us cmms

                          ,ncgExpandTop              = map SPARC.CodeGen.Expand.expandTop

                          ,ncgMakeFarBranches        = id

                      }

-                 ArchARM _ _ ->

+                 ArchARM _ _ _ ->

                      panic "nativeCodeGen: No NCG for ARM"

                  ArchPPC_64 ->

                      panic "nativeCodeGen: No NCG for PPC 64"

diff --git a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs

index 6067f23..6cd3f00 100644

--- a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs

+++ b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs

@@ -107,13 +107,13 @@ trivColorable

 trivColorable platform virtualRegSqueeze realRegSqueeze RcInteger conflicts exclusions

         | let !cALLOCATABLE_REGS_INTEGER

                   = iUnbox (case platformArch platform of

-                            ArchX86     -> 3

-                            ArchX86_64  -> 5

-                            ArchPPC     -> 16

-                            ArchSPARC   -> 14

-                            ArchPPC_64  -> panic "trivColorable ArchPPC_64"

-                            ArchARM _ _ -> panic "trivColorable ArchARM"

-                            ArchUnknown -> panic "trivColorable ArchUnknown")

+                            ArchX86       -> 3

+                            ArchX86_64    -> 5

+                            ArchPPC       -> 16

+                            ArchSPARC     -> 14

+                            ArchPPC_64    -> panic "trivColorable ArchPPC_64"

+                            ArchARM _ _ _ -> panic "trivColorable ArchARM"

+                            ArchUnknown   -> panic "trivColorable ArchUnknown")

         , count2        <- accSqueeze (_ILIT(0)) cALLOCATABLE_REGS_INTEGER

                                 (virtualRegSqueeze RcInteger)

                                 conflicts

@@ -127,13 +127,13 @@ trivColorable platform virtualRegSqueeze realRegSqueeze RcInteger conflicts excl

 trivColorable platform virtualRegSqueeze realRegSqueeze RcFloat conflicts exclusions

         | let !cALLOCATABLE_REGS_FLOAT

                   = iUnbox (case platformArch platform of

-                            ArchX86     -> 0

-                            ArchX86_64  -> 0

-                            ArchPPC     -> 0

-                            ArchSPARC   -> 22

-                            ArchPPC_64  -> panic "trivColorable ArchPPC_64"

-                            ArchARM _ _ -> panic "trivColorable ArchARM"

-                            ArchUnknown -> panic "trivColorable ArchUnknown")

+                            ArchX86       -> 0

+                            ArchX86_64    -> 0

+                            ArchPPC       -> 0

+                            ArchSPARC     -> 22

+                            ArchPPC_64    -> panic "trivColorable ArchPPC_64"

+                            ArchARM _ _ _ -> panic "trivColorable ArchARM"

+                            ArchUnknown   -> panic "trivColorable ArchUnknown")

         , count2        <- accSqueeze (_ILIT(0)) cALLOCATABLE_REGS_FLOAT

                                 (virtualRegSqueeze RcFloat)

                                 conflicts

@@ -147,13 +147,13 @@ trivColorable platform virtualRegSqueeze realRegSqueeze RcFloat conflicts exclus

 trivColorable platform virtualRegSqueeze realRegSqueeze RcDouble conflicts exclusions

         | let !cALLOCATABLE_REGS_DOUBLE

                   = iUnbox (case platformArch platform of

-                            ArchX86     -> 6

-                            ArchX86_64  -> 0

-                            ArchPPC     -> 26

-                            ArchSPARC   -> 11

-                            ArchPPC_64  -> panic "trivColorable ArchPPC_64"

-                            ArchARM _ _ -> panic "trivColorable ArchARM"

-                            ArchUnknown -> panic "trivColorable ArchUnknown")

+                            ArchX86       -> 6

+                            ArchX86_64    -> 0

+                            ArchPPC       -> 26

+                            ArchSPARC     -> 11

+                            ArchPPC_64    -> panic "trivColorable ArchPPC_64"

+                            ArchARM _ _ _ -> panic "trivColorable ArchARM"

+                            ArchUnknown   -> panic "trivColorable ArchUnknown")

         , count2        <- accSqueeze (_ILIT(0)) cALLOCATABLE_REGS_DOUBLE

                                 (virtualRegSqueeze RcDouble)

                                 conflicts

@@ -167,13 +167,13 @@ trivColorable platform virtualRegSqueeze realRegSqueeze RcDouble conflicts exclu

 trivColorable platform virtualRegSqueeze realRegSqueeze RcDoubleSSE conflicts exclusions

         | let !cALLOCATABLE_REGS_SSE

                   = iUnbox (case platformArch platform of

-                            ArchX86     -> 8

-                            ArchX86_64  -> 10

-                            ArchPPC     -> 0

-                            ArchSPARC   -> 0

-                            ArchPPC_64  -> panic "trivColorable ArchPPC_64"

-                            ArchARM _ _ -> panic "trivColorable ArchARM"

-                            ArchUnknown -> panic "trivColorable ArchUnknown")

+                            ArchX86       -> 8

+                            ArchX86_64    -> 10

+                            ArchPPC       -> 0

+                            ArchSPARC     -> 0

+                            ArchPPC_64    -> panic "trivColorable ArchPPC_64"

+                            ArchARM _ _ _ -> panic "trivColorable ArchARM"

+                            ArchUnknown   -> panic "trivColorable ArchUnknown")

         , count2        <- accSqueeze (_ILIT(0)) cALLOCATABLE_REGS_SSE

                                 (virtualRegSqueeze RcDoubleSSE)

                                 conflicts

diff --git a/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs b/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs

index 6fbbd04..fd1fd27 100644

--- a/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs

+++ b/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs

@@ -68,11 +68,11 @@ instance FR SPARC.FreeRegs where

 maxSpillSlots :: Platform -> Int

 maxSpillSlots platform

               = case platformArch platform of

-                ArchX86     -> X86.Instr.maxSpillSlots True  -- 32bit

-                ArchX86_64  -> X86.Instr.maxSpillSlots False -- not 32bit

-                ArchPPC     -> PPC.Instr.maxSpillSlots

-                ArchSPARC   -> SPARC.Instr.maxSpillSlots

-                ArchARM _ _ -> panic "maxSpillSlots ArchARM"

-                ArchPPC_64  -> panic "maxSpillSlots ArchPPC_64"

-                ArchUnknown -> panic "maxSpillSlots ArchUnknown"

+                ArchX86       -> X86.Instr.maxSpillSlots True  -- 32bit

+                ArchX86_64    -> X86.Instr.maxSpillSlots False -- not 32bit

+                ArchPPC       -> PPC.Instr.maxSpillSlots

+                ArchSPARC     -> SPARC.Instr.maxSpillSlots

+                ArchARM _ _ _ -> panic "maxSpillSlots ArchARM"

+                ArchPPC_64    -> panic "maxSpillSlots ArchPPC_64"

+                ArchUnknown   -> panic "maxSpillSlots ArchUnknown"

diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs

index fc0bde4..64b0f68 100644

--- a/compiler/nativeGen/RegAlloc/Linear/Main.hs

+++ b/compiler/nativeGen/RegAlloc/Linear/Main.hs

@@ -180,13 +180,13 @@ linearRegAlloc

 linearRegAlloc dflags first_id block_live sccs

  = let platform = targetPlatform dflags

    in case platformArch platform of

-      ArchX86     -> linearRegAlloc' platform (frInitFreeRegs :: X86.FreeRegs)   first_id block_live sccs

-      ArchX86_64  -> linearRegAlloc' platform (frInitFreeRegs :: X86.FreeRegs)   first_id block_live sccs

-      ArchSPARC   -> linearRegAlloc' platform (frInitFreeRegs :: SPARC.FreeRegs) first_id block_live sccs

-      ArchPPC     -> linearRegAlloc' platform (frInitFreeRegs :: PPC.FreeRegs)   first_id block_live sccs

-      ArchARM _ _ -> panic "linearRegAlloc ArchARM"

-      ArchPPC_64  -> panic "linearRegAlloc ArchPPC_64"

-      ArchUnknown -> panic "linearRegAlloc ArchUnknown"

+      ArchX86       -> linearRegAlloc' platform (frInitFreeRegs :: X86.FreeRegs)   first_id block_live sccs

+      ArchX86_64    -> linearRegAlloc' platform (frInitFreeRegs :: X86.FreeRegs)   first_id block_live sccs

+      ArchSPARC     -> linearRegAlloc' platform (frInitFreeRegs :: SPARC.FreeRegs) first_id block_live sccs

+      ArchPPC       -> linearRegAlloc' platform (frInitFreeRegs :: PPC.FreeRegs)   first_id block_live sccs

+      ArchARM _ _ _ -> panic "linearRegAlloc ArchARM"

+      ArchPPC_64    -> panic "linearRegAlloc ArchPPC_64"

+      ArchUnknown   -> panic "linearRegAlloc ArchUnknown"

 linearRegAlloc'

         :: (FR freeRegs, PlatformOutputable instr, Instruction instr)

diff --git a/compiler/nativeGen/TargetReg.hs b/compiler/nativeGen/TargetReg.hs

index cbc4c17..13293de 100644

--- a/compiler/nativeGen/TargetReg.hs

+++ b/compiler/nativeGen/TargetReg.hs

@@ -50,35 +50,35 @@ import qualified SPARC.Regs     as SPARC

 targetVirtualRegSqueeze :: Platform -> RegClass -> VirtualReg -> FastInt

 targetVirtualRegSqueeze platform

     = case platformArch platform of

-      ArchX86     -> X86.virtualRegSqueeze

-      ArchX86_64  -> X86.virtualRegSqueeze

-      ArchPPC     -> PPC.virtualRegSqueeze

-      ArchSPARC   -> SPARC.virtualRegSqueeze

-      ArchPPC_64  -> panic "targetVirtualRegSqueeze ArchPPC_64"

-      ArchARM _ _ -> panic "targetVirtualRegSqueeze ArchARM"

-      ArchUnknown -> panic "targetVirtualRegSqueeze ArchUnknown"

+      ArchX86       -> X86.virtualRegSqueeze

+      ArchX86_64    -> X86.virtualRegSqueeze

+      ArchPPC       -> PPC.virtualRegSqueeze

+      ArchSPARC     -> SPARC.virtualRegSqueeze

+      ArchPPC_64    -> panic "targetVirtualRegSqueeze ArchPPC_64"

+      ArchARM _ _ _ -> panic "targetVirtualRegSqueeze ArchARM"

+      ArchUnknown   -> panic "targetVirtualRegSqueeze ArchUnknown"

 targetRealRegSqueeze :: Platform -> RegClass -> RealReg -> FastInt

 targetRealRegSqueeze platform

     = case platformArch platform of

-      ArchX86     -> X86.realRegSqueeze

-      ArchX86_64  -> X86.realRegSqueeze

-      ArchPPC     -> PPC.realRegSqueeze

-      ArchSPARC   -> SPARC.realRegSqueeze

-      ArchPPC_64  -> panic "targetRealRegSqueeze ArchPPC_64"

-      ArchARM _ _ -> panic "targetRealRegSqueeze ArchARM"

-      ArchUnknown -> panic "targetRealRegSqueeze ArchUnknown"

+      ArchX86       -> X86.realRegSqueeze

+      ArchX86_64    -> X86.realRegSqueeze

+      ArchPPC       -> PPC.realRegSqueeze

+      ArchSPARC     -> SPARC.realRegSqueeze

+      ArchPPC_64    -> panic "targetRealRegSqueeze ArchPPC_64"

+      ArchARM _ _ _ -> panic "targetRealRegSqueeze ArchARM"

+      ArchUnknown   -> panic "targetRealRegSqueeze ArchUnknown"

 targetClassOfRealReg :: Platform -> RealReg -> RegClass

 targetClassOfRealReg platform

     = case platformArch platform of

-      ArchX86     -> X86.classOfRealReg

-      ArchX86_64  -> X86.classOfRealReg

-      ArchPPC     -> PPC.classOfRealReg

-      ArchSPARC   -> SPARC.classOfRealReg

-      ArchPPC_64  -> panic "targetClassOfRealReg ArchPPC_64"

-      ArchARM _ _ -> panic "targetClassOfRealReg ArchARM"

-      ArchUnknown -> panic "targetClassOfRealReg ArchUnknown"

+      ArchX86       -> X86.classOfRealReg

+      ArchX86_64    -> X86.classOfRealReg

+      ArchPPC       -> PPC.classOfRealReg

+      ArchSPARC     -> SPARC.classOfRealReg

+      ArchPPC_64    -> panic "targetClassOfRealReg ArchPPC_64"

+      ArchARM _ _ _ -> panic "targetClassOfRealReg ArchARM"

+      ArchUnknown   -> panic "targetClassOfRealReg ArchUnknown"

 -- TODO: This should look at targetPlatform too

 targetWordSize :: Size

@@ -87,24 +87,24 @@ targetWordSize = intSize wordWidth

 targetMkVirtualReg :: Platform -> Unique -> Size -> VirtualReg

 targetMkVirtualReg platform

     = case platformArch platform of

-      ArchX86     -> X86.mkVirtualReg

-      ArchX86_64  -> X86.mkVirtualReg

-      ArchPPC     -> PPC.mkVirtualReg

-      ArchSPARC   -> SPARC.mkVirtualReg

-      ArchPPC_64  -> panic "targetMkVirtualReg ArchPPC_64"

-      ArchARM _ _ -> panic "targetMkVirtualReg ArchARM"

-      ArchUnknown -> panic "targetMkVirtualReg ArchUnknown"

+      ArchX86       -> X86.mkVirtualReg

+      ArchX86_64    -> X86.mkVirtualReg

+      ArchPPC       -> PPC.mkVirtualReg

+      ArchSPARC     -> SPARC.mkVirtualReg

+      ArchPPC_64    -> panic "targetMkVirtualReg ArchPPC_64"

+      ArchARM _ _ _ -> panic "targetMkVirtualReg ArchARM"

+      ArchUnknown   -> panic "targetMkVirtualReg ArchUnknown"

 targetRegDotColor :: Platform -> RealReg -> SDoc

 targetRegDotColor platform

     = case platformArch platform of

-      ArchX86     -> X86.regDotColor platform

-      ArchX86_64  -> X86.regDotColor platform

-      ArchPPC     -> PPC.regDotColor

-      ArchSPARC   -> SPARC.regDotColor

-      ArchPPC_64  -> panic "targetRegDotColor ArchPPC_64"

-      ArchARM _ _ -> panic "targetRegDotColor ArchARM"

-      ArchUnknown -> panic "targetRegDotColor ArchUnknown"

+      ArchX86       -> X86.regDotColor platform

+      ArchX86_64    -> X86.regDotColor platform

+      ArchPPC       -> PPC.regDotColor

+      ArchSPARC     -> SPARC.regDotColor

+      ArchPPC_64    -> panic "targetRegDotColor ArchPPC_64"

+      ArchARM _ _ _ -> panic "targetRegDotColor ArchARM"

+      ArchUnknown   -> panic "targetRegDotColor ArchUnknown"

 targetClassOfReg :: Platform -> Reg -> RegClass

diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs

index 47dd779..8252621 100644

--- a/compiler/utils/Platform.hs

+++ b/compiler/utils/Platform.hs

@@ -7,6 +7,7 @@ module Platform (

         OS(..),

         ArmISA(..),

         ArmISAExt(..),

+        ArmABI(..),

         target32Bit,

         osElfTarget

@@ -41,7 +42,9 @@ data Arch

         | ArchSPARC

         | ArchARM

           { armISA    :: ArmISA

-          , armISAExt :: [ArmISAExt] }

+          , armISAExt :: [ArmISAExt]

+          , armABI    :: ArmABI

+          }

         deriving (Read, Show, Eq)

@@ -61,7 +64,7 @@ data OS

         | OSHaiku

         deriving (Read, Show, Eq)

--- | ARM Instruction Set Architecture and Extensions

+-- | ARM Instruction Set Architecture, Extensions and ABI

 --

 data ArmISA

     = ARMv5

@@ -77,6 +80,11 @@ data ArmISAExt

     | IWMMX2

     deriving (Read, Show, Eq)

+data ArmABI

+    = SOFT

+    | SOFTFP

+    | HARD

+    deriving (Read, Show, Eq)

 target32Bit :: Platform -> Bool

 target32Bit p = platformWordSize p == 4

diff --git a/config.guess b/config.guess

index 463a03a..d622a44 100644

--- a/config.guess

+++ b/config.guess

@@ -1,10 +1,10 @@

 #! /bin/sh

 # Attempt to guess a canonical system name.

 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

-#   Free Software Foundation, Inc.

+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

+#   2011, 2012 Free Software Foundation, Inc.

-timestamp='2008-11-15'

+timestamp='2012-02-10'

 # This file is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by

@@ -17,9 +17,7 @@ timestamp='2008-11-15'

 # General Public License for more details.

 #

 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software

-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA

-# 02110-1301, USA.

+# along with this program; if not, see <http://www.gnu.org/licenses/>.

 #

 # As a special exception to the GNU General Public License, if you

 # distribute this file as part of a program that contains a

@@ -27,16 +25,16 @@ timestamp='2008-11-15'

 # the same distribution terms that you use for the rest of that program.

-# Originally written by Per Bothner <per@bothner.com>.

-# Please send patches to <config-patches@gnu.org>.  Submit a context

-# diff and a properly formatted ChangeLog entry.

+# Originally written by Per Bothner.  Please send patches (context

+# diff format) to <config-patches@gnu.org> and include a ChangeLog

+# entry.

 #

 # This script attempts to guess a canonical system name similar to

 # config.sub.  If it succeeds, it prints the system name on stdout, and

 # exits with 0.  Otherwise, it exits with 1.

 #

-# The plan is that this can be called by configure scripts if you

-# don't specify an explicit build system type.

+# You can get the latest version of this script from:

+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

 me=`echo "$0" | sed -e 's,.*/,,'`

@@ -56,8 +54,9 @@ version="\

 GNU config.guess ($timestamp)

 Originally written by Per Bothner.

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,

-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012

+Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO

 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

     *:NetBSD:*:*)

 	# NetBSD (nbsd) targets should (where applicable) match one or

-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,

+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,

 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently

 	# switched to ELF, *-*-netbsd* would select the old

 	# object file format.  This provides both forward

@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)

 		eval $set_cc_for_build

 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \

-			| grep __ELF__ >/dev/null

+			| grep -q __ELF__

 		then

 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).

 		    # Return netbsd for either.  FIX?

@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

 		fi

 		;;

 	    *)

-	        os=netbsd

+		os=netbsd

 		;;

 	esac

 	# The OS release

@@ -223,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`

 		;;

 	*5.*)

-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

 		;;

 	esac

 	# According to Compaq, /usr/sbin/psrinfo has been available on

@@ -269,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

 	# A Xn.n version is an unreleased experimental baselevel.

 	# 1.2 uses "1.2" for uname -r.

 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

-	exit ;;

+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.

+	exitcode=$?

+	trap '' 0

+	exit $exitcode ;;

     Alpha\ *:Windows_NT*:*)

 	# How do we know it's Interix rather than the generic POSIX subsystem?

 	# Should we change UNAME_MACHINE based on the output of uname instead

@@ -295,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

 	echo s390-ibm-zvmoe

 	exit ;;

     *:OS400:*:*)

-        echo powerpc-ibm-os400

+	echo powerpc-ibm-os400

 	exit ;;

     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

 	echo arm-acorn-riscix${UNAME_RELEASE}

@@ -324,12 +326,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

 	case `/usr/bin/uname -p` in

 	    sparc) echo sparc-icl-nx7; exit ;;

 	esac ;;

+    s390x:SunOS:*:*)

+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

+	exit ;;

     sun4H:SunOS:5.*:*)

 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

 	exit ;;

     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)

 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

 	exit ;;

+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)

+	echo i386-pc-auroraux${UNAME_RELEASE}

+	exit ;;

     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

 	eval $set_cc_for_build

 	SUN_ARCH="i386"

@@ -337,17 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.

 	# This test works for both compilers.

 	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then

-            # bash is not able to generate correct code here

-            # i.e. it leaves \ns there

-            # so we need to use /usr/bin/echo to get what we want

-            # note that if config.guess is run by /bin/sh then

-            # this works as expected even without /usr/bin/echo

-            # but the problem is that configure is clever enough

-            # to find bash installed and then runs config.guess

-            # by bash instead of by /bin/sh

-            # It seems that using /usr/bin/echo here is the most

-            # portable Solaris fix

-	    if /usr/bin/echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \

+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \

 		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \

 		grep IS_64BIT_ARCH >/dev/null

 	    then

@@ -398,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

     # MiNT.  But MiNT is downward compatible to TOS, so this should

     # be no problem.

     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)

-        echo m68k-atari-mint${UNAME_RELEASE}

+	echo m68k-atari-mint${UNAME_RELEASE}

 	exit ;;

     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)

 	echo m68k-atari-mint${UNAME_RELEASE}

-        exit ;;

+	exit ;;

     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)

-        echo m68k-atari-mint${UNAME_RELEASE}

+	echo m68k-atari-mint${UNAME_RELEASE}

 	exit ;;

     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)

-        echo m68k-milan-mint${UNAME_RELEASE}

-        exit ;;

+	echo m68k-milan-mint${UNAME_RELEASE}

+	exit ;;

     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)

-        echo m68k-hades-mint${UNAME_RELEASE}

-        exit ;;

+	echo m68k-hades-mint${UNAME_RELEASE}

+	exit ;;

     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

-        echo m68k-unknown-mint${UNAME_RELEASE}

-        exit ;;

+	echo m68k-unknown-mint${UNAME_RELEASE}

+	exit ;;

     m68k:machten:*:*)

 	echo m68k-apple-machten${UNAME_RELEASE}

 	exit ;;

@@ -484,8 +482,8 @@ EOF

 	echo m88k-motorola-sysv3

 	exit ;;

     AViiON:dgux:*:*)

-        # DG/UX returns AViiON for all architectures

-        UNAME_PROCESSOR=`/usr/bin/uname -p`

+	# DG/UX returns AViiON for all architectures

+	UNAME_PROCESSOR=`/usr/bin/uname -p`

 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]

 	then

 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \

@@ -498,7 +496,7 @@ EOF

 	else

 	    echo i586-dg-dgux${UNAME_RELEASE}

 	fi

- 	exit ;;

+	exit ;;

     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)

 	echo m88k-dolphin-sysv3

 	exit ;;

@@ -555,7 +553,7 @@ EOF

 		echo rs6000-ibm-aix3.2

 	fi

 	exit ;;

-    *:AIX:*:[456])

+    *:AIX:*:[4567])

 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`

 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then

 		IBM_ARCH=rs6000

@@ -598,52 +596,52 @@ EOF

 	    9000/[678][0-9][0-9])

 		if [ -x /usr/bin/getconf ]; then

 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`

-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

-                    case "${sc_cpu_version}" in

-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

-                      532)                      # CPU_PA_RISC2_0

-                        case "${sc_kernel_bits}" in

-                          32) HP_ARCH="hppa2.0n" ;;

-                          64) HP_ARCH="hppa2.0w" ;;

+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

+		    case "${sc_cpu_version}" in

+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

+		      532)                      # CPU_PA_RISC2_0

+			case "${sc_kernel_bits}" in

+			  32) HP_ARCH="hppa2.0n" ;;

+			  64) HP_ARCH="hppa2.0w" ;;

 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20

-                        esac ;;

-                    esac

+			esac ;;

+		    esac

 		fi

 		if [ "${HP_ARCH}" = "" ]; then

 		    eval $set_cc_for_build

-		    sed 's/^              //' << EOF >$dummy.c

+		    sed 's/^		//' << EOF >$dummy.c

-              #define _HPUX_SOURCE

-              #include <stdlib.h>

-              #include <unistd.h>

+		#define _HPUX_SOURCE

+		#include <stdlib.h>

+		#include <unistd.h>

-              int main ()

-              {

-              #if defined(_SC_KERNEL_BITS)

-                  long bits = sysconf(_SC_KERNEL_BITS);

-              #endif

-                  long cpu  = sysconf (_SC_CPU_VERSION);

+		int main ()

+		{

+		#if defined(_SC_KERNEL_BITS)

+		    long bits = sysconf(_SC_KERNEL_BITS);

+		#endif

+		    long cpu  = sysconf (_SC_CPU_VERSION);

-                  switch (cpu)

-              	{

-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

-              	case CPU_PA_RISC2_0:

-              #if defined(_SC_KERNEL_BITS)

-              	    switch (bits)

-              		{

-              		case 64: puts ("hppa2.0w"); break;

-              		case 32: puts ("hppa2.0n"); break;

-              		default: puts ("hppa2.0"); break;

-              		} break;

-              #else  /* !defined(_SC_KERNEL_BITS) */

-              	    puts ("hppa2.0"); break;

-              #endif

-              	default: puts ("hppa1.0"); break;

-              	}

-                  exit (0);

-              }

+		    switch (cpu)

+			{

+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

+			case CPU_PA_RISC2_0:

+		#if defined(_SC_KERNEL_BITS)

+			    switch (bits)

+				{

+				case 64: puts ("hppa2.0w"); break;

+				case 32: puts ("hppa2.0n"); break;

+				default: puts ("hppa2.0"); break;

+				} break;

+		#else  /* !defined(_SC_KERNEL_BITS) */

+			    puts ("hppa2.0"); break;

+		#endif

+			default: puts ("hppa1.0"); break;

+			}

+		    exit (0);

+		}

 EOF

 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`

 		    test -z "$HP_ARCH" && HP_ARCH=hppa

@@ -663,7 +661,7 @@ EOF

 	    # => hppa64-hp-hpux11.23

 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |

-		grep __LP64__ >/dev/null

+		grep -q __LP64__

 	    then

 		HP_ARCH="hppa2.0w"

 	    else

@@ -734,22 +732,22 @@ EOF

 	exit ;;

     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)

 	echo c1-convex-bsd

-        exit ;;

+	exit ;;

     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)

 	if getsysinfo -f scalar_acc

 	then echo c32-convex-bsd

 	else echo c2-convex-bsd

 	fi

-        exit ;;

+	exit ;;

     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)

 	echo c34-convex-bsd

-        exit ;;

+	exit ;;

     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)

 	echo c38-convex-bsd

-        exit ;;

+	exit ;;