From fd99dea2da897ab79bde30eb6718abf497e12265 Mon Sep 17 00:00:00 2001
From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Wed, 3 Oct 2001 18:49:06 +0000
Subject: [PATCH] ../cvsm

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1351 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog        | 12 ++++++++++++
 src/SDCCmain.c   |  4 +++-
 src/avr/main.c   |  3 ++-
 src/ds390/main.c |  4 ++--
 src/mcs51/main.c |  3 ++-
 src/port.h       |  4 ++--
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8b11012..f77ca2e6 100644
--- 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 8bec7ebb..a0fff7ce 100644
--- 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 b3e33659..1be9c7f5 100644
--- 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 2da52b77..5693c821 100644
--- 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 3dcb4d86..b23a03d0 100644
--- 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 3e8339e6..d01887c8 100644
--- 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;
-- 
2.30.2