../cvsm

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1351 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index e8b11012cf0660073d4ded7d4f338193d9dcf1de..f77ca2e605e22ba16f932fe6ca535407ceab4966 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-10-03 Bernhard Held <bernhard@bernhardheld.de>
+
+       * src/SDCCmain.c: distinguish between assembler debug and plain options
+
+       * src/avr/main.c:   remove standard assembler options
+
+       * src/ds390/main.c: remove standard assembler options
+
+       * src/mcs51/main.c: remove standard assembler options
+
+       * src/port.h: removed "PENDING" comment
+
 2001-10-03 Bernhard Held <bernhard@bernhardheld.de>
 
        * src/device/lib/_mulint.c  : new, with assember functions

diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index 8bec7ebb79e1a8857e40ba5c6f889220cae13305..a0fff7cee509a26149f5eada32ea5c08273d3c9a 100644 (file)
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -1193,7 +1193,9 @@ assemble (char **envp)
 {
   if (port->assembler.cmd)
     {
-      buildCmdLine (buffer, port->assembler.cmd, srcFileName, NULL, NULL, asmOptions);
+      buildCmdLine (buffer, port->assembler.cmd, srcFileName, NULL,
+                    options.debug ? port->assembler.debug_opts : port->assembler.plain_opts,
+                    asmOptions);
     }
   else
     {

diff --git a/src/avr/main.c b/src/avr/main.c
index b3e33659a5a9e1d49a9e6f28c95f9e1854b5d64e..1be9c7f5b0382c522bba9f0decd7f3e2db6d3a0d 100644 (file)
--- a/src/avr/main.c
+++ b/src/avr/main.c
@@ -141,8 +141,9 @@ static const char *_linkCmd[] = {
        "linkavr", "", "$1", NULL
 };
 
+/* $3 is replaced by assembler.debug_opts resp. port->assembler.plain_opts */
 static const char *_asmCmd[] = {
-       "asavr", "$l" , "-plosgff", "$1.s", NULL
+       "asavr", "$l" , "$3", "$1.s", NULL
 };
 
 /* Globals */

diff --git a/src/ds390/main.c b/src/ds390/main.c
index 2da52b77a15a6209c99b316e480a613e0b3af2cd..5693c821c4d08a672ff9b2bb4250a76c015bab96 100644 (file)
--- a/src/ds390/main.c
+++ b/src/ds390/main.c
@@ -200,9 +200,9 @@ static const char *_linkCmd[] =
   "aslink", "-nf", "$1", NULL
 };
 
-static const char *_asmCmd[] =
+/* $3 is replaced by assembler.debug_opts resp. port->assembler.plain_opts */   static const char *_asmCmd[] =
 {
-  "asx8051", "$l", "-plosgff", "$1.asm", NULL
+  "asx8051", "$l", "$3", "$1.asm", NULL
 };
 
 /* Globals */

diff --git a/src/mcs51/main.c b/src/mcs51/main.c
index 3dcb4d86258f15aa223151bfe08ee575ab21ea0b..b23a03d0e15ad7db0455d61a16b8fa466d401014 100644 (file)
--- a/src/mcs51/main.c
+++ b/src/mcs51/main.c
@@ -131,9 +131,10 @@ static const char *_linkCmd[] =
   "aslink", "-nf", "$1", NULL
 };
 
+/* $3 is replaced by assembler.debug_opts resp. port->assembler.plain_opts */
 static const char *_asmCmd[] =
 {
-  "asx8051", "$l", "-plosgffc", "$1.asm", NULL
+  "asx8051", "$l", "$3", "$1.asm", NULL
 };
 
 /* Globals */

diff --git a/src/port.h b/src/port.h
index 3e8339e64a759b47104cc0f4a8280c575e58c58b..d01887c80f447d33de206db38ced9505c578073c 100644 (file)
--- a/src/port.h
+++ b/src/port.h
@@ -59,9 +59,9 @@ typedef struct
         const char **cmd;
         /** Alternate macro based form. */
         const char *mcmd;
-        /** Arguments for debug mode.  PENDING: ignored */
+        /** Arguments for debug mode. */
        const char *debug_opts;
-        /** Arguments for normal assembly mode.  PENDING: ignored */
+        /** Arguments for normal assembly mode. */
        const char *plain_opts;
        /* print externs as global */
        int externGlobal;