From 4e7da9be3dcb2d58d59da7b3d421a1ff20f040a9 Mon Sep 17 00:00:00 2001
From: Jean-Francois Romang <jeanfrancois.romang@gmail.com>
Date: Wed, 10 Oct 2012 19:34:06 +0800
Subject: [PATCH] Introduce arm-32 ARCH in Makefile

No functional change.
---
 src/Makefile | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index fc6a4fae..c73b94f3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -125,6 +125,16 @@ ifeq ($(ARCH),x86-32-old)
 	popcnt = no
 endif
 
+#arm section
+ifeq ($(ARCH),arm-32)
+	arch = arm-32
+	os = any
+	bits = 32
+	prefetch = yes
+	bsfq = no
+	popcnt = no
+endif
+
 # osx-section
 ifeq ($(ARCH),osx-ppc-64)
 	arch = ppc64
@@ -175,7 +185,6 @@ endif
 ifeq ($(COMP),mingw)
 	comp=mingw
 	CXX=g++
-	prefetch = yes
 	profile_prepare = gcc-profile-prepare
 	profile_make = gcc-profile-make
 	profile_use = gcc-profile-use
@@ -185,7 +194,6 @@ endif
 ifeq ($(COMP),gcc)
 	comp=gcc
 	CXX=g++
-	prefetch = yes
 	profile_prepare = gcc-profile-prepare
 	profile_make = gcc-profile-make
 	profile_use = gcc-profile-use
@@ -204,7 +212,6 @@ endif
 ifeq ($(COMP),clang)
 	comp=clang
 	CXX=clang++
-	prefetch = yes
 	profile_prepare = gcc-profile-prepare
 	profile_make = gcc-profile-make
 	profile_use = gcc-profile-use
@@ -268,6 +275,10 @@ ifeq ($(optimize),yes)
 				CXXFLAGS += -mdynamic-no-pic
 			endif
 		endif
+
+		ifeq ($(arch),arm-32)
+			CXXFLAGS += -fno-gcse
+		endif
 	endif
 
 	ifeq ($(comp),mingw)
@@ -304,8 +315,10 @@ endif
 
 ### 3.7 prefetch
 ifeq ($(prefetch),yes)
-	CXXFLAGS += -msse
-	DEPENDFLAGS += -msse
+	ifneq ($(arch),arm-32)
+		CXXFLAGS += -msse
+		DEPENDFLAGS += -msse
+	endif
 else
 	CXXFLAGS += -DNO_PREFETCH
 endif
@@ -363,6 +376,7 @@ help:
 	@echo "osx-ppc-32           > PPC-Mac OS X 32 bit"
 	@echo "osx-x86-64           > x86-Mac OS X 64 bit"
 	@echo "osx-x86-32           > x86-Mac OS X 32 bit"
+	@echo "arm-32               > ARM 32 bit"
 	@echo "general-64           > unspecified 64-bit"
 	@echo "general-32           > unspecified 32-bit"
 	@echo ""
@@ -452,7 +466,7 @@ config-sanity:
 	@test "$(debug)" = "yes" || test "$(debug)" = "no"
 	@test "$(optimize)" = "yes" || test "$(optimize)" = "no"
 	@test "$(arch)" = "any" || test "$(arch)" = "x86_64" || test "$(arch)" = "i386" || \
-	 test "$(arch)" = "ppc64" || test "$(arch)" = "ppc"
+	 test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || test "$(arch)" = "arm-32"
 	@test "$(os)" = "any" || test "$(os)" = "osx"
 	@test "$(bits)" = "32" || test "$(bits)" = "64"
 	@test "$(prefetch)" = "yes" || test "$(prefetch)" = "no"
-- 
2.39.2