From: MaartenBrock <MaartenBrock@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sat, 3 Mar 2007 17:26:55 +0000 (+0000)
Subject: * src/SDCCmain.c (parseCmdLine): only set options.xstack_loc for mcs51,
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d8add6cf352730dcd2a2294f6dda0ce5e6684097;p=fw%2Fsdcc

* src/SDCCmain.c (parseCmdLine): only set options.xstack_loc for mcs51,
  added condition to macro, fixes bug 1666080

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

diff --git a/ChangeLog b/ChangeLog
index 0f94c250..3c2d18d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-03 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/SDCCmain.c (parseCmdLine): only set options.xstack_loc for mcs51,
+	  added condition to macro, fixes bug 1666080
+
 2007-03-02 Raphael Neider <rneider AT web.de>
 
 	* src/pic/gen.c (genGenPointerSet): removed bogus assertion
@@ -12,8 +17,8 @@
 
 	* src/SDCCglobl.h,
 	* src/SDCCmain.c,
-	* src/mcs51/gen.c, 
-	* src/mcs51/rtrack.c, 
+	* src/mcs51/gen.c,
+	* src/mcs51/rtrack.c,
 	* src/ds390/gen.c,
 	* doc/sdccman.lyx: added --no-gen-comments
 	* src/mcs51/peeph.def: added 192.b, disabled 185
diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index d720ad87..62d11db7 100644
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -1454,11 +1454,11 @@ parseCmdLine (int argc, char **argv)
   if (TARGET_IS_MCS51)
     {
       options.float_rent++;
-    }
 
-  /* set up external stack location if not explicitly specified */
-  if (!options.xstack_loc)
-    options.xstack_loc = options.xdata_loc;
+      /* set up external stack location if not explicitly specified */
+      if (!options.xstack_loc)
+        options.xstack_loc = options.xdata_loc;
+    }
 
   /* if debug option is set then open the cdbFile */
   if (options.debug && fullSrcFileName)
@@ -1552,10 +1552,13 @@ linkEdit (char **envp)
         }
 
 #define WRITE_SEG_LOC(N, L) \
-  segName = Safe_strdup(N); \
-  c = strtok(segName, " \t"); \
-  fprintf (lnkfile,"-b %s = 0x%04x\n", c, L); \
-  if (segName) { Safe_free(segName); }
+  if (N) \
+  { \
+    segName = Safe_strdup(N); \
+    c = strtok(segName, " \t"); \
+    fprintf (lnkfile,"-b %s = 0x%04x\n", c, L); \
+    if (segName) { Safe_free(segName); } \
+  }
 
       if (!(TARGET_Z80_LIKE)) /*Not for the z80, gbz80*/
         {