From 938b5e2540b2b42880f8a1e1a14cc2404cab2ae1 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 24 Sep 2009 07:56:51 +0000
Subject: [PATCH] 2009-09-24 09:55 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.mk     % Optimized arch bit macro redefinition. 
    + Added arm CPU to arch bit target macro definition.

---
 harbour/ChangeLog        |  5 +++++
 harbour/config/global.mk | 16 ++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bc25fbc48e..ab42da4221 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-24 09:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    % Optimized arch bit macro redefinition.
+    + Added arm CPU to arch bit target macro definition.
+
 2009-09-24 09:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     * Pelles C support version numbers adjusted.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 055314be61..ea0d99cf12 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1058,12 +1058,10 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
          HB_PRGFLAGS += -undef:__PLATFORM__BEOS -undef:__PLATFORM__UNIX
       endif
       ifneq ($(HB_HOST_CPU),$(HB_CPU))
-         ifeq ($(HB_HOST_CPU),x86)
-            HB_PRGFLAGS += -undef:__ARCH32BIT__
-         else ifeq ($(HB_HOST_CPU),x86_64)
-            HB_PRGFLAGS += -undef:__ARCH64BIT__
-         else ifeq ($(HB_HOST_CPU),ia64)
-            HB_PRGFLAGS += -undef:__ARCH64BIT__
+         ifneq ($(filter $(HB_HOST_CPU),x86 arm),)
+            HB_PRGFLAGS += -D__ARCH32BIT__
+         else ifneq ($(filter $(HB_HOST_CPU),x86_64 ia64),)
+            HB_PRGFLAGS += -D__ARCH64BIT__
          endif
       endif
       ifeq ($(HB_PLATFORM),win)
@@ -1088,11 +1086,9 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
          HB_PRGFLAGS += -D__PLATFORM__BEOS -D__PLATFORM__UNIX
       endif
       ifneq ($(HB_HOST_CPU),$(HB_CPU))
-         ifeq ($(HB_CPU),x86)
+         ifneq ($(filter $(HB_CPU),x86 arm),)
             HB_PRGFLAGS += -D__ARCH32BIT__
-         else ifeq ($(HB_CPU),x86_64)
-            HB_PRGFLAGS += -D__ARCH64BIT__
-         else ifeq ($(HB_CPU),ia64)
+         else ifneq ($(filter $(HB_CPU),x86_64 ia64),)
             HB_PRGFLAGS += -D__ARCH64BIT__
          endif
       endif