Turn on NSS_NO_INIT_SUPPORT for everythign except Linux.
authorRobert Relyea <rrelyea@redhat.com>
Thu, 03 Sep 2015 17:52:25 -0700
changeset 11585 9773b3e5fa193f9343e75379e79c2d5d1da3cd39
parent 11584 b09569fe53ddc8a768dc6b664426c3718292893e
child 11586 37b3809897288f7547715325a3c65342210d87ce
push id745
push userrrelyea@redhat.com
push dateFri, 04 Sep 2015 00:52:28 +0000
Turn on NSS_NO_INIT_SUPPORT for everythign except Linux. Do it in both freebl and softoken. Should fix the last of the tinderbox issues.
lib/freebl/Makefile
lib/softoken/Makefile
--- a/lib/freebl/Makefile
+++ b/lib/freebl/Makefile
@@ -96,16 +96,20 @@ ifdef FREEBL_USE_PRELINK
 	DEFINES += -DFREEBL_USE_PRELINK
 ifdef LINUX
 	DEFINES += -D__GNU_SOURCE=1
 endif
 endif
 ifdef NSS_NO_INIT_SUPPORT
     DEFINES += -DNSS_NO_INIT_SUPPORT
 endif
+ifneq ($(OS_TARGET),Linux)
+    # force no init support for everything but Linux
+    DEFINES += -DNSS_NO_INIT_SUPPORT
+endif
 
 ifdef FREEBL_PRELINK_COMMAND
 	DEFINES +=-DFREEBL_PRELINK_COMMAND=\"$(FREEBL_PRELINK_COMMAND)\"
 endif
 # NSS_X86 means the target is a 32-bits x86 CPU architecture
 # NSS_X64 means the target is a 64-bits 64 CPU architecture
 # NSS_X86_OR_X64 means the target is either x86 or x64
 ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH)))
@@ -196,17 +200,16 @@ ifeq ($(USE_N32),1)
 	ASFLAGS = -O -OPT:Olimit=4000 -dollar -fullwarn -xansi -n32 -mips3 
     endif
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
     DEFINES += -DMP_USE_UINT_DIGIT
 endif
 endif
 
 ifeq ($(OS_TARGET),Darwin)
-    DEFINES += -DNSS_NO_INIT_SUPPORT
 ifeq ($(CPU_ARCH),x86)
     ASFILES  = mpi_sse2.s
     DEFINES += -DMP_USE_UINT_DIGIT
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
     DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
 endif
 endif # Darwin
 
@@ -441,17 +444,16 @@ ifeq ($(CPU_ARCH),sparc)
 	ASFILES   = mpv_sparcv9.s montmulfv9.s
 	DEFINES  += -DMP_NO_MP_WORD -DMP_USE_UINT_DIGIT -DMP_ASSEMBLY_MULTIPLY
 	DEFINES  += -DMP_USING_MONT_MULF -DMP_MONT_USE_MP_MUL
 	ECL_USE_FP = 1
     endif
 
 else
     # Solaris for non-sparc family CPUs
-    DEFINES += -DNSS_NO_INIT_SUPPORT
     ifdef NS_USE_GCC
 	LD = gcc
 	AS = gcc
 	ASFLAGS = -x assembler-with-cpp
     endif
     ifeq ($(USE_64),1)
 	# Solaris for AMD64
 	ifdef NS_USE_GCC
--- a/lib/softoken/Makefile
+++ b/lib/softoken/Makefile
@@ -24,16 +24,19 @@ ifdef NSS_NO_INIT_SUPPORT
     DEFINES += -DNSS_NO_INIT_SUPPORT
 endif
 ifeq ($(OS_TARGET),Linux)
 ifeq ($(CPU_ARCH),ppc)
 ifdef USE_64
     DEFINES += -DNSS_NO_INIT_SUPPORT
 endif # USE_64
 endif # ppc
+else # !Linux
+    # turn off no init support everywhere for now
+    DEFINES += -DNSS_NO_INIT_SUPPORT
 endif # Linux
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include config.mk