bug 322576

1) +DSblended can be omitted entirely - it's the default on IA, and ignored on
PA
2) +DD64 is supported on both IA and PA for B.11.23
3) The $ORIGIN linker flag should be added to any B.11.11 or later linker - the
patch to the linker to support this on B.11.11 is pretty old and should be
applied by any customer wanting a supported HP-UX system.  If for some reason
they don't have the patch, the presence of $ORIGIN just causes a couple of
extra path lookups that fail - no big deal.

directory/c-sdk/build.mk

@@ -380,8 +380,11 @@ ifeq ($(OS_ARCH), HP-UX)
 # Use the C++ compiler to link
 USE_CCC_TO_LINK=1
 
-# include $ORIGIN in run time library path (works on HP-UX 11.23 and later)
-ifeq ($(OS_TEST),ia64)
+# include $ORIGIN in run time library path (works on HP-UX 11.11 with latest patches and later)
+ifeq ($(OS_RELEASE), B.11.11)
+RPATHFLAG := \$$ORIGIN/../lib:\$$ORIGIN/../../lib:$(RPATHFLAG)
+endif
+ifeq ($(OS_RELEASE), B.11.23)
 RPATHFLAG := \$$ORIGIN/../lib:\$$ORIGIN/../../lib:$(RPATHFLAG)
 endif
 
@@ -507,7 +510,7 @@ LINK_EXE        = $(CC_FOR_LINK) -Wl,-E $(ALDFLAGS) $(LDFLAGS) $(RPATHFLAG_PREFI
 
 ifeq ($(USE_64), 1)
 ifeq ($(OS_RELEASE), B.11.23)
-LINK_EXE        = $(CC_FOR_LINK) -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L  +DD64 +DSblended -Wl,-E $(ALDFLAGS) $(LDFLAGS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@ $(filter %.$(OBJ_SUFFIX),$^) $(OBJS) $(EXTRA_LIBS) $(PLATFORMLIBS)
+LINK_EXE        = $(CC_FOR_LINK) -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L  +DD64 -Wl,-E $(ALDFLAGS) $(LDFLAGS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@ $(filter %.$(OBJ_SUFFIX),$^) $(OBJS) $(EXTRA_LIBS) $(PLATFORMLIBS)
 else
 LINK_EXE        = $(CC_FOR_LINK) -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L  +DA2.0W +DS2.0 -Wl,-E $(ALDFLAGS) $(LDFLAGS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@ $(filter %.$(OBJ_SUFFIX),$^) $(OBJS) $(EXTRA_LIBS) $(PLATFORMLIBS)
 endif

directory/c-sdk/config/HP-UX.mk

@@ -181,10 +181,10 @@ ifeq ($(OS_RELEASE),B.11.23)
       ifneq ($(NS_USE_GCC), 1)
               CCC                             = /opt/aCC/bin/aCC -AP -ext
               ifeq ($(USE_64),1)
-                      OS_CFLAGS       += +DD64 +DSblended
+                      OS_CFLAGS       += +DD64
                       #COMPILER_TAG    = _64
               else
-                      OS_CFLAGS       += +DD32 +DSblended
+                      OS_CFLAGS       += +DD32
 ifeq ($(HAVE_CCONF), 1)
                       COMPILER_TAG    =
 else

directory/c-sdk/config/Makefile.client

@@ -85,9 +85,9 @@ endif
 ifeq ($(OS_ARCH), HP-UX)
     ifeq ($(OS_RELEASE), B.11.23)
        ifeq ($(USE_64),1)
-           XLDOPTS += +DD64 +DSblended
+           XLDOPTS += +DD64
        else
-           XLDOPTS += +DD32 +DSblended
+           XLDOPTS += +DD32
        endif
     else
     ifeq ($(USE_64),1)

directory/c-sdk/config/Makefile.in

@@ -93,9 +93,9 @@ endif
 ifeq ($(OS_ARCH), HP-UX)
     ifeq ($(OS_RELEASE), B.11.23)
        ifeq ($(USE_64),1)
-           XLDOPTS += +DD64 +DSblended
+           XLDOPTS += +DD64
        else
-           XLDOPTS += +DD32 +DSblended
+           XLDOPTS += +DD32
        endif
     else
        ifeq ($(USE_64),1)

directory/c-sdk/configure

@@ -7815,11 +7815,11 @@ _ACEOF
 
         if test -z "$GNU_CC"; then
             if test -z "$USE_64"; then
-                CFLAGS="$CFLAGS +DD32 +DSblended"
-                CXXFLAGS="$CXXFLAGS +DD32 +DSblended"
+                CFLAGS="$CFLAGS +DD32"
+                CXXFLAGS="$CXXFLAGS +DD32"
             else
-                CFLAGS="$CFLAGS +DD64 +DSblended"
-                CXXFLAGS="$CXXFLAGS +DD64 +DSblended"
+                CFLAGS="$CFLAGS +DD64"
+                CXXFLAGS="$CXXFLAGS +DD64"
             fi
         fi
         DEFAULT_IMPL_STRATEGY=_PTH
@@ -8904,6 +8904,7 @@ _ACEOF
     cat >>confdefs.h <<\_ACEOF
 #define HAVE_FCNTL_FILE_LOCKING 1
 _ACEOF
+
     if test -n "$GNU_CC" ; then
         if test -n "$USE_64"; then
             CC="$CC -m64"
@@ -8921,9 +8922,9 @@ _ACEOF
     else
         LD=/usr/ccs/bin/ld
         RANLIB=/usr/ccs/bin/ranlib
-        DSO_LDOPTS='-G -h $(notdir $@)'
+    	DSO_LDOPTS='-G -h $(notdir $@)'
         DSO_CFLAGS=-KPIC
-        if test -n "$USE_64"; then
+    	if test -n "$USE_64"; then
             CC="$CC -xarch=v9"
             CXX="$CXX -xarch=v9"
         fi
@@ -8934,7 +8935,6 @@ _ACEOF
             CXXFLAGS="$CXXFLAGS -xs"
         fi
     fi
-
     if test -z "$GNU_AS"; then
         ASFLAGS="$ASFLAGS -Wa,-P"
     fi

directory/c-sdk/configure.in

@@ -1087,11 +1087,11 @@ case "$target" in
         AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
         if test -z "$GNU_CC"; then
             if test -z "$USE_64"; then
-                CFLAGS="$CFLAGS +DD32 +DSblended"
-                CXXFLAGS="$CXXFLAGS +DD32 +DSblended"
+                CFLAGS="$CFLAGS +DD32"
+                CXXFLAGS="$CXXFLAGS +DD32"
             else
-                CFLAGS="$CFLAGS +DD64 +DSblended"
-                CXXFLAGS="$CXXFLAGS +DD64 +DSblended"
+                CFLAGS="$CFLAGS +DD64"
+                CXXFLAGS="$CXXFLAGS +DD64"
             fi
         fi
         DEFAULT_IMPL_STRATEGY=_PTH