Revert "Invoke "gcc" to build assembler files"

This reverts commit 233c6d8.

build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core.tests; singleton:=true
-Bundle-Version: 8.2.400.qualifier
+Bundle-Version: 8.2.300.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk

@@ -6,7 +6,6 @@ ASM_SRCS :=
 C_SRCS := 
 OBJ_SRCS := 
 O_SRCS := 
-SX_SRCS := 
 S_UPPER_SRCS := 
 C_DEPS := 
 EXECUTABLES := 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk

@@ -6,7 +6,6 @@ ASM_SRCS :=
 C_SRCS := 
 OBJ_SRCS := 
 O_SRCS := 
-SX_SRCS := 
 S_UPPER_SRCS := 
 C_DEPS := 
 EXECUTABLES := 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk

@@ -6,7 +6,6 @@ ASM_SRCS :=
 C_SRCS := 
 OBJ_SRCS := 
 O_SRCS := 
-SX_SRCS := 
 S_UPPER_SRCS := 
 C_DEPS := 
 EXECUTABLES := 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk

@@ -12,7 +12,6 @@ CXXM_SRCS :=
 CXX_SRCS := 
 C_UPPER_SRCS := 
 LOG_SRCS := 
-SX_SRCS := 
 S_UPPER_SRCS := 
 TAR_SRCS := 
 LOGFILE := 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/sources.mk

@@ -6,7 +6,6 @@ ASM_SRCS :=
 C_SRCS := 
 OBJ_SRCS := 
 O_SRCS := 
-SX_SRCS := 
 S_UPPER_SRCS := 
 C_DEPS := 
 EXECUTABLES := 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk

@@ -14,7 +14,6 @@ C_SRCS :=
 C_UPPER_SRCS := 
 OBJ_SRCS := 
 O_SRCS := 
-SX_SRCS := 
 S_UPPER_SRCS := 
 C++M_DEPS := 
 C++_DEPS := 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk

@@ -14,7 +14,6 @@ C_SRCS :=
 C_UPPER_SRCS := 
 OBJ_SRCS := 
 O_SRCS := 
-SX_SRCS := 
 S_UPPER_SRCS := 
 C++M_DEPS := 
 C++_DEPS := 

build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core; singleton:=true
-Bundle-Version: 9.6.300.qualifier
+Bundle-Version: 9.6.200.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/FileMacroExplicitSubstitutor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2024 Intel Corporation and others.
+ * Copyright (c) 2006, 2010 Intel Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  * Intel Corporation - Initial API and implementation
- * John Dallaway - Provide getter for IConfiguration (#666)
  *******************************************************************************/
 
 package org.eclipse.cdt.managedbuilder.internal.buildmodel;
@@ -37,10 +36,6 @@ public FileMacroExplicitSubstitutor(IMacroContextInfo contextInfo, IConfiguratio
 		fBuilder = builder;
 	}
 
-	public IConfiguration getConfiguration() {
-		return fCfg;
-	}
-
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.internal.macros.DefaultMacroSubstitutor#resolveMacro(org.eclipse.cdt.managedbuilder.macros.IBuildMacro)
 	 */

build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.gnu.ui; singleton:=true
-Bundle-Version: 8.7.0.qualifier
+Bundle-Version: 8.6.100.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml

@@ -565,7 +565,7 @@
                id="gnu.windres.option.preprocessor.undefined.symbols"/>
       </tool-->
       <tool
-            command="gcc"
+            command="as"
             name="%ToolName.assembler.gnu"
             outputFlag="-o"
             id="cdt.managedbuild.tool.gnu.assembler"
@@ -579,8 +579,6 @@
          <option
                name="%Option.Gnu.Assembler.Flags"
                category="gnu.asm.category.general"
-               commandGenerator="org.eclipse.cdt.managedbuilder.gnu.ui.GnuAsmFlagsCommandGenerator"
-               defaultValue="-c"
                valueType="string"
                id="gnu.both.asm.option.flags">
          </option>
@@ -609,7 +607,7 @@
                id="cdt.managedbuild.tool.gnu.assembler.input"
                languageId="org.eclipse.cdt.core.assembly"
                sourceContentType="org.eclipse.cdt.core.asmSource"
-               sources="s,sx,S">
+               sources="s,S">
          </inputType>
          <outputType
 			outputs="o"

core/org.eclipse.cdt.core/plugin.xml

@@ -625,7 +625,7 @@
 	  <!-- declares a content type for ASM Source files -->
       <content-type id="asmSource" name="%asmSourceName" 
           base-type="org.eclipse.core.runtime.text"
-          file-extensions="S,s,sx,asm,ASM"
+          file-extensions="S,s,asm,ASM"
           priority="high"/>
    </extension>