From 6313567886a524f8ae8a9ffc97518b9bd84d730b Mon Sep 17 00:00:00 2001
From: magnum <magnum>
Date: Sat, 22 Oct 2011 12:31:12 +0200
Subject: [PATCH] j7: revides 64-32 targets so they match the native 32's

---
 src/Makefile |   29 +++++++++--------------------
 1 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index ab73783..fe67f53 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -145,7 +145,6 @@ default:
 #	@echo "linux-x86-64-32-sse2i    Linux, x86-64, 32-bit with SSE2 intrinsics (for regression tests)"
 #	@echo "linux-x86-64-32-mmx      Linux, x86-64, 32-bit with MMX (for regression tests)"
 #	@echo "linux-x86-64-32-any      Linux, x86-64, 32-bit (for regression tests)"
-#	@echo "linux-x86-64-32-clang    Linux, x86-64, 32-bit compiled with clang (for regression tests)"
 	@echo "linux-x86-sse2           Linux, x86 32-bit with SSE2 (best tested if 32-bit)"
 	@echo "linux-x86-sse2i          Linux, x86 32-bit with SSE2 (32-bit, intrinsic)"
 	@echo "linux-x86-mmx            Linux, x86 32-bit with MMX (for old computers)"
@@ -271,40 +270,30 @@ linux-x86-64-32-sse2:
 		ASFLAGS="$(ASFLAGS) -m32" \
 		LDFLAGS="$(LDFLAGS) -m32 -lcrypt -ldl"
 
-linux-x86-64-32-mmx:
-	$(LN) x86-mmx.h arch.h
+linux-x86-64-32-sse2i:
+	$(LN) x86-ssei.h arch.h
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
 	$(MAKE) $(PROJ) \
-		JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86.o x86-mmx.o sha1-mmx.o md5-mmx.o" \
-		CFLAGS="$(CFLAGS) -m32 -DHAVE_CRYPT -DHAVE_DL" \
+		JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86.o x86-sse.o sha1-mmx.o md5-mmx.o sse-intrinsics.o" \
+		CFLAGS="$(CFLAGS) -m32 -msse2 -DHAVE_CRYPT -DHAVE_DL" \
 		ASFLAGS="$(ASFLAGS) -m32" \
 		LDFLAGS="$(LDFLAGS) -m32 -lcrypt -ldl"
 
-linux-x86-64-32-any:
-	$(LN) x86-any.h arch.h
+linux-x86-64-32-mmx:
+	$(LN) x86-mmx.h arch.h
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
 	$(MAKE) $(PROJ) \
-		JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86.o" \
+		JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86.o x86-mmx.o sha1-mmx.o md5-mmx.o" \
 		CFLAGS="$(CFLAGS) -m32 -DHAVE_CRYPT -DHAVE_DL" \
 		ASFLAGS="$(ASFLAGS) -m32" \
 		LDFLAGS="$(LDFLAGS) -m32 -lcrypt -ldl"
 
-linux-x86-64-32-clang:
+linux-x86-64-32-any:
 	$(LN) x86-any.h arch.h
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86.o" \
-		CFLAGS="-c -O2 -I/usr/include -m32 -DHAVE_CRYPT -DHAVE_DL" \
-		ASFLAGS="$(ASFLAGS) -m32" \
-		LDFLAGS="-lm -lssl -lcrypto -lcrypt -ldl -m32" \
-		CPP="clang" CC="clang" AS="clang" LD="clang"
-
-linux-x86-64-32-sse2i:
-	$(CP) x86-ssei.h arch.h
-	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
-	$(MAKE) $(PROJ) \
-		JOHN_OBJS="sse-intrinsics.o $(JOHN_OBJS) x86.o x86-sse.o " \
-		CFLAGS="$(CFLAGS) -Wall -mpreferred-stack-boundary=4 -msse2 -m32 -DHAVE_CRYPT -DHAVE_DL" \
+		CFLAGS="$(CFLAGS) -m32 -DHAVE_CRYPT -DHAVE_DL" \
 		ASFLAGS="$(ASFLAGS) -m32" \
 		LDFLAGS="$(LDFLAGS) -m32 -lcrypt -ldl"
 
-- 
1.7.4.1