diff options
| author | jpierre%netscape.com <devnull@localhost> | 2004-03-11 08:10:58 +0000 |
|---|---|---|
| committer | jpierre%netscape.com <devnull@localhost> | 2004-03-11 08:10:58 +0000 |
| commit | 870566e227d42f00c694897071de40341bcc8433 (patch) | |
| tree | 0586674205215154301ecefca7b1f8404ec33e9a | |
| parent | b0441310d43e56cf58f4ad38e2c3bb49b1630ddc (diff) | |
| parent | ba41921f9c68b28b9edf9980b432ffd6355e39a8 (diff) | |
| download | nss-hg-870566e227d42f00c694897071de40341bcc8433.tar.gz | |
Fix for bug 237068 - certutil crashes when NSS is built on Solaris 5.9 Sparc
| -rw-r--r-- | security/nss/lib/freebl/Makefile | 12 | ||||
| -rw-r--r-- | security/nss/lib/freebl/sparcfix.c | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile index c5b5a1299..f963c659d 100644 --- a/security/nss/lib/freebl/Makefile +++ b/security/nss/lib/freebl/Makefile @@ -140,17 +140,9 @@ ifdef USE_HYBRID OS_CFLAGS += -xchip=ultra2 endif endif -ifeq ($(OS_RELEASE),5.5.1) - SYSV_SPARC = 1 -endif -ifeq ($(OS_RELEASE),5.6) - SYSV_SPARC = 1 -endif -ifeq ($(OS_RELEASE),5.7) - SYSV_SPARC = 1 -endif -ifeq ($(OS_RELEASE),5.8) +ifeq (5.5.1,$(firstword $(sort 5.5.1 $(OS_RELEASE)))) SYSV_SPARC = 1 + OS_CFLAGS += /DNEW_SYSV_SPARC endif ifeq ($(SYSV_SPARC),1) SOLARIS_AS = /usr/ccs/bin/as diff --git a/security/nss/lib/freebl/sparcfix.c b/security/nss/lib/freebl/sparcfix.c index 6ebc41cf0..b97646fb9 100644 --- a/security/nss/lib/freebl/sparcfix.c +++ b/security/nss/lib/freebl/sparcfix.c @@ -34,8 +34,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#if defined(SOLARIS2_6) || defined(SOLARIS2_7) || defined(SOLARIS2_8) -#define NEW_SYSV_SPARC 1 +#ifdef NEW_SYSV_SPARC #include <gelf.h> #endif #include <libelf.h> |