fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2025-10-16 21:09 UTC+0200 Aleksander Czajczynski (hb fki.pl)

Browse Source 
* utils/hbmk2/hbmk2.prg
    * updated approach to define __ARCH64BIT__ at .prg level when
      cross-compiling for such architecture.
      Thanks to Alexey Zapolskiy for noticing.

    + local hb_RightEq() deployed as macro
This commit is contained in:
Aleksander Czajczynski
2025-10-16 21:09:59 +02:00
parent cfb7bdc22c
commit 3aef259d87
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.txt
View File

@@ -7,6 +7,14 @@
Entries may not always be in chronological/commit order. Entries may not always be in chronological/commit order.
See license at the end of file. */ See license at the end of file. */
2025-10-16 21:09 UTC+0200 Aleksander Czajczynski (hb fki.pl)
* utils/hbmk2/hbmk2.prg
* updated approach to define __ARCH64BIT__ at .prg level when
cross-compiling for such architecture.
Thanks to Alexey Zapolskiy for noticing.
+ local hb_RightEq() deployed as macro
2025-10-04 09:09 UTC+0100 Antonio Linares (antonio.fivetech/at/gmail.com) 2025-10-04 09:09 UTC+0100 Antonio Linares (antonio.fivetech/at/gmail.com)
* config/bin.mk * config/bin.mk
! fixed duplicate library warnings on macOS by defining platform-specific ! fixed duplicate library warnings on macOS by defining platform-specific

13
utils/hbmk2/hbmk2.prg
View File

@@ -324,6 +324,7 @@ EXTERNAL hbmk_KEYW
#define HB_ISNEXTIDCHAR( c ) ( HB_ISFIRSTIDCHAR( c ) .OR. hb_asciiIsDigit( c ) ) #define HB_ISNEXTIDCHAR( c ) ( HB_ISFIRSTIDCHAR( c ) .OR. hb_asciiIsDigit( c ) )
#define LEFTEQUAL( l, r ) ( Left( l, Len( r ) ) == r ) #define LEFTEQUAL( l, r ) ( Left( l, Len( r ) ) == r )
#define hb_RightEq( s, c ) ( Right( s, Len( c ) ) == c )
/* Logic (hack) to automatically add some libs to their /* Logic (hack) to automatically add some libs to their
right place in the liblist. In case of 'unicows' lib, right place in the liblist. In case of 'unicows' lib,
@@ -11990,6 +11991,9 @@ STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG )
LOCAL cMacro LOCAL cMacro
LOCAL nPos LOCAL nPos
/* NOTE: hbmk2 mangles platform definitions here when cross-compiling,
otherwise and typically these are defined by hbpp, see ppcore.c */
IF ! hbmk[ _HBMK_cPLAT ] == hb_Version( HB_VERSION_BUILD_PLAT ) .OR. ; IF ! hbmk[ _HBMK_cPLAT ] == hb_Version( HB_VERSION_BUILD_PLAT ) .OR. ;
! hbmk[ _HBMK_cCOMP ] == hb_Version( HB_VERSION_BUILD_COMP ) ! hbmk[ _HBMK_cCOMP ] == hb_Version( HB_VERSION_BUILD_COMP )
@@ -12132,7 +12136,8 @@ STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG )
hbmk[ _HBMK_cCOMP ] == "msvcarm64" .OR. ; hbmk[ _HBMK_cCOMP ] == "msvcarm64" .OR. ;
hbmk[ _HBMK_cCOMP ] == "pocc64" .OR. ; hbmk[ _HBMK_cCOMP ] == "pocc64" .OR. ;
hbmk[ _HBMK_cCOMP ] == "msvcia64" .OR. ; hbmk[ _HBMK_cCOMP ] == "msvcia64" .OR. ;
hbmk[ _HBMK_cCOMP ] == "iccia64" hbmk[ _HBMK_cCOMP ] == "iccia64" .OR. ;
hb_RightEq( hbmk[ _HBMK_cCPU ], "64" )
AAdd( aDf, "__ARCH64BIT__" ) AAdd( aDf, "__ARCH64BIT__" )
ELSE ELSE
AAdd( aDf, "__ARCH32BIT__" ) AAdd( aDf, "__ARCH32BIT__" )
@@ -12142,7 +12147,11 @@ STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG )
given platform + compiler settings. We could only guess. given platform + compiler settings. We could only guess.
Let us assume the most probable CPU platform (as of 2009). */ Let us assume the most probable CPU platform (as of 2009). */
AAdd( aDf, "__LITTLE_ENDIAN__" ) AAdd( aDf, "__LITTLE_ENDIAN__" )
AAdd( aDf, "__ARCH32BIT__" ) IF hb_RightEq( hbmk[ _HBMK_cCPU ], "64" )
AAdd( aDf, "__ARCH64BIT__" )
ELSE
AAdd( aDf, "__ARCH32BIT__" )
ENDIF
ENDCASE ENDCASE
/* Delete macros present in both lists */ /* Delete macros present in both lists */