CHANGE: simplified use of TO_<os> defines and included Linux armv6 targets (and using armv7 instead of arm32 now)

Author: Oldes

make/old-makefiles/makefile

@@ -39,7 +39,7 @@ R= $S/core
 INCL ?= .
 I= -I$(INCL) -I$S/include/
 
-TO_OS?= TO_WIN32_X64
+TO_OS?= TO_WINDOWS
 OS_ID?= 0.3.40
 BIN_SUFFIX= .exe
 LIB_SUFFIX= .dll

make/old-makefiles/makefile.vc

@@ -9,11 +9,11 @@ T=	$(UP)\src\tools
 CD=	 ./
 
 I= /I..\src\include
-TO_OS= TO_WIN32
+TO_OS= TO_WINDOWS
 OS_ID= 0.3.1
 
 
-CFLAGS=/c /Os /W3 /GR- /Zi /GS /Gy /GF /EHs-c- /GL /D "REB_EXE" /D "ENDIAN_LITTLE" /D "_CRT_SECURE_NO_WARNINGS" /D "_UNICODE" /D "UNICODE" /D "_FILE_OFFSET_BITS=64" /D "NDEBUG" /D "TO_WIN32" /D "USE_MIDI_DEVICE" /D "USE_LZMA" /D "USE_IMAGE_NATIVES"
+CFLAGS=/c /Os /W3 /GR- /Zi /GS /Gy /GF /EHs-c- /GL /D "REB_EXE" /D "ENDIAN_LITTLE" /D "_CRT_SECURE_NO_WARNINGS" /D "_UNICODE" /D "UNICODE" /D "_FILE_OFFSET_BITS=64" /D "NDEBUG" /D "TO_WINDOWS" /D "USE_MIDI_DEVICE" /D "USE_LZMA" /D "USE_IMAGE_NATIVES"
 
 
 RAPI_FLAGS= $(CFLAGS)

make/old-makefiles/makefile_0.4.40.mk

@@ -39,7 +39,7 @@ R= $S/core
 INCL ?= .
 I= -I$(INCL) -I$S/include/
 
-TO_OS?= TO_LINUX_X64
+TO_OS?= TO_LINUX
 OS_ID?= 0.4.40
 BIN_SUFFIX=
 LIB_SUFFIX= .so

make/rebol3.nest

@@ -20,6 +20,11 @@ optimize:   2
 
 version: 3.10.3
 
+#if Linux?   [ defines: TO_LINUX   ]
+#if Windows? [ defines: TO_WINDOWS ]
+#if OpenBSD? [ defines: TO_OPENBSD ]
+#if FreeBSD? [ defines: TO_FREEBSD ]
+
 target-windows: [
 	os:       windows
 	sys:      win32
@@ -906,48 +911,34 @@ arch-x64: [
 	define: _FILE_OFFSET_BITS=64
 	#if Linux? [
 		library: %dl
-		defines: TO_LINUX_X64
 		defines: __LP64__ ; has long (integer) 64 bits
 	]
 	#if Windows? [
-		defines: TO_WIN32_X64
 		defines: _WIN32
 		defines: __LLP64__ ; 64-bit, long (integer) has 32 bits and 'void *' is sizeof(long long)
 	]
 	#if macOS? [
-		defines: TO_OSX_X64
 		defines: __LP64__ ; same like LLP64, but long (integer) has 64 bits instead of 32
 	] 
-	#if OpenBSD? [
-		defines: TO_OPENBSD
-	]
-	#if FreeBSD? [
-		defines: TO_FREEBSD
-	]
 ]
 arch-x86: [
 	arch: x86
-	#if Linux? [
+	#if Windows? [ resource-options: "--target=pe-i386" ]
+]
+arch-armv6: [
+	arch: armv6
+	#if linux? [
+		flag: "-marm"
+		flag: "-march=native" ;; expects, that the host system is arm32!
 		library: %dl
-		defines: TO_LINUX_X86
-	]
-	#if Windows? [
-		resource-options: "--target=pe-i386"
-		defines: TO_WIN32
-	]
-	#if OpenBSD? [
-		defines: TO_OPENBSD
-	]
-	#if FreeBSD? [
-		defines: TO_FREEBSD
 	]
 ]
