Prechádzať zdrojové kódy

same object file extension inference in compiler as in runtime

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7623 8c9fc860-2736-0410-a75d-ab315db34111
felixf 7 rokov pred
rodič
commit
b48ba6dc68
2 zmenil súbory, kde vykonal 15 pridanie a 4 odobranie
  1. 14 3
      source/FoxCompiler.Mod
  2. 1 1
      source/Win64.Machine.Mod

+ 14 - 3
source/FoxCompiler.Mod

@@ -542,6 +542,18 @@ TYPE
 		END
 	END GetDefaultPlatform;
 	
+	PROCEDURE SetupDefaults;
+	VAR extension: Files.FileName;
+	BEGIN
+		Machine.GetConfig("ObjectFileExtension", extension);
+		IF extension = "" THEN
+			COPY(Machine.DefaultObjectFileExtension, extension)
+		END;
+		(* infer platform from default object file extension *)
+		platforms.Find("objectFileExtension", extension, defaultPlatform);
+	END SetupDefaults;
+	
+	
 	
 BEGIN
 	NEW(platforms);
@@ -560,7 +572,6 @@ BEGIN
 	DoAddPlatform("A2Coop","-b=AMD --cooperative --objectFile=Generic --newObjectFile --traceModule=Trace --mergeSections");
 	DoAddPlatform("ARMA2","-b=ARM --objectFile=Generic --newObjectFile --symbolFile=Textual --mergeSections");
 	DoAddPlatform("Linux32G","-b=AMD --objectFile=Generic --newObjectFile --mergeSections --traceModule=Trace --symbolFile=Textual --objectFileExtension=.GofU --symbolFileExtension=.SymU --preciseGC");
-
-	(* infer platform from default object file extension *)
-	platforms.Find("objectFileExtension", Machine.DefaultObjectFileExtension, defaultPlatform);
+	
+	SetupDefaults;
 END Compiler.

+ 1 - 1
source/Win64.Machine.Mod

@@ -13,7 +13,7 @@ CONST
 
 	MaxCPU* = 8;	(* dummy definition to make GC for both Win32 and I386 work *)
 
-	DefaultObjectFileExtension* = ".Obw";
+	DefaultObjectFileExtension* = ".GofWw";
 
 	(** bits in features variable *)
 	MTTR* = 12;  MMX* = 23;