Add support for --asm option when using elf2e32 in the "expgen" recipe - see bug 2979 and bug 1405
--- a/sbsv2/raptor/lib/config/gcce.xml Thu Jun 03 16:48:34 2010 +0100
+++ b/sbsv2/raptor/lib/config/gcce.xml Fri Jul 09 11:31:02 2010 +0100
@@ -52,6 +52,7 @@
<set name="DATA_SEGMENT_START" value="$(SPLIT_OPTION) $(RW_BASE_OPTION)"/>
<set name="DEBUG_OPTIMISATION" value="-O0"/>
<set name="DEPEND_OPTION" value="-MD -MF"/>
+ <set name="ELF2E32_EXPGEN_OPT" value="--asm=gas"/>
<set name="ENUM_OPTION" value=""/>
<set name="EXCEPTIONS" value="-fexceptions"/>
<set name="EXPORT_VTBL_OPTION" value=""/>
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm Thu Jun 03 16:48:34 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Fri Jul 09 11:31:02 2010 +0100
@@ -449,7 +449,7 @@
$(call startrule,expgen) \
$(ELF2E32) \
--definput=$$(call dblquote,$(DEFFILE)) \
- --dump=a \
+ --dump=a $(ELF2E32_EXPGEN_OPT) \
--output=$(call dblquote,$(EXPTARGETASMFILE)) && \
$(ASM) $(TARGET_ARCH_OPTION) $(AAPCS_OPTION) $(ASM_OUTPUT_OPTION) $$(call dblquote, $$@) $(EXPTARGETASMFILE) \
$(call endrule,expgen)
--- a/sbsv2/raptor/lib/flm/standard.xml Thu Jun 03 16:48:34 2010 +0100
+++ b/sbsv2/raptor/lib/flm/standard.xml Fri Jul 09 11:31:02 2010 +0100
@@ -110,6 +110,7 @@
<param name='DEBUG_INFO'/>
<param name='DEPEND_OPTION'/>
<param name='ELF2E32'/>
+ <param name='ELF2E32_EXPGEN_OPT' default=''/>
<param name='EFREEZE'/>
<param name='EFREEZE_REMOVE_OPTION' default=''/>
<param name='ENUM_OPTION'/>