From 5d439d69552e753debc48461293517b66b0b94b4 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Thu, 17 Feb 2011 19:03:52 +0000
Subject: Make -DOPENSSL_FIPSSYMS work for assembly language builds.

---
 Makefile.fips | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Makefile.fips')

diff --git a/Makefile.fips b/Makefile.fips
index 2344a5823a..f8307cbf69 100644
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -78,7 +78,7 @@ LIBDIR=lib
 # dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
 # gcc, then the driver will automatically translate it to -xarch=v8plus
 # and pass it down to assembler.
-AS=$(CC) -c
+#AS=$(CC) -c
 ASFLAG=$(CFLAG)
 
 # For x86 assembler: Set PROCESSOR to 386 if you want to support
@@ -205,7 +205,7 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 
 BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
-		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
+		ASFLAG='$(CFLAG) -c'			\
 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
 		CROSS_COMPILE='$(CROSS_COMPILE)'	\
 		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\
@@ -367,6 +367,11 @@ build_crypto:
 	else \
 		ARX='${AR}' ; \
 	fi ; export ARX ; \
+	if [ $(FIPSCANISTERINTERNAL) = "y" ]; then \
+		AS='$(PERL) $${TOP}/util/fipsas.pl $${TOP} $${<} $(CC)' ; \
+	else \
+		AS='$(CC) -c' ; \
+	fi ; export AS ; \
 		dir=crypto; target=all; $(BUILD_ONE_CMD)
 build_ssl:
 	@dir=ssl; target=all; $(BUILD_ONE_CMD)
-- 
cgit v1.2.3