diff --git a/makefile b/makefile index 1b8cb2fd..52aa32a1 100644 --- a/makefile +++ b/makefile @@ -75,24 +75,24 @@ stage2: stage3: $(VOCSTATIC0) -siapxPS SYSTEM.Mod - $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPSF Args.Mod Console.Mod Unix.Mod sed -i.tmp "s#/opt#$(PRF)#g" src/voc/prf.Mod - $(VOCSTATIC0) -sPS prf.Mod - $(VOCSTATIC0) -sPS Strings.Mod architecture.Mod version.Mod Kernel0.Mod Modules.Mod - $(VOCSTATIC0) -sxPS Files0.Mod - $(VOCSTATIC0) -sPS Reals.Mod Texts0.Mod - $(VOCSTATIC0) -sPS vt100.Mod + $(VOCSTATIC0) -sPSF prf.Mod + $(VOCSTATIC0) -sPSF Strings.Mod architecture.Mod version.Mod Kernel0.Mod Modules.Mod + $(VOCSTATIC0) -sxPSF Files0.Mod + $(VOCSTATIC0) -sPSF Reals.Mod Texts0.Mod + $(VOCSTATIC0) -sPSF vt100.Mod # build the compiler stage4: - $(VOCSTATIC0) -sPS errors.Mod - $(VOCSTATIC0) -sPS extTools.Mod - $(VOCSTATIC0) -sPS OPM.cmdln.Mod - $(VOCSTATIC0) -sxPS OPS.Mod - $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod - $(VOCSTATIC0) -smPS voc.Mod - $(VOCSTATIC0) -smPS BrowserCmd.Mod - $(VOCSTATIC0) -smPS OCatCmd.Mod + $(VOCSTATIC0) -sPSF errors.Mod + $(VOCSTATIC0) -sPSF extTools.Mod + $(VOCSTATIC0) -sPSF OPM.cmdln.Mod + $(VOCSTATIC0) -sxPSF OPS.Mod + $(VOCSTATIC0) -sPSF OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod + $(VOCSTATIC0) -smPSF voc.Mod + $(VOCSTATIC0) -smPSF BrowserCmd.Mod + $(VOCSTATIC0) -smPSF OCatCmd.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -117,26 +117,26 @@ stage5: # build all library files stage6: #v4 libs - $(VOCSTATIC) -sP Kernel.Mod - $(VOCSTATIC) -sP Files.Mod - $(VOCSTATIC) -sP Texts.Mod - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod - $(VOCSTATIC) -sP Oberon.Mod + $(VOCSTATIC) -sPF Kernel.Mod + $(VOCSTATIC) -sPF Files.Mod + $(VOCSTATIC) -sPF Texts.Mod + $(VOCSTATIC) -sPF Printer.Mod + $(VOCSTATIC) -sPF Strings.Mod + $(VOCSTATIC) -sPF Sets.Mod + $(VOCSTATIC) -sPF Sets0.Mod + $(VOCSTATIC) -sPF Oberon.Mod #ooc libs - $(VOCSTATIC) -sP oocAscii.Mod - $(VOCSTATIC) -sP oocStrings.Mod - $(VOCSTATIC) -sP oocStrings2.Mod - $(VOCSTATIC) -sP oocOakStrings.Mod - $(VOCSTATIC) -sP oocCharClass.Mod - $(VOCSTATIC) -sP oocConvTypes.Mod - $(VOCSTATIC) -sP oocIntConv.Mod - $(VOCSTATIC) -sP oocIntStr.Mod - $(VOCSTATIC) -sP oocSysClock.Mod - $(VOCSTATIC) -sP oocTime.Mod + $(VOCSTATIC) -sPF oocAscii.Mod + $(VOCSTATIC) -sPF oocStrings.Mod + $(VOCSTATIC) -sPF oocStrings2.Mod + $(VOCSTATIC) -sPF oocOakStrings.Mod + $(VOCSTATIC) -sPF oocCharClass.Mod + $(VOCSTATIC) -sPF oocConvTypes.Mod + $(VOCSTATIC) -sPF oocIntConv.Mod + $(VOCSTATIC) -sPF oocIntStr.Mod + $(VOCSTATIC) -sPF oocSysClock.Mod + $(VOCSTATIC) -sPF oocTime.Mod # $(VOCSTATIC) -s oocLongStrings.Mod # $(CC) oocLongStrings.c # $(VOCSTATIC) -s oocMsg.Mod @@ -144,109 +144,109 @@ stage6: #ooc2 libs - $(VOCSTATIC) -sP ooc2Strings.Mod - $(VOCSTATIC) -sP ooc2Ascii.Mod - $(VOCSTATIC) -sP ooc2CharClass.Mod - $(VOCSTATIC) -sP ooc2ConvTypes.Mod - $(VOCSTATIC) -sP ooc2IntConv.Mod - $(VOCSTATIC) -sP ooc2IntStr.Mod - $(VOCSTATIC) -sP ooc2Real0.Mod + $(VOCSTATIC) -sPF ooc2Strings.Mod + $(VOCSTATIC) -sPF ooc2Ascii.Mod + $(VOCSTATIC) -sPF ooc2CharClass.Mod + $(VOCSTATIC) -sPF ooc2ConvTypes.Mod + $(VOCSTATIC) -sPF ooc2IntConv.Mod + $(VOCSTATIC) -sPF ooc2IntStr.Mod + $(VOCSTATIC) -sPF ooc2Real0.Mod #ooc libs - $(VOCSTATIC) -sP oocLowReal.Mod oocLowLReal.Mod - $(VOCSTATIC) -sP oocRealMath.Mod oocOakMath.Mod - $(VOCSTATIC) -sP oocLRealMath.Mod - $(VOCSTATIC) -sP oocLongInts.Mod - $(VOCSTATIC) -sP oocComplexMath.Mod oocLComplexMath.Mod - $(VOCSTATIC) -sP oocLRealConv.Mod oocLRealStr.Mod - $(VOCSTATIC) -sP oocRealConv.Mod oocRealStr.Mod - $(VOCSTATIC) -sP oocMsg.Mod oocChannel.Mod - $(VOCSTATIC) -sP oocStrings2.Mod oocRts.Mod oocFilenames.Mod - $(VOCSTATIC) -sP oocTextRider.Mod oocBinaryRider.Mod oocJulianDay.Mod - $(VOCSTATIC) -sP oocFilenames.Mod - $(VOCSTATIC) -sP oocwrapperlibc.Mod - $(VOCSTATIC) -sP oocC.Mod + $(VOCSTATIC) -sPF oocLowReal.Mod oocLowLReal.Mod + $(VOCSTATIC) -sPF oocRealMath.Mod oocOakMath.Mod + $(VOCSTATIC) -sPF oocLRealMath.Mod + $(VOCSTATIC) -sPF oocLongInts.Mod + $(VOCSTATIC) -sPF oocComplexMath.Mod oocLComplexMath.Mod + $(VOCSTATIC) -sPF oocLRealConv.Mod oocLRealStr.Mod + $(VOCSTATIC) -sPF oocRealConv.Mod oocRealStr.Mod + $(VOCSTATIC) -sPF oocMsg.Mod oocChannel.Mod + $(VOCSTATIC) -sPF oocStrings2.Mod oocRts.Mod oocFilenames.Mod + $(VOCSTATIC) -sPF oocTextRider.Mod oocBinaryRider.Mod oocJulianDay.Mod + $(VOCSTATIC) -sPF oocFilenames.Mod + $(VOCSTATIC) -sPF oocwrapperlibc.Mod + $(VOCSTATIC) -sPF oocC.Mod #Ulm's Oberon system libs - $(VOCSTATIC) -sP ulmSys.Mod - $(VOCSTATIC) -sP ulmSYSTEM.Mod - $(VOCSTATIC) -sP ulmASCII.Mod - $(VOCSTATIC) -sP ulmSets.Mod - $(VOCSTATIC) -sP ulmObjects.Mod - $(VOCSTATIC) -sP ulmDisciplines.Mod - $(VOCSTATIC) -sP ulmPriorities.Mod - $(VOCSTATIC) -sP ulmServices.Mod - $(VOCSTATIC) -sP ulmEvents.Mod - $(VOCSTATIC) -sP ulmResources.Mod - $(VOCSTATIC) -sP ulmForwarders.Mod - $(VOCSTATIC) -sP ulmRelatedEvents.Mod - $(VOCSTATIC) -sP ulmIO.Mod - $(VOCSTATIC) -sP ulmProcess.Mod - $(VOCSTATIC) -sP ulmTypes.Mod - $(VOCSTATIC) -sP ulmStreams.Mod - $(VOCSTATIC) -sP ulmAssertions.Mod - $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod - $(VOCSTATIC) -sP ulmStreamDisciplines.Mod - $(VOCSTATIC) -sP ulmIEEE.Mod - $(VOCSTATIC) -sP ulmMC68881.Mod - $(VOCSTATIC) -sP ulmReals.Mod - $(VOCSTATIC) -sP ulmPrint.Mod - $(VOCSTATIC) -sP ulmWrite.Mod - $(VOCSTATIC) -sP ulmTexts.Mod - $(VOCSTATIC) -sP ulmStrings.Mod - $(VOCSTATIC) -sP ulmConstStrings.Mod - $(VOCSTATIC) -sP ulmPlotters.Mod - $(VOCSTATIC) -sP ulmSysTypes.Mod - $(VOCSTATIC) -sP ulmSysConversions.Mod - $(VOCSTATIC) -sP ulmErrors.Mod - $(VOCSTATIC) -sP ulmSysErrors.Mod - $(VOCSTATIC) -sP ulmSysIO.Mod - $(VOCSTATIC) -sP ulmLoader.Mod - $(VOCSTATIC) -sP ulmNetIO.Mod - $(VOCSTATIC) -sP ulmPersistentObjects.Mod - $(VOCSTATIC) -sP ulmPersistentDisciplines.Mod - $(VOCSTATIC) -sP ulmOperations.Mod - $(VOCSTATIC) -sP ulmScales.Mod - $(VOCSTATIC) -sP ulmTimes.Mod - $(VOCSTATIC) -sP ulmClocks.Mod - $(VOCSTATIC) -sP ulmTimers.Mod - $(VOCSTATIC) -sP ulmConditions.Mod - $(VOCSTATIC) -sP ulmStreamConditions.Mod - $(VOCSTATIC) -sP ulmTimeConditions.Mod - $(VOCSTATIC) -sP ulmSysConversions.Mod - $(VOCSTATIC) -sP ulmSysStat.Mod - $(VOCSTATIC) -sP ulmCiphers.Mod - $(VOCSTATIC) -sP ulmCipherOps.Mod - $(VOCSTATIC) -sP ulmBlockCiphers.Mod - $(VOCSTATIC) -sP ulmAsymmetricCiphers.Mod - $(VOCSTATIC) -sP ulmConclusions.Mod - $(VOCSTATIC) -sP ulmRandomGenerators.Mod - $(VOCSTATIC) -sP ulmTCrypt.Mod - $(VOCSTATIC) -sP ulmIntOperations.Mod + $(VOCSTATIC) -sPF ulmSys.Mod + $(VOCSTATIC) -sPF ulmSYSTEM.Mod + $(VOCSTATIC) -sPF ulmASCII.Mod + $(VOCSTATIC) -sPF ulmSets.Mod + $(VOCSTATIC) -sPF ulmObjects.Mod + $(VOCSTATIC) -sPF ulmDisciplines.Mod + $(VOCSTATIC) -sPF ulmPriorities.Mod + $(VOCSTATIC) -sPF ulmServices.Mod + $(VOCSTATIC) -sPF ulmEvents.Mod + $(VOCSTATIC) -sPF ulmResources.Mod + $(VOCSTATIC) -sPF ulmForwarders.Mod + $(VOCSTATIC) -sPF ulmRelatedEvents.Mod + $(VOCSTATIC) -sPF ulmIO.Mod + $(VOCSTATIC) -sPF ulmProcess.Mod + $(VOCSTATIC) -sPF ulmTypes.Mod + $(VOCSTATIC) -sPF ulmStreams.Mod + $(VOCSTATIC) -sPF ulmAssertions.Mod + $(VOCSTATIC) -sPF ulmIndirectDisciplines.Mod + $(VOCSTATIC) -sPF ulmStreamDisciplines.Mod + $(VOCSTATIC) -sPF ulmIEEE.Mod + $(VOCSTATIC) -sPF ulmMC68881.Mod + $(VOCSTATIC) -sPF ulmReals.Mod + $(VOCSTATIC) -sPF ulmPrint.Mod + $(VOCSTATIC) -sPF ulmWrite.Mod + $(VOCSTATIC) -sPF ulmTexts.Mod + $(VOCSTATIC) -sPF ulmStrings.Mod + $(VOCSTATIC) -sPF ulmConstStrings.Mod + $(VOCSTATIC) -sPF ulmPlotters.Mod + $(VOCSTATIC) -sPF ulmSysTypes.Mod + $(VOCSTATIC) -sPF ulmSysConversions.Mod + $(VOCSTATIC) -sPF ulmErrors.Mod + $(VOCSTATIC) -sPF ulmSysErrors.Mod + $(VOCSTATIC) -sPF ulmSysIO.Mod + $(VOCSTATIC) -sPF ulmLoader.Mod + $(VOCSTATIC) -sPF ulmNetIO.Mod + $(VOCSTATIC) -sPF ulmPersistentObjects.Mod + $(VOCSTATIC) -sPF ulmPersistentDisciplines.Mod + $(VOCSTATIC) -sPF ulmOperations.Mod + $(VOCSTATIC) -sPF ulmScales.Mod + $(VOCSTATIC) -sPF ulmTimes.Mod + $(VOCSTATIC) -sPF ulmClocks.Mod + $(VOCSTATIC) -sPF ulmTimers.Mod + $(VOCSTATIC) -sPF ulmConditions.Mod + $(VOCSTATIC) -sPF ulmStreamConditions.Mod + $(VOCSTATIC) -sPF ulmTimeConditions.Mod + $(VOCSTATIC) -sPF ulmSysConversions.Mod + $(VOCSTATIC) -sPF ulmSysStat.Mod + $(VOCSTATIC) -sPF ulmCiphers.Mod + $(VOCSTATIC) -sPF ulmCipherOps.Mod + $(VOCSTATIC) -sPF ulmBlockCiphers.Mod + $(VOCSTATIC) -sPF ulmAsymmetricCiphers.Mod + $(VOCSTATIC) -sPF ulmConclusions.Mod + $(VOCSTATIC) -sPF ulmRandomGenerators.Mod + $(VOCSTATIC) -sPF ulmTCrypt.Mod + $(VOCSTATIC) -sPF ulmIntOperations.Mod #pow32 libs - $(VOCSTATIC) -sP powStrings.Mod + $(VOCSTATIC) -sPF powStrings.Mod #misc libs - $(VOCSTATIC) -sP MultiArrays.Mod - $(VOCSTATIC) -sP MultiArrayRiders.Mod - $(VOCSTATIC) -sP MersenneTwister.Mod - $(VOCSTATIC) -sP Listen.Mod + $(VOCSTATIC) -sPF MultiArrays.Mod + $(VOCSTATIC) -sPF MultiArrayRiders.Mod + $(VOCSTATIC) -sPF MersenneTwister.Mod + $(VOCSTATIC) -sPF Listen.Mod #s3 libs - $(VOCSTATIC) -sP ethBTrees.Mod - $(VOCSTATIC) -sP ethMD5.Mod - $(VOCSTATIC) -sP ethSets.Mod - $(VOCSTATIC) -sP ethZlib.Mod - $(VOCSTATIC) -sP ethZlibBuffers.Mod - $(VOCSTATIC) -sP ethZlibInflate.Mod - $(VOCSTATIC) -sP ethZlibDeflate.Mod - $(VOCSTATIC) -sP ethZlibReaders.Mod - $(VOCSTATIC) -sP ethZlibWriters.Mod - $(VOCSTATIC) -sP ethZip.Mod - $(VOCSTATIC) -sP ethRandomNumbers.Mod - $(VOCSTATIC) -sP ethGZReaders.Mod - $(VOCSTATIC) -sP ethGZWriters.Mod - $(VOCSTATIC) -sP ethUnicode.Mod + $(VOCSTATIC) -sPF ethBTrees.Mod + $(VOCSTATIC) -sPF ethMD5.Mod + $(VOCSTATIC) -sPF ethSets.Mod + $(VOCSTATIC) -sPF ethZlib.Mod + $(VOCSTATIC) -sPF ethZlibBuffers.Mod + $(VOCSTATIC) -sPF ethZlibInflate.Mod + $(VOCSTATIC) -sPF ethZlibDeflate.Mod + $(VOCSTATIC) -sPF ethZlibReaders.Mod + $(VOCSTATIC) -sPF ethZlibWriters.Mod + $(VOCSTATIC) -sPF ethZip.Mod + $(VOCSTATIC) -sPF ethRandomNumbers.Mod + $(VOCSTATIC) -sPF ethGZReaders.Mod + $(VOCSTATIC) -sPF ethGZWriters.Mod + $(VOCSTATIC) -sPF ethUnicode.Mod # build remaining tools diff --git a/makefile.linux.gcc.x86_64 b/makefile.linux.gcc.x86_64 index fcef054e..52aa32a1 100644 --- a/makefile.linux.gcc.x86_64 +++ b/makefile.linux.gcc.x86_64 @@ -75,24 +75,24 @@ stage2: stage3: $(VOCSTATIC0) -siapxPS SYSTEM.Mod - $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPSF Args.Mod Console.Mod Unix.Mod sed -i.tmp "s#/opt#$(PRF)#g" src/voc/prf.Mod - $(VOCSTATIC0) -sPS prf.Mod - $(VOCSTATIC0) -sPS Strings.Mod architecture.Mod version.Mod Kernel0.Mod Modules.Mod - $(VOCSTATIC0) -sxPS Files0.Mod - $(VOCSTATIC0) -sPS Reals.Mod Texts0.Mod - $(VOCSTATIC0) -sPS vt100.Mod + $(VOCSTATIC0) -sPSF prf.Mod + $(VOCSTATIC0) -sPSF Strings.Mod architecture.Mod version.Mod Kernel0.Mod Modules.Mod + $(VOCSTATIC0) -sxPSF Files0.Mod + $(VOCSTATIC0) -sPSF Reals.Mod Texts0.Mod + $(VOCSTATIC0) -sPSF vt100.Mod # build the compiler stage4: - $(VOCSTATIC0) -sPS errors.Mod - $(VOCSTATIC0) -sPS extTools.Mod - $(VOCSTATIC0) -sPS OPM.cmdln.Mod - $(VOCSTATIC0) -sxPS OPS.Mod - $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod - $(VOCSTATIC0) -smPS voc.Mod - $(VOCSTATIC0) -smPS BrowserCmd.Mod - $(VOCSTATIC0) -smPS OCatCmd.Mod + $(VOCSTATIC0) -sPSF errors.Mod + $(VOCSTATIC0) -sPSF extTools.Mod + $(VOCSTATIC0) -sPSF OPM.cmdln.Mod + $(VOCSTATIC0) -sxPSF OPS.Mod + $(VOCSTATIC0) -sPSF OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod + $(VOCSTATIC0) -smPSF voc.Mod + $(VOCSTATIC0) -smPSF BrowserCmd.Mod + $(VOCSTATIC0) -smPSF OCatCmd.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -117,26 +117,26 @@ stage5: # build all library files stage6: #v4 libs - $(VOCSTATIC) -sP Kernel.Mod - $(VOCSTATIC) -sP Files.Mod - $(VOCSTATIC) -sP Texts.Mod - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod - $(VOCSTATIC) -sP Oberon.Mod + $(VOCSTATIC) -sPF Kernel.Mod + $(VOCSTATIC) -sPF Files.Mod + $(VOCSTATIC) -sPF Texts.Mod + $(VOCSTATIC) -sPF Printer.Mod + $(VOCSTATIC) -sPF Strings.Mod + $(VOCSTATIC) -sPF Sets.Mod + $(VOCSTATIC) -sPF Sets0.Mod + $(VOCSTATIC) -sPF Oberon.Mod #ooc libs - $(VOCSTATIC) -sP oocAscii.Mod - $(VOCSTATIC) -sP oocStrings.Mod - $(VOCSTATIC) -sP oocStrings2.Mod - $(VOCSTATIC) -sP oocOakStrings.Mod - $(VOCSTATIC) -sP oocCharClass.Mod - $(VOCSTATIC) -sP oocConvTypes.Mod - $(VOCSTATIC) -sP oocIntConv.Mod - $(VOCSTATIC) -sP oocIntStr.Mod - $(VOCSTATIC) -sP oocSysClock.Mod - $(VOCSTATIC) -sP oocTime.Mod + $(VOCSTATIC) -sPF oocAscii.Mod + $(VOCSTATIC) -sPF oocStrings.Mod + $(VOCSTATIC) -sPF oocStrings2.Mod + $(VOCSTATIC) -sPF oocOakStrings.Mod + $(VOCSTATIC) -sPF oocCharClass.Mod + $(VOCSTATIC) -sPF oocConvTypes.Mod + $(VOCSTATIC) -sPF oocIntConv.Mod + $(VOCSTATIC) -sPF oocIntStr.Mod + $(VOCSTATIC) -sPF oocSysClock.Mod + $(VOCSTATIC) -sPF oocTime.Mod # $(VOCSTATIC) -s oocLongStrings.Mod # $(CC) oocLongStrings.c # $(VOCSTATIC) -s oocMsg.Mod @@ -144,109 +144,110 @@ stage6: #ooc2 libs - $(VOCSTATIC) -sP ooc2Strings.Mod - $(VOCSTATIC) -sP ooc2Ascii.Mod - $(VOCSTATIC) -sP ooc2CharClass.Mod - $(VOCSTATIC) -sP ooc2ConvTypes.Mod - $(VOCSTATIC) -sP ooc2IntConv.Mod - $(VOCSTATIC) -sP ooc2IntStr.Mod - $(VOCSTATIC) -sP ooc2Real0.Mod + $(VOCSTATIC) -sPF ooc2Strings.Mod + $(VOCSTATIC) -sPF ooc2Ascii.Mod + $(VOCSTATIC) -sPF ooc2CharClass.Mod + $(VOCSTATIC) -sPF ooc2ConvTypes.Mod + $(VOCSTATIC) -sPF ooc2IntConv.Mod + $(VOCSTATIC) -sPF ooc2IntStr.Mod + $(VOCSTATIC) -sPF ooc2Real0.Mod #ooc libs - $(VOCSTATIC) -sP oocLowReal.Mod oocLowLReal.Mod - $(VOCSTATIC) -sP oocRealMath.Mod oocOakMath.Mod - $(VOCSTATIC) -sP oocLRealMath.Mod - $(VOCSTATIC) -sP oocLongInts.Mod - $(VOCSTATIC) -sP oocComplexMath.Mod oocLComplexMath.Mod - $(VOCSTATIC) -sP oocLRealConv.Mod oocLRealStr.Mod - $(VOCSTATIC) -sP oocRealConv.Mod oocRealStr.Mod - $(VOCSTATIC) -sP oocMsg.Mod oocChannel.Mod - $(VOCSTATIC) -sP oocStrings2.Mod oocRts.Mod oocFilenames.Mod - $(VOCSTATIC) -sP oocTextRider.Mod oocBinaryRider.Mod oocJulianDay.Mod - $(VOCSTATIC) -sP oocFilenames.Mod - $(VOCSTATIC) -sP oocwrapperlibc.Mod - $(VOCSTATIC) -sP oocC.Mod + $(VOCSTATIC) -sPF oocLowReal.Mod oocLowLReal.Mod + $(VOCSTATIC) -sPF oocRealMath.Mod oocOakMath.Mod + $(VOCSTATIC) -sPF oocLRealMath.Mod + $(VOCSTATIC) -sPF oocLongInts.Mod + $(VOCSTATIC) -sPF oocComplexMath.Mod oocLComplexMath.Mod + $(VOCSTATIC) -sPF oocLRealConv.Mod oocLRealStr.Mod + $(VOCSTATIC) -sPF oocRealConv.Mod oocRealStr.Mod + $(VOCSTATIC) -sPF oocMsg.Mod oocChannel.Mod + $(VOCSTATIC) -sPF oocStrings2.Mod oocRts.Mod oocFilenames.Mod + $(VOCSTATIC) -sPF oocTextRider.Mod oocBinaryRider.Mod oocJulianDay.Mod + $(VOCSTATIC) -sPF oocFilenames.Mod + $(VOCSTATIC) -sPF oocwrapperlibc.Mod + $(VOCSTATIC) -sPF oocC.Mod #Ulm's Oberon system libs - $(VOCSTATIC) -sP ulmSys.Mod - $(VOCSTATIC) -sP ulmSYSTEM.Mod - $(VOCSTATIC) -sP ulmASCII.Mod - $(VOCSTATIC) -sP ulmSets.Mod - $(VOCSTATIC) -sP ulmObjects.Mod - $(VOCSTATIC) -sP ulmDisciplines.Mod - $(VOCSTATIC) -sP ulmPriorities.Mod - $(VOCSTATIC) -sP ulmServices.Mod - $(VOCSTATIC) -sP ulmEvents.Mod - $(VOCSTATIC) -sP ulmResources.Mod - $(VOCSTATIC) -sP ulmForwarders.Mod - $(VOCSTATIC) -sP ulmRelatedEvents.Mod - $(VOCSTATIC) -sP ulmIO.Mod - $(VOCSTATIC) -sP ulmProcess.Mod - $(VOCSTATIC) -sP ulmTypes.Mod - $(VOCSTATIC) -sP ulmStreams.Mod - $(VOCSTATIC) -sP ulmAssertions.Mod - $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod - $(VOCSTATIC) -sP ulmStreamDisciplines.Mod - $(VOCSTATIC) -sP ulmIEEE.Mod - $(VOCSTATIC) -sP ulmMC68881.Mod - $(VOCSTATIC) -sP ulmReals.Mod - $(VOCSTATIC) -sP ulmPrint.Mod - $(VOCSTATIC) -sP ulmWrite.Mod - $(VOCSTATIC) -sP ulmTexts.Mod - $(VOCSTATIC) -sP ulmStrings.Mod - $(VOCSTATIC) -sP ulmConstStrings.Mod - $(VOCSTATIC) -sP ulmPlotters.Mod - $(VOCSTATIC) -sP ulmSysTypes.Mod - $(VOCSTATIC) -sP ulmSysConversions.Mod - $(VOCSTATIC) -sP ulmErrors.Mod - $(VOCSTATIC) -sP ulmSysErrors.Mod - $(VOCSTATIC) -sP ulmSysIO.Mod - $(VOCSTATIC) -sP ulmLoader.Mod - $(VOCSTATIC) -sP ulmNetIO.Mod - $(VOCSTATIC) -sP ulmPersistentObjects.Mod - $(VOCSTATIC) -sP ulmPersistentDisciplines.Mod - $(VOCSTATIC) -sP ulmOperations.Mod - $(VOCSTATIC) -sP ulmScales.Mod - $(VOCSTATIC) -sP ulmTimes.Mod - $(VOCSTATIC) -sP ulmClocks.Mod - $(VOCSTATIC) -sP ulmTimers.Mod - $(VOCSTATIC) -sP ulmConditions.Mod - $(VOCSTATIC) -sP ulmStreamConditions.Mod - $(VOCSTATIC) -sP ulmTimeConditions.Mod - $(VOCSTATIC) -sP ulmSysConversions.Mod - $(VOCSTATIC) -sP ulmSysStat.Mod - $(VOCSTATIC) -sP ulmCiphers.Mod - $(VOCSTATIC) -sP ulmCipherOps.Mod - $(VOCSTATIC) -sP ulmBlockCiphers.Mod - $(VOCSTATIC) -sP ulmAsymmetricCiphers.Mod - $(VOCSTATIC) -sP ulmConclusions.Mod - $(VOCSTATIC) -sP ulmRandomGenerators.Mod - $(VOCSTATIC) -sP ulmTCrypt.Mod - $(VOCSTATIC) -sP ulmIntOperations.Mod + $(VOCSTATIC) -sPF ulmSys.Mod + $(VOCSTATIC) -sPF ulmSYSTEM.Mod + $(VOCSTATIC) -sPF ulmASCII.Mod + $(VOCSTATIC) -sPF ulmSets.Mod + $(VOCSTATIC) -sPF ulmObjects.Mod + $(VOCSTATIC) -sPF ulmDisciplines.Mod + $(VOCSTATIC) -sPF ulmPriorities.Mod + $(VOCSTATIC) -sPF ulmServices.Mod + $(VOCSTATIC) -sPF ulmEvents.Mod + $(VOCSTATIC) -sPF ulmResources.Mod + $(VOCSTATIC) -sPF ulmForwarders.Mod + $(VOCSTATIC) -sPF ulmRelatedEvents.Mod + $(VOCSTATIC) -sPF ulmIO.Mod + $(VOCSTATIC) -sPF ulmProcess.Mod + $(VOCSTATIC) -sPF ulmTypes.Mod + $(VOCSTATIC) -sPF ulmStreams.Mod + $(VOCSTATIC) -sPF ulmAssertions.Mod + $(VOCSTATIC) -sPF ulmIndirectDisciplines.Mod + $(VOCSTATIC) -sPF ulmStreamDisciplines.Mod + $(VOCSTATIC) -sPF ulmIEEE.Mod + $(VOCSTATIC) -sPF ulmMC68881.Mod + $(VOCSTATIC) -sPF ulmReals.Mod + $(VOCSTATIC) -sPF ulmPrint.Mod + $(VOCSTATIC) -sPF ulmWrite.Mod + $(VOCSTATIC) -sPF ulmTexts.Mod + $(VOCSTATIC) -sPF ulmStrings.Mod + $(VOCSTATIC) -sPF ulmConstStrings.Mod + $(VOCSTATIC) -sPF ulmPlotters.Mod + $(VOCSTATIC) -sPF ulmSysTypes.Mod + $(VOCSTATIC) -sPF ulmSysConversions.Mod + $(VOCSTATIC) -sPF ulmErrors.Mod + $(VOCSTATIC) -sPF ulmSysErrors.Mod + $(VOCSTATIC) -sPF ulmSysIO.Mod + $(VOCSTATIC) -sPF ulmLoader.Mod + $(VOCSTATIC) -sPF ulmNetIO.Mod + $(VOCSTATIC) -sPF ulmPersistentObjects.Mod + $(VOCSTATIC) -sPF ulmPersistentDisciplines.Mod + $(VOCSTATIC) -sPF ulmOperations.Mod + $(VOCSTATIC) -sPF ulmScales.Mod + $(VOCSTATIC) -sPF ulmTimes.Mod + $(VOCSTATIC) -sPF ulmClocks.Mod + $(VOCSTATIC) -sPF ulmTimers.Mod + $(VOCSTATIC) -sPF ulmConditions.Mod + $(VOCSTATIC) -sPF ulmStreamConditions.Mod + $(VOCSTATIC) -sPF ulmTimeConditions.Mod + $(VOCSTATIC) -sPF ulmSysConversions.Mod + $(VOCSTATIC) -sPF ulmSysStat.Mod + $(VOCSTATIC) -sPF ulmCiphers.Mod + $(VOCSTATIC) -sPF ulmCipherOps.Mod + $(VOCSTATIC) -sPF ulmBlockCiphers.Mod + $(VOCSTATIC) -sPF ulmAsymmetricCiphers.Mod + $(VOCSTATIC) -sPF ulmConclusions.Mod + $(VOCSTATIC) -sPF ulmRandomGenerators.Mod + $(VOCSTATIC) -sPF ulmTCrypt.Mod + $(VOCSTATIC) -sPF ulmIntOperations.Mod #pow32 libs - $(VOCSTATIC) -sP powStrings.Mod + $(VOCSTATIC) -sPF powStrings.Mod #misc libs - $(VOCSTATIC) -sP MultiArrays.Mod - $(VOCSTATIC) -sP MultiArrayRiders.Mod - $(VOCSTATIC) -sP MersenneTwister.Mod - $(VOCSTATIC) -sP Listen.Mod + $(VOCSTATIC) -sPF MultiArrays.Mod + $(VOCSTATIC) -sPF MultiArrayRiders.Mod + $(VOCSTATIC) -sPF MersenneTwister.Mod + $(VOCSTATIC) -sPF Listen.Mod #s3 libs - $(VOCSTATIC) -sP ethBTrees.Mod - $(VOCSTATIC) -sP ethMD5.Mod - $(VOCSTATIC) -sP ethSets.Mod - $(VOCSTATIC) -sP ethZlib.Mod - $(VOCSTATIC) -sP ethZlibBuffers.Mod - $(VOCSTATIC) -sP ethZlibInflate.Mod - $(VOCSTATIC) -sP ethZlibDeflate.Mod - $(VOCSTATIC) -sP ethZlibReaders.Mod - $(VOCSTATIC) -sP ethZlibWriters.Mod - $(VOCSTATIC) -sP ethZip.Mod - $(VOCSTATIC) -sP ethRandomNumbers.Mod - $(VOCSTATIC) -sP ethGZReaders.Mod - $(VOCSTATIC) -sP ethGZWriters.Mod - $(VOCSTATIC) -sP ethUnicode.Mod + $(VOCSTATIC) -sPF ethBTrees.Mod + $(VOCSTATIC) -sPF ethMD5.Mod + $(VOCSTATIC) -sPF ethSets.Mod + $(VOCSTATIC) -sPF ethZlib.Mod + $(VOCSTATIC) -sPF ethZlibBuffers.Mod + $(VOCSTATIC) -sPF ethZlibInflate.Mod + $(VOCSTATIC) -sPF ethZlibDeflate.Mod + $(VOCSTATIC) -sPF ethZlibReaders.Mod + $(VOCSTATIC) -sPF ethZlibWriters.Mod + $(VOCSTATIC) -sPF ethZip.Mod + $(VOCSTATIC) -sPF ethRandomNumbers.Mod + $(VOCSTATIC) -sPF ethGZReaders.Mod + $(VOCSTATIC) -sPF ethGZWriters.Mod + $(VOCSTATIC) -sPF ethUnicode.Mod + # build remaining tools # $(VOCSTATIC0) -sPS compatIn.Mod diff --git a/src/voc/OPM.cmdln.Mod b/src/voc/OPM.cmdln.Mod index 55adec30..cfaa57e0 100644 --- a/src/voc/OPM.cmdln.Mod +++ b/src/voc/OPM.cmdln.Mod @@ -27,6 +27,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) dontlink* = 14; (* don't link *) mainlinkstat* = 15; (* generate code for main module and then link object file statically *) notcoloroutput* = 16; (* turn off color output *) + forcenewsym* = 17; (* force new symbol file *) defopt* = {inxchk, typchk, ptrinit, ansi, assert}; (* default options *) nilval* = 0; @@ -121,7 +122,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) oldSFile, newSFile, HFile, BFile, HIFile: Files.File; S: INTEGER; - stop, useLineNo, useParFile, dontAsm-, dontLink-, mainProg-, mainLinkStat-, notColorOutput-: BOOLEAN; + stop, useLineNo, useParFile, dontAsm-, dontLink-, mainProg-, mainLinkStat-, notColorOutput-, forceNewSym-: BOOLEAN; (* ------------------------- Log Output ------------------------- *) @@ -168,6 +169,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) | "c": opt := opt / {dontlink} | "M": opt := opt / {mainlinkstat} | "f": opt := opt / {notcoloroutput} + | "F": opt := opt / {forcenewsym} ELSE LogWStr(" warning: option "); LogW(OptionChar); LogW(s[i]); LogWStr(" ignored"); LogWLn END ; INC(i) @@ -190,7 +192,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) Console.Ln; Console.String(' command = "voc" options {file options}.'); Console.Ln; Console.String(' options = ["-" {option} ].'); Console.Ln; - Console.String(' option = "m" | "M" | "s" | "e" | "i" | "l" | "k" | "r" | "x" | "a" | "p" | "t" | "P" | "S" | "c" | "f" .'); Console.Ln; + Console.String(' option = "m" | "M" | "s" | "e" | "i" | "l" | "k" | "r" | "x" | "a" | "p" | "t" | "P" | "S" | "c" | "f" | "F" .'); Console.Ln; Console.Ln; Console.String(" m - generate code for main module"); Console.Ln; Console.String(" M - generate code for main module and link object statically"); Console.Ln; @@ -207,6 +209,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) Console.String(" S - don't call external assembler/compiler, only generate the asm/C code"); Console.Ln; Console.String(" c - don't call linker"); Console.Ln; Console.String(" f - don't use color output"); Console.Ln; + Console.String(" F - force writing new symbol file"); Console.Ln; Console.Ln; ELSE glbopt := defopt; S := 1; s := ""; @@ -224,6 +227,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) IF mainprog IN glbopt THEN mainProg := TRUE ELSE mainProg := FALSE END; IF mainlinkstat IN glbopt THEN INCL(glbopt, mainprog); mainLinkStat := TRUE ELSE mainLinkStat := FALSE END; IF notcoloroutput IN glbopt THEN notColorOutput := TRUE ELSE notColorOutput := FALSE END; + IF forcenewsym IN glbopt THEN forceNewSym := TRUE ELSE forceNewSym := FALSE END; GetProperties; (* GetProperties moved here in order to call it after ScanOptions because we have an option whether to use par file or not, noch *) END; diff --git a/src/voc/OPT.Mod b/src/voc/OPT.Mod index 3ec046de..2104ffc4 100644 --- a/src/voc/OPT.Mod +++ b/src/voc/OPT.Mod @@ -992,6 +992,7 @@ MODULE OPT; (* NW, RC 6.3.89 / 23.1.92 *) (* object model 24.2.94 *) i := 1; WHILE i < maxImps DO expCtxt.locmno[i] := -1; INC(i) END ; OutObj(topScope^.right); ext := sfpresent & symExtended; new := ~sfpresent OR symNew; + IF OPM.forceNewSym THEN new := TRUE END; (* for bootstrapping -- noch *) IF OPM.noerr & sfpresent & (impCtxt.reffp # expCtxt.reffp) THEN new := TRUE; IF ~extsf THEN err(155) END diff --git a/voc b/voc index 3709b2b5..b7325ecd 100755 Binary files a/voc and b/voc differ diff --git a/vocstatic.linux.gcc.x86_64 b/vocstatic.linux.gcc.x86_64 index 3709b2b5..b7325ecd 100755 Binary files a/vocstatic.linux.gcc.x86_64 and b/vocstatic.linux.gcc.x86_64 differ