Fixed up s51 autodetect

[fw/sdcc] / src / avr / main.c

diff --git a/src/avr/main.c b/src/avr/main.c
index 5ddc571edb913f02886b5e2474415998c047fe6a..ba5a470bc05c3f28a665b0b5bc8526f0e32f7c7b 100644 (file)
--- 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,12 @@ _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
 };
 
+/* $3 is replaced by assembler.debug_opts resp. port->assembler.plain_opts */
 static const char *_asmCmd[] = {
-       "avr-as", "-mmcu=avr3" , "$1.s", NULL
+       "asavr", "$l" , "$3", "$1.s", NULL
 };
 
 /* Globals */
@@ -156,12 +157,14 @@ PORT avr_port = {
         MODEL_SMALL},
        {
         _asmCmd,
-        "-plosgffc",           /* Options with debug */
+         NULL,
+        "-plosgff",            /* Options with debug */
         "-plosgff",            /* Options without debug */
         0,
        ".s"},
        {
         _linkCmd,
+         NULL,
         NULL,
         ".rel"},
        {
@@ -190,7 +193,8 @@ PORT avr_port = {
         -1, 1, 4, 1, 1, 0},
        /* avr has an 8 bit mul */
        {
-        1, 0},
+          1, -1
+        },
        "_",
        _avr_init,
        _avr_parseOptions,
@@ -205,6 +209,7 @@ PORT avr_port = {
        _avr_regparm,
         NULL,
        NULL,
+        NULL,
        FALSE,
        0,                      /* leave lt */
        1,                      /* transform gt ==> not le */
@@ -212,5 +217,8 @@ PORT avr_port = {
        0,                      /* leave ge */
        0,                      /* leave !=  */
        0,                      /* leave == */
+       FALSE,                  /* No array initializer support. */
+       0,                      /* no CSE cost estimation yet */
+       NULL,                   /* no builtin functions */
        PORT_MAGIC
 };