Removed explicit generic object file format

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8097 8c9fc860-2736-0410-a75d-ab315db34111

ARM/ARM.A2/A2.Tool

@@ -13,7 +13,7 @@ Modules FPE64 and ARMRuntime are needed and were taken from Minos.
 
 For Zynq/ZedBoard targets, the compilation line is:
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic
+Compiler.Compile -b=ARM --traceModule=Trace
 	(* Zynq specific initialization *)
 	basel/ARM.A2/Initializer.Zynq.Mod
 
@@ -29,7 +29,7 @@ Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic
 	basel/ARM.A2/Heaps.Mod oc/Generic.Modules.Mod basel/ARM.A2/Objects.Mod basel/ARM.A2/Kernel.Mod
 ~
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	(* Interactive shell on UART *)
 	basel/ARM.A2/KernelLog.Mod basel/ARM.A2/ARM.Streams.Mod Commands.Mod basel/ARM.A2/ARM.Reals.Mod Clock.Mod Dates.Mod Strings.Mod Pipes.Mod Files.Mod Shell.Mod
 	basel/ARM.A2/ShellController.Mod
@@ -67,21 +67,21 @@ Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
 ~
 
 Trap handling:
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals (*--trace=* -i*)
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals (*--trace=* -i*)
 	basel/ARM.A2/KernelLog.Mod basel/ARM.A2/ARM.Streams.Mod Reflection.Mod TrapWriters.Mod basel/ARM.A2/ARM.Traps.Mod
 ~
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals basel/ARM.A2/GenericLoader.Mod Test.Mod ~
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals basel/ARM.A2/GenericLoader.Mod Test.Mod ~
 
 Dynamically linked modules:
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals (*--trace=* -i*)
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals (*--trace=* -i*)
 	Trace.Mod
 	KernelLog.Mod
 	basel/ARM.A2/Test.Mod
 	HeapTest.Mod
 ~
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals (*--trace=* -i*)
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals (*--trace=* -i*)
 	Test.Mod
 ~
 

ARM/ARM.A2/ARM.Release.Tool

