diff options
| author | christophe.ravel.bugs%sun.com <devnull@localhost> | 2006-05-12 02:38:33 +0000 |
|---|---|---|
| committer | christophe.ravel.bugs%sun.com <devnull@localhost> | 2006-05-12 02:38:33 +0000 |
| commit | 818a1554fa8da6e7dc02629c3f0693c2101a3890 (patch) | |
| tree | 8bb49bbfc45dfa888498ed8cc754a5680aa16f89 | |
| parent | a93bc30c55879e66fbdb9f6041e0e744c66a39e5 (diff) | |
| parent | 77b552e2fcffd652255b3588c485a8d80022ffaf (diff) | |
| download | nss-hg-818a1554fa8da6e7dc02629c3f0693c2101a3890.tar.gz | |
version 3.11.5 release candidate 1 for FIPS.
| -rw-r--r-- | security/nss/lib/freebl/Makefile | 18 | ||||
| -rw-r--r-- | security/nss/lib/nss/nss.h | 6 |
2 files changed, 6 insertions, 18 deletions
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile index 23d3b0277..d4203b78c 100644 --- a/security/nss/lib/freebl/Makefile +++ b/security/nss/lib/freebl/Makefile @@ -132,7 +132,7 @@ ifeq ($(CPU_ARCH),x86_64) DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY DEFINES += -DNSS_USE_COMBA DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN -# DEFINES += -DMPI_AMD64_ADD +# DEFINES += -DMPI_AMD64_ADD MPI_SRCS += mpi_amd64.c mp_comba.c endif ifeq ($(CPU_ARCH),x86) @@ -253,18 +253,6 @@ ifeq ($(CPU_ARCH),sparc) SOLARIS_AS_FLAGS = -xarch=v9a -K PIC endif else # NS_USE_GCC - # FPU_TARGET_OPTIMIZER specifies the target processor and cache - # properties of the ABI32_FPU and ABI64_FPU architectures for use - # by the optimizer. - ifeq (,$(findstring Sun WorkShop 6,$(shell $(CC) -V 2>&1))) - # if the compiler is not Forte 6 - FPU_TARGET_OPTIMIZER = -xcache=64/32/4:1024/64/4 -xchip=ultra3 - else - # Forte 6 C compiler generates incorrect code for rijndael.c - # if -xchip=ultra3 is used (Bugzilla bug 333925). So we revert - # to what we used in NSS 3.10. - FPU_TARGET_OPTIMIZER = -xchip=ultra2 - endif ifdef USE_ABI32_INT32 #ARCHFLAG=-xarch=v8 set in coreconf/sunOS5.mk endif @@ -285,7 +273,7 @@ ifeq ($(CPU_ARCH),sparc) # the generated flag settings SOL_CFLAGS += -D__MATHERR_ERRNO_DONTCARE -fns -fsimple=2 -fsingle SOL_CFLAGS += -xalias_level=basic -xbuiltin=%all - SOL_CFLAGS += $(FPU_TARGET_OPTIMIZER) -xdepend + SOL_CFLAGS += -xcache=64/32/4:1024/64/4 -xchip=ultra3 -xdepend SOL_CFLAGS += -xlibmil -xmemalign=8s -xO5 ARCHFLAG = -xarch=v8plusa SOLARIS_AS_FLAGS = -xarch=v8plusa -K PIC @@ -303,7 +291,7 @@ ifeq ($(CPU_ARCH),sparc) # See comment for USE_ABI32_FPU. SOL_CFLAGS += -D__MATHERR_ERRNO_DONTCARE -fns -fsimple=2 -fsingle SOL_CFLAGS += -xalias_level=basic -xbuiltin=%all - SOL_CFLAGS += $(FPU_TARGET_OPTIMIZER) -xdepend + SOL_CFLAGS += -xcache=64/32/4:1024/64/4 -xchip=ultra3 -xdepend SOL_CFLAGS += -xlibmil -xmemalign=8s -xO5 ARCHFLAG = -xarch=v9a SOLARIS_AS_FLAGS = -xarch=v9a -K PIC diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index ce79bbe10..a1362f7c3 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -53,13 +53,13 @@ SEC_BEGIN_PROTOS * "<major version>.<minor version>[.<patch level>] [<Beta>]" */ #ifdef NSS_ENABLE_ECC -#define NSS_VERSION "3.11.1 ECC" +#define NSS_VERSION "3.11.5 ECC" #else -#define NSS_VERSION "3.11.1" +#define NSS_VERSION "3.11.5" #endif #define NSS_VMAJOR 3 #define NSS_VMINOR 11 -#define NSS_VPATCH 1 +#define NSS_VPATCH 5 #define NSS_BETA PR_FALSE /* |