# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1278509015 -3600
# Node ID 3b0f18c0b8e386a0d00c1de5e86990bb683b9a9e
# Parent  f76e0f94b7ab9cc6548653f4a9656d681d2e99e5
Add support for --asm option when using elf2e32 in the "expgen" recipe - see bug 2979 and bug 1405

diff -r f76e0f94b7ab -r 3b0f18c0b8e3 sbsv2/raptor/lib/config/gcce.xml
--- a/sbsv2/raptor/lib/config/gcce.xml	Thu Jul 01 14:58:06 2010 +0800
+++ b/sbsv2/raptor/lib/config/gcce.xml	Wed Jul 07 14:23:35 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=""/>
diff -r f76e0f94b7ab -r 3b0f18c0b8e3 sbsv2/raptor/lib/flm/e32abiv2.flm
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Thu Jul 01 14:58:06 2010 +0800
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Wed Jul 07 14:23:35 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)
diff -r f76e0f94b7ab -r 3b0f18c0b8e3 sbsv2/raptor/lib/flm/standard.xml
--- a/sbsv2/raptor/lib/flm/standard.xml	Thu Jul 01 14:58:06 2010 +0800
+++ b/sbsv2/raptor/lib/flm/standard.xml	Wed Jul 07 14:23:35 2010 +0100
@@ -109,6 +109,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'/>