On macOS allow DUAL_MAPPED_CODE_ZONE to be tested (don't rely on proc…

…ctl.h and privide exeName). Also avoid including COGDEFS twice in CFLAGS.
OpenSmalltalk · Jul 3, 2021 · 74afafc · 74afafc
1 parent ae5a967
commit 74afafc
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 6 deletions.
diff --git a/build.macos32x86/common/Makefile.vm b/build.macos32x86/common/Makefile.vm
@@ -119,7 +119,7 @@ DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts
 endif
 
 TZ:=$(shell date +%Z)
-DEFS:=	$(COGDEFS) -DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
+DEFS:=	-DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
 		-DUSE_INLINE_MEMORY_ACCESSORS -D'TZ="$(TZ)"' \
 		-DHAVE_CONFIG_H=1
 

diff --git a/build.macos64ARMv8/common/Makefile.flags b/build.macos64ARMv8/common/Makefile.flags
@@ -45,7 +45,7 @@ ifdef BIT_IDENTICAL_FLOATING_POINT
 CFLAGS:=$(CFLAGS) -DBIT_IDENTICAL_FLOATING_POINT=1
 endif
 
-CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 -DUSE_METAL=1 -DUSE_OPENGL=1 -DUSE_CORE_GRAPHICS=1 \
+CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 -DUSE_METAL=1 -DUSE_CORE_GRAPHICS=1 \
 		-arch $(TARGET_ARCH) \
 		-mmacosx-version-min=$(TARGET_VERSION_MIN) \
 		-fvisibility=default \

diff --git a/build.macos64ARMv8/common/Makefile.vm b/build.macos64ARMv8/common/Makefile.vm
@@ -123,7 +123,7 @@ DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts
 endif
 
 TZ:=$(shell date +%Z)
-DEFS:=	$(COGDEFS) -DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
+DEFS:=	-DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
 		-DUSE_INLINE_MEMORY_ACCESSORS -D'TZ="$(TZ)"' \
 		-DUSE_METAL=1 -DHAVE_CONFIG_H=1
 XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN

diff --git a/build.macos64x64/common/Makefile.vm b/build.macos64x64/common/Makefile.vm
@@ -123,7 +123,7 @@ DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts
 endif
 
 TZ:=$(shell date +%Z)
-DEFS:=	$(COGDEFS) -DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
+DEFS:=	-DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
 		-DUSE_INLINE_MEMORY_ACCESSORS -D'TZ="$(TZ)"' \
 		-DUSE_METAL=1 -DHAVE_CONFIG_H=1
 XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN

diff --git a/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m b/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m
@@ -92,7 +92,7 @@ - (const char *) getAttribute:(sqInt)indexNumber {
 	else {
 		switch (indexNumber) {
 			case 0:
-                return [[[[NSBundle mainBundle] executablePath] precomposedStringWithCanonicalMapping] UTF8String];
+                return fullExeName;
 
 			case 1:
 				return [self getImageName];

diff --git a/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.h b/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.h
@@ -46,6 +46,9 @@
 #import "sqSqueakInfoPlistInterface.h"
 #import	"sqSqueakSoundCoreAudio.h"
 
+extern char *fullExeName;	/* full VM path /Applications/Sq.../MacOS/Squeak */
+extern char *exeName;		/* short vm name, e.g. "Squeak" */
+
 @interface sqSqueakMainApplication : NSObject {
 	NSURL*		vmPathStringURL;
 	NSURL*		imageNameURL;

diff --git a/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m b/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m
@@ -53,6 +53,8 @@ Some of this code was funded via a grant from the European Smalltalk User Group
 
 extern BOOL gSqueakHeadless;
 extern sqSqueakAppDelegate *gDelegateApp;
+char *fullExeName;
+char *exeName;
 
 @implementation sqSqueakMainApplication;
 @synthesize vmPathStringURL;
@@ -116,6 +118,11 @@ - (void) doMemorySetup {
 }
 
 - (void) parseUnixArgs {
+	fullExeName = [[[[NSBundle mainBundle] executablePath]
+					precomposedStringWithCanonicalMapping] UTF8String];
+	exeName = strrchr(fullExeName,'/')
+				? strrchr(fullExeName,'/') + 1
+				: fullExeName;
 }
 
 - (void) setupMenus {

diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
@@ -159,6 +159,7 @@ - (void) setupSoundLogic {
 }
 
 - (void) parseUnixArgs {
+	[super parseUnixArgs];
 	NSProcessInfo *p = [NSProcessInfo processInfo];
 	[self parseArgs: [p arguments]];
 	[self parseEnv: [p environment]];

diff --git a/platforms/unix/vm/sqUnixSpurMemory.c b/platforms/unix/vm/sqUnixSpurMemory.c
@@ -37,7 +37,9 @@
 #  include <sys/mman.h>
 #endif
 #if DUAL_MAPPED_CODE_ZONE
-# include <sys/prctl.h>
+# if !__APPLE__
+#	include <sys/prctl.h>
+# endif
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h> /* For mode constants */
 #endif