* support/Util/NewAlloc.c (freeTrace): Changed free for the gc case to not free...

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

diff --git a/src/z80/main.c b/src/z80/main.c
index 2a07616fed1889d6e2e66b19d9f6adbac28c6ce0..8db371fdcfbfedabf41687dfeacf563f72bfdf40 100644 (file)
--- a/src/z80/main.c
+++ b/src/z80/main.c
@@ -151,7 +151,7 @@ _process_pragma (const char *sz)
              wassert (0);
            }
        }
-      gbz80_port.mem.code_name = gc_strdup (buffer);
+      gbz80_port.mem.code_name = Safe_strdup (buffer);
       code->sname = gbz80_port.mem.code_name;
       return 0;
     }
@@ -228,12 +228,12 @@ _parseOptions (int *pargc, char **argv, int *i)
            case 'o':
              /* ROM bank */
              sprintf (buffer, "CODE_%u", bank);
-             gbz80_port.mem.code_name = gc_strdup (buffer);
+             gbz80_port.mem.code_name = Safe_strdup (buffer);
              return TRUE;
            case 'a':
              /* RAM bank */
              sprintf (buffer, "DATA_%u", bank);
-             gbz80_port.mem.data_name = gc_strdup (buffer);
+             gbz80_port.mem.data_name = Safe_strdup (buffer);
              return TRUE;
            }
        }
@@ -271,8 +271,8 @@ _setValues(void)
 {
   if (options.nostdlib == FALSE)
     {
-      setMainValue ("z80libspec", "-k{libdir}/{port} -l{port}.lib");
-      setMainValue ("z80crt0", "{libdir}/{port}/crt0{objext}");
+      setMainValue ("z80libspec", "-k{libdir}{sep}{port} -l{port}.lib");
+      setMainValue ("z80crt0", "{libdir}{sep}{port}{sep}crt0{objext}");
     }
   else
     {
@@ -372,7 +372,7 @@ _mangleSupportFunctionName(char *original)
           options.noRegParams ? "s" : "bds"
           );
 
-  return gc_strdup(buffer);
+  return Safe_strdup(buffer);
 }
 
 static const char *
@@ -387,7 +387,7 @@ _getRegName (struct regs *reg)
 }
 
 #define LINKCMD \
-    "{bindir}/link-{port} -n -c -- {z80bases} -m -j" \
+    "{bindir}{sep}link-{port} -n -c -- {z80bases} -m -j" \
     " {z80libspec}" \
     " {z80extralibfiles} {z80extralibpaths}" \
     " {z80outputtypeflag} {srcfilename}{z80outext}" \
@@ -396,7 +396,7 @@ _getRegName (struct regs *reg)
     " {z80extraobj}" 
 
 #define ASMCMD \
-    "{bindir}/as-{port} -plosgff {srcfilename}{objext} {srcfilename}{asmext}"
+    "{bindir}{sep}as-{port} -plosgff {srcfilename}{objext} {srcfilename}{asmext}"
 
 /* Globals */
 PORT z80_port =