Revision: 3115 Author: eliot Date: 2014-10-25 16:00:07 -0700 (Sat, 25 Oct 2014) Log Message: ----------- More changes for the ARM linux build.
Modified Paths: -------------- branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build/plugins.ext branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/plugins.ext branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/plugins.ext
Removed Paths: ------------- branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm 2014-10-25 23:00:07 UTC (rev 3115) @@ -22,7 +22,7 @@ --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build/plugins.ext =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build/plugins.ext 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build/plugins.ext 2014-10-25 23:00:07 UTC (rev 3115) @@ -1,6 +1,8 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ LocalePlugin \ +SqueakFFIPrims \ +SqueakSSL \ UnicodePlugin \ UnixOSProcessPlugin \ UUIDPlugin \
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2014-10-25 23:00:07 UTC (rev 3115) @@ -18,7 +18,7 @@ --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/plugins.ext =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/plugins.ext 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/plugins.ext 2014-10-25 23:00:07 UTC (rev 3115) @@ -1,6 +1,8 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ LocalePlugin \ +SqueakFFIPrims \ +SqueakSSL \ UnixOSProcessPlugin \ UUIDPlugin \ XDisplayControlPlugin
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm 2014-10-25 23:00:07 UTC (rev 3115) @@ -18,7 +18,7 @@ --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/plugins.ext =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/plugins.ext 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/plugins.ext 2014-10-25 23:00:07 UTC (rev 3115) @@ -1,6 +1,8 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ LocalePlugin \ +SqueakFFIPrims \ +SqueakSSL \ UnixOSProcessPlugin \ UUIDPlugin \ UnicodePlugin \
Deleted: branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in =================================================================== --- branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in 2014-10-25 23:00:07 UTC (rev 3115) @@ -1,29 +0,0 @@ -# Makefile.in for BitBltPlugin on Unix -# -# Author: ian.piumarta@inria.fr -# -# Last edited: Dec 1 2009 by eliot miranda - -[make_cfg] -[make_plg] - -TARGET= BitBltPlugin$a - -XINCLUDES= [includes] - -ifeq (,$(findstring ENABLE_FAST_BLT,$(CFLAGS))) - OBJS = BitBltPlugin$o BitBltArm$o BitBltArmLinux$o BitBltArmOther$o BitBltArmSimd$o BitBltDispatch$o BitBltGeneric$o -else - ASMINCLUDES = -I$(topdir)/platforms/Cross/plugins/BitBltPlugin - ASMFLAGS = -cpu=6 - AS = asasm $(ASMFLAGS) $(ASMINCLUDES) -o - OBJS = BitBltPlugin$o BitBltArm$o BitBltArmLinux$o BitBltArmSimdAlphaBlend$o BitBltArmSimdBitLogical$o BitBltArmSimdPixPaint$o BitBltArmSimdSourceWord$o BitBltArmSimd$o BitBltDispatch$o BitBltGeneric$o -endif - -$(TARGET) : $(OBJS) Makefile - $(LINK) $(TARGET) $(OBJS) - $(RANLIB) $(TARGET) - -[make_targets] - -.force :
vm-dev@lists.squeakfoundation.org