X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fmain.c;h=c14ba658c563932b5f918da05f14b6d680ad262b;hb=a241dbc75332a071f15f5d78432ac87650ebdca1;hp=c2172bf1d7fce084f60845526f1755587d889fea;hpb=1e268ec9106bf4b907eff98c705e11689c9dcb64;p=fw%2Fsdcc

diff --git a/src/avr/main.c b/src/avr/main.c
index c2172bf1..c14ba658 100644
--- a/src/avr/main.c
+++ b/src/avr/main.c
@@ -38,7 +38,7 @@ static int regParmFlg = 0;	/* determine if we can register a parameter */
 static void
 _avr_init (void)
 {
-	asm_addTree (&asm_gas_mapping);
+	asm_addTree (&asm_asxxxx_mapping);
 }
 
 static void
@@ -138,11 +138,11 @@ _avr_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts)
     MUST be terminated with a NULL.
 */
 static const char *_linkCmd[] = {
-	"avr-ld", "", "$1", NULL
+	"linkavr", "", "$1", NULL
 };
 
 static const char *_asmCmd[] = {
-	"avr-as", "", "$1.asm", NULL
+	"asavr", "$l" , "-plosgff", "$1.s", NULL
 };
 
 /* Globals */
@@ -156,9 +156,10 @@ PORT avr_port = {
 	 MODEL_SMALL},
 	{
 	 _asmCmd,
-	 "-plosgffc",		/* Options with debug */
+	 "-plosgff",		/* Options with debug */
 	 "-plosgff",		/* Options without debug */
-	 0},
+	 0,
+	".s"},
 	{
 	 _linkCmd,
 	 NULL,
@@ -167,7 +168,7 @@ PORT avr_port = {
 	 _defaultRules},
 	{
 	 /* Sizes: char, short, int, long, ptr, fptr, gptr, bit, float, max */
-	 1, 1, 2, 4, 2, 2, 3, 1, 4, 4},
+	 1, 2, 2, 4, 2, 2, 3, 1, 4, 4},
 	{
 	 "XSEG",
 	 "STACK",
@@ -189,7 +190,8 @@ PORT avr_port = {
 	 -1, 1, 4, 1, 1, 0},
 	/* avr has an 8 bit mul */
 	{
-	 1, 0},
+          1, -1
+        },
 	"_",
 	_avr_init,
 	_avr_parseOptions,
@@ -202,6 +204,7 @@ PORT avr_port = {
 	_avr_genIVT,
 	_avr_reset_regparm,
 	_avr_regparm,
+        NULL,
 	NULL,
 	FALSE,
 	0,			/* leave lt */
@@ -210,5 +213,6 @@ PORT avr_port = {
 	0,			/* leave ge */
 	0,			/* leave !=  */
 	0,			/* leave == */
+	FALSE,                        /* No array initializer support. */
 	PORT_MAGIC
 };