[Vm-dev] [commit][3713] Mac OS X build: Add support for compiling the FLoatMathPlugin with -O1 and

[commits at squeakvm.org]

Revision: 3713
Author:   eliot
Date:     2016-05-11 11:46:28 -0700 (Wed, 11 May 2016)
Log Message:
-----------
Mac OS X build: Add support for compiling the FLoatMathPlugin with -O1 and
-fno-strict-aliasing.  Doesn't fix the 64-bit FloatMathPlugin, but the facility
is useful.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/common/Makefile.flags
    branches/Cog/build.macos32x86/common/Makefile.plugin
    branches/Cog/build.macos64x64/common/Makefile.flags
    branches/Cog/build.macos64x64/common/Makefile.plugin
    branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m

Added Paths:
-----------
    branches/Cog/platforms/iOS/plugins/FloatMathPlugin/
    branches/Cog/platforms/iOS/plugins/FloatMathPlugin/Makefile

Modified: branches/Cog/build.macos32x86/common/Makefile.flags
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.flags	2016-05-11 18:20:55 UTC (rev 3712)
+++ branches/Cog/build.macos32x86/common/Makefile.flags	2016-05-11 18:46:28 UTC (rev 3713)
@@ -26,6 +26,7 @@
 			-fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \
 			-fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \
 			$(OBJC_CODE_MODEL) \
+			$(XCFLAGS) \
 		-isysroot $(SDK) \
 		-include $(PLATDIR)/iOS/vm/SqueakPureObjc_Prefix.pch
 

Modified: branches/Cog/build.macos32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.plugin	2016-05-11 18:20:55 UTC (rev 3712)
+++ branches/Cog/build.macos32x86/common/Makefile.plugin	2016-05-11 18:46:28 UTC (rev 3713)
@@ -7,6 +7,7 @@
 # platforms/iOS/plugins/*/Makefile for examples.
 #
 # CFLAGS     adds additional compilation flags to source file compilation
+# XCFLAGS    adds additional compilation flags after all other flags
 # EXCLUDESRC defines patterns of source files to not compile, e.g. %/dump.c
 # EXTRALIBS  defines additional libraries to link into an external plugin bundle
 # INCDIRS    defines additonal directories in which to search for includes
@@ -20,14 +21,17 @@
 # VM config flags.
 ifeq ($(CONFIGURATION),product)
 OFLAGS:= -g -Os
+AT_MOST_OPT_LEVEL_ONE:=-O1
 DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1
 BUILD:=build
 else ifeq ($(CONFIGURATION),assert)
 OFLAGS:= -g -O1 -fno-omit-frame-pointer
+AT_MOST_OPT_LEVEL_ONE:=-O1
 DEBUGVM=-DDEBUGVM=0
 BUILD:=buildast
 else
 OFLAGS:= -g -O0 -fno-omit-frame-pointer
+AT_MOST_OPT_LEVEL_ONE:=-O0
 DEBUGVM=-DDEBUGVM=1
 BUILD:=builddbg
 endif

Modified: branches/Cog/build.macos64x64/common/Makefile.flags
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.flags	2016-05-11 18:20:55 UTC (rev 3712)
+++ branches/Cog/build.macos64x64/common/Makefile.flags	2016-05-11 18:46:28 UTC (rev 3713)
@@ -21,6 +21,7 @@
 			-fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \
 			-fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \
 			$(OBJC_CODE_MODEL) \
+			$(XCFLAGS) \
 		-isysroot $(SDK) \
 		-include $(PLATDIR)/iOS/vm/SqueakPureObjc_Prefix.pch
 

Modified: branches/Cog/build.macos64x64/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.plugin	2016-05-11 18:20:55 UTC (rev 3712)
+++ branches/Cog/build.macos64x64/common/Makefile.plugin	2016-05-11 18:46:28 UTC (rev 3713)
@@ -7,6 +7,7 @@
 # platforms/iOS/plugins/*/Makefile for examples.
 #
 # CFLAGS     adds additional compilation flags to source file compilation
+# XCFLAGS    adds additional compilation flags after all other flags
 # EXCLUDESRC defines patterns of source files to not compile, e.g. %/dump.c
 # EXTRALIBS  defines additional libraries to link into an external plugin bundle
 # INCDIRS    defines additonal directories in which to search for includes
@@ -20,14 +21,17 @@
 # VM config flags.
 ifeq ($(CONFIGURATION),product)
 OFLAGS:= -g -Os
+AT_MOST_OPT_LEVEL_ONE:=-O1
 DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1
 BUILD:=build
 else ifeq ($(CONFIGURATION),assert)
 OFLAGS:= -g -O1 -fno-omit-frame-pointer
+AT_MOST_OPT_LEVEL_ONE:=-O1
 DEBUGVM=-DDEBUGVM=0
 BUILD:=buildast
 else
 OFLAGS:= -g -O0 -fno-omit-frame-pointer
+AT_MOST_OPT_LEVEL_ONE:=-O0
 DEBUGVM=-DDEBUGVM=1
 BUILD:=builddbg
 endif

Added: branches/Cog/platforms/iOS/plugins/FloatMathPlugin/Makefile
===================================================================
--- branches/Cog/platforms/iOS/plugins/FloatMathPlugin/Makefile	                        (rev 0)
+++ branches/Cog/platforms/iOS/plugins/FloatMathPlugin/Makefile	2016-05-11 18:46:28 UTC (rev 3713)
@@ -0,0 +1,3 @@
+XCFLAGS=$(AT_MOST_OPT_LEVEL_ONE) -fno-strict-aliasing
+
+include ../common/Makefile.plugin

Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m	2016-05-11 18:20:55 UTC (rev 3712)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m	2016-05-11 18:46:28 UTC (rev 3713)
@@ -63,7 +63,7 @@
 }
 
 @interface sqSqueakOSXOpenGLView ()
- at property (nonatomic, assign) NSRect lastFrameSize;
+ at property (nonatomic,assign) NSRect lastFrameSize;
 @property (nonatomic,assign) BOOL fullScreenInProgress;
 @property (nonatomic,assign) void* fullScreendispBitsIndex;
 @end