[commit][3583] Mac OS X gnu makefiles:

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[commit][3583] Mac OS X gnu makefiles:

commits-3
 
Revision: 3583
Author:   eliot
Date:     2016-02-10 21:07:43 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
Mac OS X gnu makefiles:
Make the GdbARMPlugin make.
Make the Makefiles default to CONFIGURATION=product, not debug.
Allow CFLAGS to be extended.
Correct the external plugin set.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/common/Makefile.app
    branches/Cog/build.macos32x86/common/Makefile.plugin
    branches/Cog/build.macos32x86/common/Makefile.vm
    branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext
    branches/Cog/build.macos32x86/squeak.sista.spur/Makefile
    branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext

Added Paths:
-----------
    branches/Cog/platforms/iOS/plugins/GdbARMPlugin/
    branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile
    branches/Cog/platforms/iOS/plugins/GdbARMPlugin/environ.c

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/build.macos32x86/common/Makefile.app
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 02:35:00 UTC (rev 3582)
+++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 05:07:43 UTC (rev 3583)
@@ -20,12 +20,12 @@
 # debug. Optional. Defaults to product. The default is overridden in mvm script
 
 
-ifeq ("$(CONFIGURATION)","product")
- APP:=CocoaFast.app
+ifeq ("$(CONFIGURATION)","debug")
+ APP:=CocoaDebug.app
 else ifeq ("$(CONFIGURATION)","assert")
  APP:=CocoaAssert.app
-else
- APP:=CocoaDebug.app
+else # default CONFIGURATION=product => CocoaFast.app
+ APP:=CocoaFast.app
 endif
 
 default: $(APP)

Modified: branches/Cog/build.macos32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 02:35:00 UTC (rev 3582)
+++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 05:07:43 UTC (rev 3583)
@@ -29,7 +29,7 @@
 BUILD:=builddbg
 endif
 
-CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS)
+CFLAGS:= $(CFLAGS) $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS)
 # The following are the four key locations (set via invocation):
 # PLUGINSRCDIR: Where is the root of the src/plugins source tree?
 # VMSRCDIR: Where is the root of the src vm source tree?
@@ -59,7 +59,7 @@
 
 # INCDIRS are where include files are searched for. A superset of SRCDIRS.
 INCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(INCDIRS)
-INCLUDES:= $(addprefix -I,. $(INCDIRS)) $(INCLUDES)
+INCLUDES:= $(addprefix -I,. $(INCDIRS))
 
 #############################################################################
 # If no source files were given, use standard set
@@ -123,6 +123,7 @@
  @echo OSXSRC=$(OSXSRC)
  @echo MAKERSRC=$(MAKERSRC)
  @echo SRCDIRS=$(SRCDIRS)
+ @echo INCDIRS=$(INCDIRS)
  @echo LIBSRC=$(LIBSRC)
  @echo LIBOBJ=$(LIBOBJ)
  @echo OBJDIR=$(OBJDIR)

Modified: branches/Cog/build.macos32x86/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 02:35:00 UTC (rev 3582)
+++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 05:07:43 UTC (rev 3583)
@@ -35,12 +35,12 @@
 endif
 COMMONDIR:=$(BASEDIR)/../common
 
-ifeq ("$(CONFIGURATION)","product")
- BUILD:=build
-else ifeq ("$(CONFIGURATION)","assert")
+ifeq ("$(CONFIGURATION)","assert")
  BUILD:=buildast
-else
+else ifeq ("$(CONFIGURATION)","debug")
  BUILD:=builddbg
+else # default CONFIGURATION=product
+ BUILD:=build
 endif
 $(shell mkdir -p deps >/dev/null) # deps is the dependencies directory
 BLDDIR:= $(BASEDIR)/$(BUILD)

Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext 2016-02-11 02:35:00 UTC (rev 3582)
+++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext 2016-02-11 05:07:43 UTC (rev 3583)
@@ -1,6 +1,5 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
-BochsIA32Plugin \
 CroquetPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \

Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext 2016-02-11 02:35:00 UTC (rev 3582)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext 2016-02-11 05:07:43 UTC (rev 3583)
@@ -1,6 +1,8 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 BochsIA32Plugin \
+BochsX64Plugin \
+GdbARMPlugin \
 CroquetPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext 2016-02-11 02:35:00 UTC (rev 3582)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext 2016-02-11 05:07:43 UTC (rev 3583)
@@ -1,6 +1,5 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
-BochsIA32Plugin \
 CroquetPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-02-11 02:35:00 UTC (rev 3582)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583)
@@ -3,7 +3,7 @@
 # Do make init to allow make -n to function.
 #
 
-VMSRCDIR:= ../../spursrc/vm
+VMSRCDIR:= ../../spursistasrc/vm
 
 APPPOST:=overwriteSqueakIcon
 

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext 2016-02-11 02:35:00 UTC (rev 3582)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext 2016-02-11 05:07:43 UTC (rev 3583)
@@ -1,6 +1,8 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 BochsIA32Plugin \
+BochsX64Plugin \
+GdbARMPlugin \
 CroquetPlugin \
 FloatArrayPlugin \
 FloatMathPlugin \


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Wed Feb 10 18:33:55 PST 2016
   + Wed Feb 10 21:05:09 PST 2016

Added: branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile
===================================================================
--- branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile                        (rev 0)
+++ branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile 2016-02-11 05:07:43 UTC (rev 3583)
@@ -0,0 +1,16 @@
+INCDIRS:=../../processors/ARM/gdb-7.10/include \
+         ../../processors/ARM/gdb-7.10/sim/arm \
+         ../../processors/ARM/gdb-7.10/bfd \
+         ../gdbarm32/bfd
+INCFIRST:=../../processors/ARM/gdb-7.10/include \
+          ../../processors/ARM/gdb-7.10/sim/arm \
+          ../../processors/ARM/gdb-7.10/bfd \
+          ../gdbarm32/bfd
+EXTRALIBS:=-L../gdbarm32/bfd -L../gdbarm32/libiberty -L../gdbarm32/opcodes \
+           -L../gdbarm32/sim/arm -L../gdbarm32/zlib \
+           -lbfd -liberty -lopcodes -lopcodes -lsim -lz
+
+include ../common/Makefile.plugin
+
+INCDIRS:= $(INCFIRST) $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR)
+INCLUDES:= $(addprefix -I,. $(INCDIRS))

Copied: branches/Cog/platforms/iOS/plugins/GdbARMPlugin/environ.c (from rev 3581, branches/Cog/platforms/Mac OS/plugins/GdbARMPlugin/environ.c)
===================================================================
--- branches/Cog/platforms/iOS/plugins/GdbARMPlugin/environ.c                        (rev 0)
+++ branches/Cog/platforms/iOS/plugins/GdbARMPlugin/environ.c 2016-02-11 05:07:43 UTC (rev 3583)
@@ -0,0 +1,5 @@
+/*
+ * Provide a fake environ so that xmalloc.o from libiberty.a links.
+ */
+
+char **environ = 0;