Engage x86 assembler in Mac OS X build.

11 files changed, 33 insertions, 0 deletions

diff --git a/crypto/Makefile b/crypto/Makefile
index af2cac96d4..64a3d65440 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -64,6 +64,8 @@ x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
 	$(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
 x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl
 	$(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) > $@
+x86cpuid-macosx.s: x86cpuid.pl perlasm/x86asm.pl
+	$(PERL) x86cpuid.pl macosx $(CFLAGS) $(PROCESSOR) > $@
 
 applink.o:	$(TOP)/ms/applink.c
 	$(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/applink.c
diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index 21c39d56ab..353778d4be 100644
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -56,6 +56,8 @@ ax86-cof.s: asm/aes-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) aes-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
 ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
+ax86-macosx.s: asm/aes-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) aes-586.pl macosx $(CFLAGS) $(PROCESSOR) > ../$@)
 
 aes-x86_64.s: asm/aes-x86_64.pl
 	$(PERL) asm/aes-x86_64.pl $@
diff --git a/crypto/bf/Makefile b/crypto/bf/Makefile
index 8441954a8d..9f255efcaa 100644
--- a/crypto/bf/Makefile
+++ b/crypto/bf/Makefile
@@ -53,6 +53,8 @@ bx86-cof.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 # a.out
 bx86-out.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) bf-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
+bx86-macosx.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+	(cd asm; $(PERL) bf-586.pl macosx $(CFLAGS) $(PROCESSOR) > ../$@)
 
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 2cc6fd6a05..c10348b34b 100644
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -83,6 +83,12 @@ co86-out.s: asm/co-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) co-586.pl a.out $(CFLAGS) > ../$@)
 mo86-out.s: asm/x86-mont.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) x86-mont.pl a.out $(CFLAGS) > ../$@)
+bn86-macosx.s: asm/bn-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) bn-586.pl macosx $(CFLAGS) > ../$@)
+co86-macosx.s: asm/co-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) co-586.pl macosx $(CFLAGS) > ../$@)
+mo86-macosx.s: asm/bn-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) x86-mont.pl macosx $(CFLAGS) > ../$@)
 
 sparcv8.o:	asm/sparcv8.S
 	$(CC) $(CFLAGS) -c asm/sparcv8.S
diff --git a/crypto/cast/Makefile b/crypto/cast/Makefile
index 149956ee90..baf91dd408 100644
--- a/crypto/cast/Makefile
+++ b/crypto/cast/Makefile
@@ -51,6 +51,8 @@ cx86-cof.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 # a.out
 cx86-out.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) cast-586.pl a.out $(CLAGS) $(PROCESSOR) > ../$@)
+cx86-macosx.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+	(cd asm; $(PERL) cast-586.pl macosx $(CLAGS) $(PROCESSOR) > ../$@)
 
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index 38409ca6d1..74a556b01d 100644
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -79,6 +79,10 @@ dx86-out.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) des-586.pl a.out $(CFLAGS) > ../$@)
 yx86-out.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) crypt586.pl a.out $(CFLAGS) > ../$@)
+dx86-macosx.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+	(cd asm; $(PERL) des-586.pl macosx $(CFLAGS) > ../$@)
+yx86-macosx.s:	asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+	(cd asm; $(PERL) crypt586.pl macosx $(CFLAGS) > ../$@)
 
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
diff --git a/crypto/md5/Makefile b/crypto/md5/Makefile
index 20259c3462..979f6f2a63 100644
--- a/crypto/md5/Makefile
+++ b/crypto/md5/Makefile
@@ -51,6 +51,8 @@ mx86-cof.s: asm/md5-586.pl ../perlasm/x86asm.pl
 # a.out
 mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@)
+mx86-macosx.s: asm/md5-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) md5-586.pl macosx $(CFLAGS) > ../$@)
 
 md5-x86_64.s:	asm/md5-x86_64.pl;	$(PERL) asm/md5-x86_64.pl $@
 
diff --git a/crypto/rc4/Makefile b/crypto/rc4/Makefile
index dcc6d2c816..e71f8ae90e 100644
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -50,6 +50,8 @@ rx86-cof.s: asm/rc4-586.pl ../perlasm/x86asm.pl
 # a.out
 rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@)
+rx86-macosx.s: asm/rc4-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) rc4-586.pl macosx $(CFLAGS) > ../$@)
 
 rc4-x86_64.s: asm/rc4-x86_64.pl;	$(PERL) asm/rc4-x86_64.pl $@
 
diff --git a/crypto/ripemd/Makefile b/crypto/ripemd/Makefile
index d55875c20c..55fda567a6 100644
--- a/crypto/ripemd/Makefile
+++ b/crypto/ripemd/Makefile
@@ -51,6 +51,8 @@ rm86-cof.s: asm/rmd-586.pl ../perlasm/x86asm.pl
 # a.out
 rm86-out.s: asm/rmd-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) rmd-586.pl a.out $(CFLAGS) > ../$@)
+rm86-macosx.s:	asm/rmd-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) rmd-586.pl macosx $(CFLAGS) > ../$@)
 
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
index 763b2aad65..16f50ad6aa 100644
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -64,6 +64,13 @@ sha256x86-out.s:	asm/sha256-586.pl ../perlasm/x86asm.pl
 sha512x86-out.s:	asm/sha512-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) sha512-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
 
+sx86-macosx.s:	asm/sha1-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) sha1-586.pl macosx $(CFLAGS) $(PROCESSOR) > ../$@)
+sha256x86-macosx.s:	asm/sha256-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) sha256-586.pl macosx $(CFLAGS) $(PROCESSOR) > ../$@)
+sha512x86-macosx.s:	asm/sha512-586.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) sha512-586.pl macosx $(CFLAGS) $(PROCESSOR) > ../$@)
+
 sha1-ia64.s:   asm/sha1-ia64.pl
 	(cd asm; $(PERL) sha1-ia64.pl $(CFLAGS) ) > $@
 sha256-ia64.s: asm/sha512-ia64.pl
diff --git a/crypto/whrlpool/Makefile b/crypto/whrlpool/Makefile
index c0120a845a..89b0ad7054 100644
--- a/crypto/whrlpool/Makefile
+++ b/crypto/whrlpool/Makefile
@@ -48,6 +48,8 @@ w86mmx-cof.s: asm/wp-mmx.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) wp-mmx.pl coff $(CFLAGS) $(PROCESSOR)) > $@
 w86mmx-out.s: asm/wp-mmx.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) wp-mmx.pl a.out $(CFLAGS) $(PROCESSOR)) > $@
+w86mmx-macosx.s: asm/wp-mmx.pl ../perlasm/x86asm.pl
+	(cd asm; $(PERL) wp-mmx.pl macosx $(CFLAGS) $(PROCESSOR)) > $@
 
 wp-x86_64.s: asm/wp-x86_64.pl
 	$(PERL) asm/wp-x86_64.pl $@