update tools_def.template to supply all possible combination of toolchain and ASL

[mirror_edk2.git] / BaseTools / Conf / build_rule.template

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index ecc5d461b9212b6612180a69564675053ab95dc0..064402c82d7ea2ee871f958437e072f437796275 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -127,6 +127,7 @@
 \r
     <Command.GCC>\r
         "$(CC)" -o ${dst} $(CC_FLAGS) $(INC) ${src}\r
+        "$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\r
 \r
 [C-Header-File]\r
     <InputFile>\r
@@ -142,7 +143,7 @@
         ?.asm, ?.Asm, ?.ASM\r
 \r
     <InputFile.GCC>\r
-        ?.S\r
+        ?.S, ?.s\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
@@ -203,10 +204,10 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).lib\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} $(OBJECT_FILES)\r
+        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST)\r
 \r
     <Command.GCC>\r
-        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) $(OBJECT_FILES)\r
+        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)\r
 \r
 [Static-Library-File]\r
     <InputFile>\r
@@ -219,10 +220,11 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(STATIC_LIBRARY_FILES)\r
+        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" -o ${dst} -Map $(DEBUG_DIR)(+)$(MODULE_NAME).map $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
+        "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
 \r
 [Static-Library-File.USER_DEFINED]\r
     <InputFile>\r
@@ -235,10 +237,10 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME)\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) $(STATIC_LIBRARY_FILES)\r
+        "$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
+        "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
 \r
 [Dynamic-Library-File]\r
     <InputFile>\r
@@ -278,12 +280,12 @@
     <Command.MSFT, Command.INTEL>\r
         Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i ${src}\r
         "$(ASLPP)" $(ASLPP_FLAGS) $(INC) /I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
-        "$(ASL)" -p ${dst} $(ASL_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        "$(ASL)" $(ASL_FLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
     <Command.GCC>\r
         Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i ${src}\r
         "$(ASLPP)" $(ASLPP_FLAGS) $(INC) -I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
-        "$(ASL)" -p ${dst} $(ASL_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        "$(ASL)" $(ASL_FLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [C-Code-File.AcpiTable]\r
     <InputFile>\r