From 2c1e33a0b253e9d7e0aad3b6b0f48723cf7487a2 Mon Sep 17 00:00:00 2001
From: Lailton <lailton@paysoft.com.br>
Date: Sun, 23 Oct 2022 23:28:00 -0300
Subject: [PATCH] 2022-10-23 11:30 UTC-0300 Lailton Fernando Mariano
 (lailton/at/harbour.page)   * config/global.mk     + add auto detect cpu
 arm64   * config/darwin/global.mk   * utils/hbmk2     ! fix build dylibs with
 VM builtin to Darwin ( Mac OS )

---
 ChangeLog.txt           | 7 +++++++
 config/darwin/global.mk | 2 +-
 config/global.mk        | 4 ++++
 src/compiler/hbusage.c  | 2 +-
 utils/hbmk2/hbmk2.prg   | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f955025f8a..e8a7e7c768 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,13 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2022-10-23 11:30 UTC-0300 Lailton Fernando Mariano (lailton/at/harbour.page)
+  * config/global.mk
+    + add auto detect cpu arm64
+  * config/darwin/global.mk
+  * utils/hbmk2
+    ! fix build dylibs with VM builtin to Darwin ( Mac OS )
+
 2022-10-17 20:28 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * ChangeLog.txt
     * fixed log entry order
diff --git a/config/darwin/global.mk b/config/darwin/global.mk
index f17b8b30c9..0ff79849e1 100644
--- a/config/darwin/global.mk
+++ b/config/darwin/global.mk
@@ -22,7 +22,7 @@ AR_RULE = ( $(AR) -static \
 
 DY_OUT := -o$(subst x,x, )
 
-DY_RULE = $(DY) -dynamiclib -flat_namespace $(DFLAGS) \
+DY_RULE = $(DY) -dynamiclib $(DFLAGS) \
    -install_name "$(DYN_NAME_NVR)" \
    -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) \
    -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) \
diff --git a/config/global.mk b/config/global.mk
index 7fef025763..ed2ad9ba41 100644
--- a/config/global.mk
+++ b/config/global.mk
@@ -440,6 +440,9 @@ else
    ifneq ($(findstring Power,$(_UNAME_M)),)
       HB_HOST_CPU := ppc
    else
+   ifneq ($(findstring arm64,$(_UNAME_M)),)
+      HB_HOST_CPU := arm64
+   else
    ifneq ($(findstring arm,$(_UNAME_M)),)
       HB_HOST_CPU := arm
    else
@@ -490,6 +493,7 @@ else
    endif
    endif
    endif
+   endif
 endif
 endif
 
diff --git a/src/compiler/hbusage.c b/src/compiler/hbusage.c
index 5a0160efbc..0193d1194b 100644
--- a/src/compiler/hbusage.c
+++ b/src/compiler/hbusage.c
@@ -209,7 +209,7 @@ void hb_compPrintCredits( HB_COMP_DECL )
          "Jose Lalin (dezac corevia.com)\n"
          "Klas Engwall (harbour engwall.com)\n"
          "Kwon, Oh-Chul (ohchul fivetech.net)\n"
-         "Lailton Fernando Mariano (lailton harbour.com.br)\n"
+         "Lailton Fernando Mariano (lailton harbour.page)\n"
          "Leslee Griffith (les.griffith vantagesystems.ca)\n"
          "Lorenzo Fiorini (lorenzo.fiorini gmail com)\n"
          "Luis Krause Mantilla (lkrausem shaw.ca)\n"
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index 5433198393..cc66cc6f52 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -4123,7 +4123,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
          AAddNotEmpty( hbmk[ _HBMK_aOPTCPPX ], gcc_opt_lngcpp_fill( hbmk ) )
          cBin_Dyn := cBin_CompC
          IF hbmk[ _HBMK_cPLAT ] == "darwin"
-            cOpt_Dyn := "-dynamiclib -o {OD} -flat_namespace -undefined dynamic_lookup {FD} {DL} {LO} {LS}" /* NOTE: -single_module is now the default in ld/libtool. */
+            cOpt_Dyn := "-dynamiclib -o {OD} {FD} {DL} {LO} {LS}" /* NOTE: -single_module is now the default in ld/libtool. */
          ELSE
             cOpt_Dyn := "-shared -o {OD} {LO} {FD} {DL} {LS}"
          ENDIF