[ro-oslib-commits] OSLib/!OsLib/Tools/DefMod2/defmod/sources objasm.c, 1.4, 1.5

[John T. <jt...@us...>]

Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31364/Tools/DefMod2/defmod/sources

Modified Files:
	objasm.c 
Log Message:
Fix for GCC GCCSDK 3.4.6 Release 1 more strict APCS specification behaviour : make sure the GCC 
APCS selection does not conflict with the assembler backend APCS selection. 


Index: objasm.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources/objasm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** objasm.c	31 Dec 2005 12:06:32 -0000	1.4
--- objasm.c	18 Jun 2006 21:29:22 -0000	1.5
***************
*** 1127,1132 ****
  
  #if ASSEMBLER == GCC
                 if ((rc = sprintf( cmd,
! 				"gcc -c -xassembler -Wa,-objasm%s -o %s %s",
  				apcs32 ? ",-apcs32" : ",-apcs26",
  				name2, name1)) < 0)
--- 1127,1141 ----
  
  #if ASSEMBLER == GCC
+ 	       /* The gcc '-mapcs-32' or '-mapcs-26' option is a requirement
+ 	          for GCCSDK 3.4.6 Release 1 onwards if you want to control
+ 	          the APCS flavour in the assembler backend.
+ 	          The pass-through '-apcs26'/'-apcs32' is only necessary for
+ 	          pre-GCCSDK 3.4.6 Release 1 releases, so for backwards
+ 	          compatibility only as the gcc '-mapcs-32'/'-mapcs-26'
+ 	          option will always be passed through the as assembler
+ 	          as '-apcs26'/'-apcs32' from that release onwards.  */
                 if ((rc = sprintf( cmd,
! 				"gcc %s -c -xassembler -Wa,-objasm%s -o %s %s",
! 				apcs32 ? "-mapcs-32" : "-mapcs-26",
  				apcs32 ? ",-apcs32" : ",-apcs26",
  				name2, name1)) < 0)