1 files changed, 7 insertions, 6 deletions

diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index b3bd96bbfc..25a3703c1f 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -134,7 +134,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
         HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         case "$HPUXVER" in
             1[0-9].*)   # HPUX 10 and 11 targets are unified
-                echo "${MACHINE}-hp-hpux10"; exit 0
+                echo "${MACHINE}-hp-hpux1x"; exit 0
                 ;;
             *)
                 echo "${MACHINE}-hp-hpux"; exit 0
@@ -410,9 +410,10 @@ if [ "$SYSTEM" = "HP-UX" ];then
   GCC_BITS="32"
   if [ $GCCVER -ge 30 ]; then
     # PA64 support only came in with gcc 3.0.x.
-    # We look for the preprocessor symbol __LP64__ indicating
-    # 64bit bit long and pointer.  sizeof(int) == 32 on HPUX64.
-    if gcc -v -E -x c /dev/null 2>&1 | grep __LP64__ > /dev/null; then
+    # We check if the preprocessor symbol __LP64__ is defined...
+    if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
+      : # __LP64__ has slipped through, it therefore is not defined
+    else
       GCC_BITS="64"
     fi
   fi
@@ -685,7 +686,7 @@ EOF
         if [ $CC = "gcc" ];
         then
           if [ $GCC_BITS = "64" ]; then
-            OUT="hpux64-parisc-gcc"
+            OUT="hpux64-parisc2-gcc"
           else
             OUT="hpux-parisc-gcc"
           fi
@@ -700,7 +701,7 @@ EOF
         if   [ $CPU_VERSION -ge 768 ]; then     # IA-64 CPU
              echo "WARNING! 64-bit ABI is the default configured ABI on HP-UXi."
              echo "         If you wish to build 32-bit library, the you have to"
-             echo "         invoke './Configure hpux-ia32-cc' *manually*."
+             echo "         invoke './Configure hpux-ia64-cc' *manually*."
              if [ "$TEST" = "false" ]; then
                 echo "         You have about 5 seconds to press Ctrl-C to abort."
                 (stty -icanon min 0 time 50; read waste) < /dev/tty