-arch-arm32: [
-	:arch-x86
-	arch: arm32
-	#if linux? [ flag: "-march=native" ] ;; expects, that the host system is arm32!
+arch-armv7: [
+	:arch-armv6
+	arch: armv7
 ]
-arch-arm64: [
+
+arch-arm64: [ ;= armv8
 	:arch-x64
 	arch: arm64
 	#if macOS? [ flag: "-arch arm64" ]
@@ -1000,7 +991,8 @@ make-exe: [
 ]
 make-x86-exe:   [:arch-x86   :make-exe ]
 make-x64-exe:   [:arch-x64   :make-exe ]
-make-arm32-exe: [:arch-arm32 :make-exe ]
+make-armv6-exe: [:arch-armv6 :make-exe ]
+make-armv7-exe: [:arch-armv7 :make-exe ]
 make-arm64-exe: [:arch-arm64 :make-exe ]
 
 ; for making Rebol as a shared library
@@ -1165,22 +1157,40 @@ eggs: [
 			:make-x64-exe
 		]
 
-		"Rebol/Base linux-arm32" [
-			name:     %rebol3-base-linux-arm32
+		"Rebol/Base linux-armv6" [
+			name:     %rebol3-base-linux-armv6
+			:target-linux
+			:make-armv6-exe
+		]
+		"Rebol/Core linux-armv6" [
+			name:     %rebol3-core-linux-armv6
+			:target-linux
+			:include-rebol-core
+			:make-armv6-exe
+		]
+		"Rebol/Bulk linux-armv6" [
+			name:     %rebol3-bulk-linux-armv6
+			:target-linux
+			:include-rebol-bulk
+			:make-armv6-exe
+		]
+
+		"Rebol/Base linux-armv7" [
+			name:     %rebol3-base-linux-armv7
 			:target-linux
-			:make-arm32-exe
+			:make-armv7-exe
 		]
-		"Rebol/Core linux-arm32" [
-			name:     %rebol3-core-linux-arm32
+		"Rebol/Core linux-armv7" [
+			name:     %rebol3-core-linux-armv7
 			:target-linux
 			:include-rebol-core
-			:make-arm32-exe
+			:make-armv7-exe
 		]
-		"Rebol/Bulk linux-arm32" [
-			name:     %rebol3-bulk-linux-arm32
+		"Rebol/Bulk linux-armv7" [
+			name:     %rebol3-bulk-linux-armv7
 			:target-linux
 			:include-rebol-bulk
-			:make-arm32-exe
+			:make-armv7-exe
 		]
 
 		"Rebol/Base linux-arm64" [

src/core/deprecated/u-poly1305.c

@@ -4,7 +4,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
-**  Copyright 2012-2019 Rebol Open Source Developers
+**  Copyright 2012-2023 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@
 
 #include "sys-poly1305.h"
 
-#if (defined(__LP64__) || defined(TO_WIN32_X64))
+#if (defined(__LP64__) || defined(__LLP64__))
 #include "poly1305/poly1305-donna-64.h"
 #else
 #include "poly1305/poly1305-donna-32.h"

src/core/deprecated/u-rsa.c

@@ -41,7 +41,7 @@
 #include <time.h>
 #include <stdlib.h>
 
-#if defined(TO_OSX_X64) || defined(TO_OSXI) || defined(TO_OSX)
+#ifdef TO_MACOS
 	#include <sys/malloc.h>
 #elif defined(TO_OPENBSD)
 	/* malloc(3) is inside stdlib.h */

src/core/u-iconv.c

@@ -37,7 +37,7 @@
 **
 ***********************************************************************/
 
-#if defined(TO_WIN32) || defined(TO_WIN32_X64)
+#ifdef TO_WINDOWS
 #include <windows.h>
 #undef IS_ERROR
 #else

src/include/reb-config.h

@@ -3,7 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
-**  Copyright 2012-2021 Rebol Open Source Developers
+**  Copyright 2012-2023 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,7 +34,7 @@
 
 The primary target system is defined by:
 
-	TO_target		- for example TO_WIN32 or TO_LINUX
+	TO_target		- for example TO_WINDOWS or TO_LINUX
 
 The default config builds an R3 HOST executable program.
 
@@ -98,13 +98,6 @@ These are now obsolete (as of A107) and should be removed:
 
 //* MS Windows *********************************************************
 
-#ifdef TO_WIN32	
-#define TO_WINDOWS
-#endif
-#ifdef TO_WIN32_X64
-#define TO_WINDOWS
-#endif
-
 #ifdef TO_WINDOWS				// Win32/Intel
 
 #define	WIN32_LEAN_AND_MEAN		// trim down the Win32 headers
@@ -166,8 +159,7 @@ These are now obsolete (as of A107) and should be removed:
 #define AGG_FREETYPE            //use freetype2 library for fonts by default
 #define INLINE
 
-#ifdef TO_OSX_X64
-#define TO_OSX
+#ifdef TO_MACOS
 #define FINITE isfinite
 #else
 #define FINITE finite
@@ -184,24 +176,13 @@ These are now obsolete (as of A107) and should be removed:
 #define API_IMPORT
 #endif
 
-#ifdef TO_LINUX
-#define TO_ANY_LINUX
-#endif
-
-#ifdef TO_LINUX_X64
-#define TO_ANY_LINUX
-#endif
 
-#ifdef TO_LINUX_MIPS
-#define TO_ANY_LINUX
-#endif
-
-#ifdef TO_LINUX_ARM
-#define TO_ANY_LINUX
+#ifdef TO_LINUX
+#undef INCLUDE_MIDI_DEVICE      // Not implemented!
+#define USE_SETENV 
 #endif
 
-#ifdef TO_ANY_LINUX
-#undef INCLUDE_MIDI_DEVICE      // Not implemented!
+#ifdef TO_MACOS					// macOS
 #define USE_SETENV 
 #endif
 

src/os/osx/dev-midi.c

@@ -3,7 +3,7 @@
  **  REBOL [R3] Language Interpreter and Run-time Environment
  **
  **  Copyright 2012 REBOL Technologies
- **  Copyright 2012-2021 Rebol Open Source Developers
+ **  Copyright 2012-2023 Rebol Open Source Developers
  **  REBOL is a trademark of REBOL Technologies
  **
  **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,7 @@
 
 #ifdef INCLUDE_MIDI_DEVICE
 
-#if defined(TO_OSX) || defined(TO_OSX_X64) || defined(TO_OSXI) //!!! could be made better! 
+#ifdef TO_MACOS
 
 // NOTE: this will be useful for higher level launchpad schemes:
 // https://github.com/FMMT666/launchpad.py/blob/master/launchpad_py/launchpad.py
@@ -489,5 +489,5 @@ static DEVICE_CMD_FUNC Dev_Cmds[RDC_MAX] =
 
 DEFINE_DEV(Dev_MIDI, "MIDI", 1, Dev_Cmds, RDC_MAX, 0);
 
-#endif //defined(TO_OSX) || defined(TO_OSX_X64)
+#endif //TO_MACOS
 #endif //INCLUDE_MIDI_DEVICE

src/os/posix/host-lib.c

@@ -442,7 +442,7 @@ RL_LIB *RL; // Link back to reb-lib from embedded extensions (like for now: host
 **
 ***********************************************************************/
 {
-#ifdef TO_OSX
+#ifdef TO_MACOS
 	REBCNT size = 0;
 	REBINT rv;
 	REBCHR *buf;
@@ -1350,7 +1350,7 @@ static int Try_Browser(char *browser, REBCHR *url)
 ***********************************************************************/
 {
 	if (
-#if defined(TO_OSX) || defined(TO_OSXI) || defined(TO_OSX_X64)
+#ifdef TO_MACOS
 		Try_Browser("/usr/bin/open", url)
 #else
 		Try_Browser("xdg-open", url)