@@ -7,7 +7,7 @@ BUILDS
 	ZynqStatic {
 		INCLUDE "ARM NATIVE ZYNQ A2 STATIC"
 		COMPILER "Compiler.Compile"
-		COMPILEOPTIONS "-p=ARMA2 --objectFile=Generic --mergeSections --useFPU32 --useFPU64"
+		COMPILEOPTIONS "-p=ARMA2 --mergeSections --useFPU32 --useFPU64"
 		TARGET "ARM"
 		EXTENSION "Gof"
 		SYMBOLEXTENSION "Sym"
@@ -21,7 +21,7 @@ BUILDS
 	ZynqDynamic {
 		INCLUDE "ARM NATIVE ZYNQ A2 DYNAMIC"
 		COMPILER "Compiler.Compile"
-		COMPILEOPTIONS "-p=ARMA2 --objectFile=Generic --mergeSections --useFPU32 --useFPU64"
+		COMPILEOPTIONS "-p=ARMA2 --mergeSections --useFPU32 --useFPU64"
 		TARGET "ARM"
 		EXTENSION "Gof"
 		SYMBOLEXTENSION "Sym"

ARM/ARM.A2/DMA330Test.Mod

@@ -643,7 +643,7 @@ BEGIN
 	Trace.String(" :: Stack Transfer Errors: "); Trace.Int(count, 0); Trace.String("/"); Trace.Int(Repeats, 0); Trace.Ln
 END DMA330.
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	basel/ARM.A2/DMA330Test.Mod
 ~
 

ARM/ARM.A2/DMAProgramWriterTest.Mod

@@ -884,7 +884,7 @@ Release.Build -b -f=ARM.Release.Tool -o="--traceModule=Trace" --only="System Ran
 Release.Build -l -f=ARM.Release.Tool --only="Kernel System Random UsbCore Shell" ZynqA2 ~
 
 SystemTools.DoCommands
-	Compiler.Compile -b=ARM --objectFile=Generic --mergeSections
+	Compiler.Compile -b=ARM --mergeSections
 		Zynq.PsConfig.Mod
 		TestFifo/Zynq.AcAxisIo.Mod
 		DMA330.Mod

ARM/ARM.A2/TestDMA.Mod

@@ -89,7 +89,7 @@ BEGIN
 	(*END*)
 END TestDMA.
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	Timothee/ARM.A2/ARM.Streams.Mod 
 	Timothee/ARM.A2/ARM.Math.Mod
 	Random.Mod

ARM/ARM.A2/TestDMA2.Mod

@@ -107,7 +107,7 @@ BEGIN
 	Trace.String(" => Differences: "); Trace.Int(count, 0); Trace.String("/"); Trace.Int(Size, 0); Trace.Ln*)
 END TestDMA.
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic  --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	basel/ARM.A2/ARM.Streams.Mod 
 	basel/ARM.A2/ARM.Math.Mod
 	Random.Mod

ARM/ARM.A2/TestGpo.Tool

@@ -3,7 +3,7 @@ A2 on ARM
 
 For Zynq/ZedBoard targets, the compilation line is:
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --destPath=arm.bin
+Compiler.Compile -b=ARM --traceModule=Trace --destPath=arm.bin
 	ARM.A2/Initializer.Zynq.Mod
 
 	ARM.A2/Runtime.Mod

ARM/ARM.A2/TestPlFifo.Mod

@@ -284,7 +284,7 @@ BEGIN
 END TestPlFifo.
 
 SystemTools.DoCommands
-	Compiler.Compile -b=ARM --objectFile=Generic --mergeSections
+	Compiler.Compile -b=ARM --mergeSections
 		Zynq.PsConfig.Mod
 		TestFifo/Zynq.AcAxisIo.Mod
 		DMA330.Mod

ARM/ARM.A2/USB.Tool

@@ -1,6 +1,6 @@
 To compile the A2 kernel, see A2.Tool.
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	basel/ARM.A2/KernelLog.Mod
 
 	(* Non-USB modules needed for the HID Driver *)
@@ -28,13 +28,13 @@ Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
 	Serials.Mod BluetoothTest.Mod
 ~
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	(* Video modules *)
 	basel/ARM.A2/UsbVideoDesc.Mod
 	basel/ARM.A2/UsbVideo.Mod
 ~
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	Caches.Mod DiskVolumes.Mod
 ~
 
@@ -65,7 +65,7 @@ StaticLinker.Link --fileName=Test.Bin --displacement=100000H -a
 =======================================
 For testing the EHCI controller on the ZedBoard, here is a simple initialization module:
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	basel/ARM.A2/TestUsbEhci.Mod
 	basel/ARM.A2/USBTestWatcher.Mod
 ~

ARM/ARM.A2/VNC.Tool

@@ -2,7 +2,7 @@ Commands that have to be run in order to get FTP, VNC, RAMFS working are listed
 	basel/ARM.A2/ZynqScript.txt
 Note that the command for VNC has to be run for the initialization of module WMStandardComponents, so the module ShellController needs to be linked BEFORE.
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	basel/ARM.A2/KernelLog.Mod Streams.Mod Commands.Mod basel/ARM.A2/ARM.Reals.Mod Clock.Mod Dates.Mod
 	Strings.Mod Options.Mod ActiveTimers.Mod Plugins.Mod basel/ARM.A2/ARM.Network.Mod
 
@@ -26,13 +26,13 @@ Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
 	basel/ARM.A2/VNCController.Mod
 ~
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	MainMenu.Mod Tar.Mod WMRestorable.Mod WMNavigate.Mod
 	WMUtilities.Mod
 	PNGDecoder.Mod
 	WMOberonFonts.Mod
 ~
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals WMTrees.Mod WMGrids.Mod WMStringGrids.Mod WMMacros.Mod WMSearchComponents.Mod WMDocumentEditor.Mod Notepad.Mod WMSystemComponents.Mod WMFileManager.Mod ~
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals WMTrees.Mod WMGrids.Mod WMStringGrids.Mod WMMacros.Mod WMSearchComponents.Mod WMDocumentEditor.Mod Notepad.Mod WMSystemComponents.Mod WMFileManager.Mod ~
 
 StaticLinker.Link --fileName=Test.Bin --displacement=100000H -a
 	Initializer Runtime Platform FPE64 ARMRuntime Trace Uart
@@ -64,7 +64,7 @@ StaticLinker.Link --fileName=Test.Bin --displacement=100000H -a
 	VNCController
 ~
 
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --initLocals
+Compiler.Compile -b=ARM --traceModule=Trace --initLocals
 	basel/ARM.A2/Zynq.XEmac.Mod
 	basel/ARM.A2/StaticInterface.Mod
 	Test.Mod

ARM/Enet/Zynq.TestEnetMT.Mod

@@ -361,7 +361,7 @@ FSTools.Safe ~
 SystemTools.DoCommands
 Release.Build -b -f=ARM.Release.Tool -o='--replacements=Replacements.tmp --noInitLocals --traceModule=Trace' --only="Kernel" ZynqA2 ~
 Release.Build -b -f=ARM.Release.Tool -o='--replacements=Replacements.tmp --traceModule=Trace' --only="System Enet Shell" ZynqA2 ~
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --replacements=Replacements.tmp
+Compiler.Compile -b=ARM --traceModule=Trace --replacements=Replacements.tmp
 	ENET:Zynq.TestEnetMT.Mod
 ~
 ~

ARM/Enet/Zynq.TestEnetST.Mod

@@ -347,7 +347,7 @@ EnetEmacPs7.AllowZeroPhyAddr = [TRUE,TRUE];
 SystemTools.DoCommands
 Release.Build -b -f=ARM.Release.Tool -o='--replacements=Replacements.tmp --noInitLocals --traceModule=Trace' --only="Kernel" ZynqMinos ~
 Release.Build -b -f=ARM.Release.Tool -o='--replacements=Replacements.tmp --traceModule=Trace' --only="System Enet Shell" ZynqMinos ~
-Compiler.Compile -b=ARM --traceModule=Trace --objectFile=Generic --replacements=Replacements.tmp 
+Compiler.Compile -b=ARM --traceModule=Trace --replacements=Replacements.tmp 
 	Zynq.TestEnetST.Mod
 ~
 ~

ARM/TE0726.Tool

@@ -117,7 +117,7 @@ Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=MD5Checksum TE0726 ~
 FSTools.CreateDirectory build/ ~
 FSTools.DeleteFiles build/* ~
 Release.Build -b --path='build/' -f=ZYNQ:/ARM.Release.Tool
-	-o='--objectFile=Generic --symbolFile=Textual --mergeSections --traceModule=Trace --noInitLocals --useFPU64' --only=Kernel
+	-o='--mergeSections --traceModule=Trace --noInitLocals --useFPU64' --only=Kernel
 	ZynqDynamic
 ~
 Release.Build -b --path='build/' -f=ZYNQ:/ARM.Release.Tool --only='System SD BootConsole' ZynqDynamic ~
@@ -126,7 +126,7 @@ Release.Build -b -z --path='build/' -f=ZYNQ:/ARM.Release.Tool
 	--only='System SystemExt FpgaDisplay Kernel Math SD Shell SystemTools Usb DMA FS Profiler Crypto GUI Compiler Archives Gfx'
 	--exclude="Network Enet Inga" ZynqDynamic ~
 
-Compiler.Compile -p=ARMA2 --objectFile=Generic --symbolFile=Textual --mergeSections  --useFPU64 --replacements=TE0726.DisplayLinear.Replacements.tmp --destPath='build/'
+Compiler.Compile -p=ARMA2 --mergeSections  --useFPU64 --replacements=TE0726.DisplayLinear.Replacements.tmp --destPath='build/'
 ZYNQ:/Zynq.DisplayLinear.Mod
 ~
 
@@ -266,4 +266,4 @@ Partitions.FileToPartition PhysicalDrive1#0 build/TE0726.ZynqA2.img 0 819200 ~
 #
 # Compiler options for ARM
 #
--p=ARMA2 --objectFile=Generic --symbolFile=Textual --mergeSections  --useFPU64 --destPath='build/'
+-p=ARMA2 --mergeSections  --useFPU64 --destPath='build/'

ARM/USB/A2.BuildForHpMini.Tool

@@ -20,7 +20,7 @@ Release.Build
 # Create image for bootable USB  (A2USB.img)
 SystemTools.DoCommands
 
-	Compiler.Compile --objectFile=Generic --mergeSections -b=AMD --objectFileExtension=.Gox --symbolFileExtension=.Syx --destPath=bin/
+	Compiler.Compile --mergeSections -b=AMD --objectFileExtension=.Gox --symbolFileExtension=.Syx --destPath=bin/
 		UsbDebug.Mod
 
 		(* NEW *)

ARM/USB/Release.Tool

@@ -125,7 +125,7 @@ BUILDS
 	A2Cooperative {
 		INCLUDE "NATIVE I386 COOP NATIVECOOP NATIVEI386COOP I386COOP"
 		COMPILER "Compiler.Compile"
-		COMPILEOPTIONS "--cooperative --objectFile=Generic --traceModule=Trace --mergeSections"
+		COMPILEOPTIONS "--cooperative --traceModule=Trace --mergeSections"
 		TARGET "AMD"
 		EXTENSION "Gof"
 		SYMBOLEXTENSION "Sym"
@@ -136,7 +136,7 @@ BUILDS
 	A2RPiCooperative {
 		INCLUDE "NATIVE ARM RPI COOP RPICOOP"
 		COMPILER "Compiler.Compile"
-		COMPILEOPTIONS "--cooperative --objectFile=Generic --traceModule=Trace --mergeSections"
+		COMPILEOPTIONS "--cooperative --traceModule=Trace --mergeSections"
 		TARGET "ARM"
 		EXTENSION "Gof"
 		SYMBOLEXTENSION "Sym"
@@ -147,7 +147,7 @@ BUILDS
 	A2ZynqCooperative {
 		INCLUDE "NATIVE ARM ZYNQ COOP ZYNQCOOP"
 		COMPILER "Compiler.Compile"
-		COMPILEOPTIONS "--cooperative --objectFile=Generic --traceModule=Trace --mergeSections"
+		COMPILEOPTIONS "--cooperative --traceModule=Trace --mergeSections"
 		TARGET "ARM"
 		EXTENSION "Gof"
 		SYMBOLEXTENSION "Sym"
@@ -159,7 +159,7 @@ BUILDS
 	{
 		INCLUDE "NATIVE NATIVEGEN I386 I386GEN UNCOOP"
 		COMPILER "Compiler.Compile"
-		COMPILEOPTIONS "--objectFile=Generic --mergeSections"
+		COMPILEOPTIONS "--mergeSections"
 		TARGET "AMD"
 		EXTENSION "Gox"
 		SYMBOLEXTENSION "Syx"
@@ -171,7 +171,7 @@ BUILDS
 	{
 		INCLUDE "WIN iWIN WINGEN UNCOOP"
 		COMPILER "Compiler.Compile"
-		COMPILEOPTIONS "--objectFile=Generic --mergeSections"
+		COMPILEOPTIONS "--mergeSections"
 		TARGET "AMD"
 		EXTENSION "GofW"
 		SYMBOLEXTENSION "SymW"
@@ -215,7 +215,7 @@ BUILDS
 	WinAosCooperative {
 		INCLUDE "WIN iWIN COOP WINCOOP I386COOP"
 		COMPILER "Compiler.Compile"
-		COMPILEOPTIONS "--cooperative --objectFile=Generic --traceModule=Trace"
+		COMPILEOPTIONS "--cooperative --traceModule=Trace"
 		TARGET "AMD"
 		EXTENSION "GofCW"
 		SYMBOLEXTENSION "SymCW"

ARM/USB/UsbTdAllocatorTest.Mod

@@ -64,7 +64,7 @@ END UsbTdAllocatorTest.
 
 UsbTdAllocatorTest.Benchmark ~
 SystemTools.Free UsbTdAllocatorTest UsbTdAllocator ~
-Compiler.Compile -b=ARM --objectFile=Generic --traceModule=Trace --mergeSections
+Compiler.Compile -b=ARM --traceModule=Trace --mergeSections
 	basel/USB/UsbVarTdAlloc.Mod
 	basel/USB/UsbTdAllocatorTest.Mod
 ~

ARM/Zedboard.Tool

@@ -117,7 +117,7 @@ Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=MD5Checksum Zedboard ~
 FSTools.CreateDirectory build/ ~
 FSTools.DeleteFiles build/* ~
 Release.Build -b --path='build/' -f=ZYNQ:/ARM.Release.Tool
-	-o='--objectFile=Generic --symbolFile=Textual --mergeSections --traceModule=Trace --noInitLocals --useFPU64' --only=Kernel
+	-o='--mergeSections --traceModule=Trace --noInitLocals --useFPU64' --only=Kernel
 	ZynqDynamic
 ~
 Release.Build -b --path='build/' -f=ZYNQ:/ARM.Release.Tool --only='System SD BootConsole' ZynqDynamic ~
@@ -126,7 +126,7 @@ Release.Build -b -z --path='build/' -f=ZYNQ:/ARM.Release.Tool
 	--only='System SystemExt FpgaDisplay Kernel Math SD Shell SystemTools Usb DMA FS Profiler Crypto GUI Compiler Archives Gfx'
 	--exclude="Network Enet Inga" ZynqDynamic ~
 
-Compiler.Compile -p=ARMA2 --objectFile=Generic --symbolFile=Textual --mergeSections  --useFPU64 --replacements=Zedboard.DisplayLinear.Replacements.tmp --destPath='build/'
+Compiler.Compile -p=ARMA2 --mergeSections  --useFPU64 --replacements=Zedboard.DisplayLinear.Replacements.tmp --destPath='build/'
 ZYNQ:/Zynq.DisplayLinear.Mod
 ~
 
@@ -267,5 +267,5 @@ Partitions.FileToPartition PhysicalDrive1#0 build/Zedboard.ZynqA2.img 0 819200 ~
 #
 # Compiler options for ARM
 #
--p=ARMA2 --objectFile=Generic --symbolFile=Textual --mergeSections  --useFPU64 --destPath='build/'
+-p=ARMA2 --mergeSections  --useFPU64 --destPath='build/'
 

ARM/Zybo.Tool

@@ -134,7 +134,7 @@ Release.Build -b -f=ZBL:/BootloaderRelease.Tool --only=MD5Checksum Zybo ~
 FSTools.CreateDirectory build/ ~
 FSTools.DeleteFiles build/* ~
 Release.Build -b --path='build/' -f=ZYNQ:/ARM.Release.Tool
-	-o='--objectFile=Generic --symbolFile=Textual --mergeSections --traceModule=Trace --noInitLocals --useFPU64' --only=Kernel
+	-o='--mergeSections --traceModule=Trace --noInitLocals --useFPU64' --only=Kernel
 	ZynqDynamic
 ~
 Release.Build -b --path='build/' -f=ZYNQ:/ARM.Release.Tool --only='System SD BootConsole' ZynqDynamic ~
@@ -143,7 +143,7 @@ Release.Build -b -z --path='build/' -f=ZYNQ:/ARM.Release.Tool
 	--only='System SystemExt FpgaDisplay Kernel Math SD Shell SystemTools Usb DMA FS Profiler Crypto GUI Compiler Archives Gfx'
 	--exclude="Network Enet Inga" ZynqDynamic ~
 
-Compiler.Compile -p=ARMA2 --objectFile=Generic --symbolFile=Textual --mergeSections  --useFPU64 --replacements=Zybo.DisplayLinear.Replacements.tmp --destPath='build/'
+Compiler.Compile -p=ARMA2 --mergeSections  --useFPU64 --replacements=Zybo.DisplayLinear.Replacements.tmp --destPath='build/'
 ZYNQ:/Zynq.DisplayLinear.Mod
 ~
 
@@ -284,4 +284,4 @@ Partitions.FileToPartition PhysicalDrive1#0 build/Zybo.ZynqA2.img 0 819200 ~
 #
 # Compiler options for ARM
 #
--p=ARMA2 --objectFile=Generic --symbolFile=Textual --mergeSections  --useFPU64 --destPath='build/'
+-p=ARMA2 --mergeSections  --useFPU64 --destPath='build/'

source/FoxIntermediateLinker.Mod

@@ -1488,9 +1488,9 @@ END FoxIntermediateLinker.
 
 System.FreeDownTo FoxIntermediateLinker ~
 FoxIntermediateObjectFile.Show Test ~
-FoxIntermediateLinker.Link -b=TRM --objectFile=Generic --targetFile=Test Test ~
+FoxIntermediateLinker.Link -b=TRM --targetFile=Test Test ~
 FoxGenericObjectFile.Show Test.Gof ~
 
-FoxIntermediateLinker.Test -b=TRM --objectFile=Generic --targetFile=Test --extension=.IroT TestActiveCells.TestCellnet.Controller MyController_Name  ~
+FoxIntermediateLinker.Test -b=TRM --targetFile=Test --extension=.IroT TestActiveCells.TestCellnet.Controller MyController_Name  ~
 
 FoxGenericObjectFile.Show MyController_Name.Gof ~