Bugzilla Bug 312202: use the _32 tag in 32-bit HP-UX IPF builds. Use the

$ORIGIN linker keyword when building shared libraries and executable
programs on HP-UX IPF. r=nelsonb.
Modified Files: coreconf/HP-UX.mk nss/cmd/platlibs.mk

security/coreconf/HP-UX.mk

@@ -43,11 +43,16 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk
 
 DEFAULT_COMPILER = cc
 
-CPU_ARCH   = hppa
 ifeq ($(OS_TEST),ia64)
-DLL_SUFFIX = so
+	CPU_ARCH = ia64
+	CPU_TAG = _$(CPU_ARCH)
+	ifneq ($(USE_64),1)
+		64BIT_TAG = _32
+	endif
+	DLL_SUFFIX = so
 else
-DLL_SUFFIX = sl
+	CPU_ARCH = hppa
+	DLL_SUFFIX = sl
 endif
 CC         = cc
 CCC        = CC
@@ -79,6 +84,9 @@ PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
          sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@
 
 DSO_LDOPTS		= -b +h $(notdir $@)
+ifeq ($(OS_TEST),ia64)
+	DSO_LDOPTS	+= +b '$$ORIGIN'
+endif
 DSO_LDFLAGS		=
 
 # +Z generates position independent code for use in shared libraries.

security/nss/cmd/platlibs.mk

@@ -196,6 +196,12 @@ EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
 endif
 endif
 
+ifeq ($(OS_ARCH), HP-UX) 
+ifeq ($(OS_TEST), ia64)
+EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
+endif
+endif
+
 ifeq ($(OS_ARCH), Darwin)
 EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
 endif