Bug 858231 Refine HAVE_FREEBL_LIBS_32 into HAVE_FREEBL_LIBS_32INT32 and HAVE_FREEBL_LIBS_32FPU, and set only HAVE_FREEBL_LIBS_32FPU to 1 for 32-bit Solaris SPARC builds. r=ginn.chen

security/build/Makefile.in

@@ -58,7 +58,8 @@ ifeq ($(OS_ARCH), HP-UX)
 ifneq ($(OS_TEST), ia64)
 ifndef HAVE_64BIT_OS
 HAVE_FREEBL_LIBS =
-HAVE_FREEBL_LIBS_32 = 1
+HAVE_FREEBL_LIBS_32INT32 = 1
+HAVE_FREEBL_LIBS_32FPU = 1
 endif
 endif
 endif
@@ -71,7 +72,7 @@ HAVE_FREEBL_LIBS =
 HAVE_FREEBL_LIBS_64 = 1
 else
 HAVE_FREEBL_LIBS =
-HAVE_FREEBL_LIBS_32 = 1
+HAVE_FREEBL_LIBS_32FPU = 1
 HAVE_FREEBL_LIBS_32INT64 = 1
 endif
 endif
@@ -80,8 +81,10 @@ endif
 ifdef HAVE_FREEBL_LIBS
 NSS_EXTRA_DLLS += freebl3
 endif
-ifdef HAVE_FREEBL_LIBS_32
+ifdef HAVE_FREEBL_LIBS_32INT32
 NSS_EXTRA_DLLS += freebl_32int_3
+endif
+ifdef HAVE_FREEBL_LIBS_32FPU
 NSS_EXTRA_DLLS += freebl_32fpu_3
 endif
 ifdef HAVE_FREEBL_LIBS_32INT64