[pkgsrc/trunk]: pkgsrc/mk correct MACHINE_ARCH and compiler flags for HP-UX 6...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61ab751cef91
branches:  trunk
changeset: 650852:61ab751cef91
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Apr 27 10:33:49 2015 +0000

description:
correct MACHINE_ARCH and compiler flags for HP-UX 64-bit ABI

diffstat:

 mk/bsd.prefs.mk    |  18 ++++++++++++------
 mk/compiler/gcc.mk |  13 ++++++++++---
 2 files changed, 22 insertions(+), 9 deletions(-)

diffs (67 lines):

diff -r 8347e5bd1a3e -r 61ab751cef91 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Mon Apr 27 10:26:19 2015 +0000
+++ b/mk/bsd.prefs.mk   Mon Apr 27 10:33:49 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.362 2015/04/19 01:37:55 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.363 2015/04/27 10:33:49 tnn Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -281,9 +281,12 @@
 
 .elif ${OPSYS} == "HPUX"
 OS_VERSION:=           ${OS_VERSION:C/^B.//}
-.if ${MACHINE_ARCH} == "9000"
-MACHINE_ARCH=          hppa
-.endif
+.  if ${MACHINE_ARCH} == "9000"
+ABI?=                  32
+MACHINE_ARCH.32=       hppa
+MACHINE_ARCH.64=       hppa64
+MACHINE_ARCH=          ${MACHINE_ARCH.${ABI}}
+.  endif
 LOWER_OPSYS?=          hpux
 LOWER_OPSYS_VERSUFFIX?=        ${OS_VERSION}
 LOWER_VENDOR?=         hp
@@ -417,9 +420,12 @@
 .elif ${OPSYS} == "OSF1"
 OBJECT_FMT=    ECOFF
 .elif ${OPSYS} == "HPUX"
-.  if ${MACHINE_ARCH} == "ia64" || (defined(ABI) && ${ABI} == "64")
+.  if ${MACHINE_ARCH} == "ia64"
 OBJECT_FMT=    ELF
-.  else
+.  elif ${MACHINE_ARCH} == "hppa64"
+# it is ELF but for most purposes behaves like SOM (.sl suffix, ...)
+OBJECT_FMT=    SOM
+.  else # hppa
 OBJECT_FMT=    SOM
 .  endif
 .elif ${OPSYS} == "Cygwin"
diff -r 8347e5bd1a3e -r 61ab751cef91 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Mon Apr 27 10:26:19 2015 +0000
+++ b/mk/compiler/gcc.mk        Mon Apr 27 10:33:49 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.160 2015/04/25 10:33:29 wiz Exp $
+# $NetBSD: gcc.mk,v 1.161 2015/04/27 10:33:49 tnn Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -786,8 +786,15 @@
 IMAKEOPTS+=    -DHasGcc2=YES -DHasGcc2ForCplusplus=YES
 .endif
 
-_COMPILER_ABI_FLAG.32=  -m32
-_COMPILER_ABI_FLAG.64=  -m64
+# On HP-UX the GCC toolchain must be specifically targeted to an ABI,
+# -m32 or -m64 are not recognized.
+.if ${OPSYS} == "HPUX"
+_COMPILER_ABI_FLAG.32= # empty
+_COMPILER_ABI_FLAG.64= # empty
+.else
+_COMPILER_ABI_FLAG.32= -m32
+_COMPILER_ABI_FLAG.64= -m64
+.endif
 
 .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
 .  if exists(${CCPATH})