From 9577a82f9d7202b4bf92303ddee1b49614509c6d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 4 Dec 2009 23:32:00 +0000
Subject: [PATCH] 2009-12-05 00:31 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.mk     % De-xmas.

---
 harbour/ChangeLog        |  4 ++++
 harbour/config/global.mk | 38 +++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b720e6f269..d0b5c1bd75 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-05 00:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    % De-xmas.
+
 2009-12-04 23:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/hbi18n2.prg
     ! HB_I18N_SAVEPOT(), __I18N_POTARRAYSAVE(): Changed to not
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index a08d989c4c..5a54507dce 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -120,8 +120,6 @@ endef
 
 define check_host_cpu
 
-   # TODO: Please fix/extend
-
    ifneq ($(findstring ppc64,$(1)),)
       HB_HOST_CPU := ppc64
    else ifneq ($(findstring ppc,$(1)),)
@@ -454,12 +452,10 @@ ifeq ($(HB_HOST_PLAT),win)
    else
       HB_HOST_CPU := x86
    endif
+else ifneq ($(filter $(HB_HOST_PLAT),dos os2),)
+   HB_HOST_CPU := x86
 else
-   ifneq ($(filter $(HB_HOST_PLAT),dos os2),)
-      HB_HOST_CPU := x86
-   else
-      $(eval $(call check_host_cpu,$(shell uname -m),))
-   endif
+   $(eval $(call check_host_cpu,$(shell uname -m),))
 endif
 
 ifeq ($(HB_INIT_DONE),)
@@ -983,24 +979,20 @@ ifeq ($(HB_PLATFORM),win)
    else
       HB_CPU := x86
    endif
-else
-   ifeq ($(HB_PLATFORM),wce)
-      ifneq ($(filter $(HB_COMPILER),msvcarm mingwarm poccarm),)
-         HB_CPU := arm
-      else ifneq ($(filter $(HB_COMPILER),msvcmips),)
-         HB_CPU := mips
-      else ifneq ($(filter $(HB_COMPILER),msvcsh),)
-         HB_CPU := sh
-      else
-         HB_CPU := x86
-      endif
+else ifeq ($(HB_PLATFORM),wce)
+   ifneq ($(filter $(HB_COMPILER),msvcarm mingwarm poccarm),)
+      HB_CPU := arm
+   else ifneq ($(filter $(HB_COMPILER),msvcmips),)
+      HB_CPU := mips
+   else ifneq ($(filter $(HB_COMPILER),msvcsh),)
+      HB_CPU := sh
    else
-      ifneq ($(filter $(HB_PLATFORM),dos os2),)
-         HB_CPU := x86
-      else
-         HB_CPU := $(HB_HOST_CPU)
-      endif
+      HB_CPU := x86
    endif
+else ifneq ($(filter $(HB_PLATFORM),dos os2),)
+   HB_CPU := x86
+else
+   HB_CPU := $(HB_HOST_CPU)
 endif
 
 ifeq ($(HB_INIT_DONE),)