From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sat, 11 Jan 2003 14:07:54 +0000 (+0000)
Subject: * src/SDCCmain.c (assemble, linkEdit): preparations for -o
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=dd301058fa322316b27dc694c3fbdcfd4c4d19eb;p=fw%2Fsdcc

* src/SDCCmain.c (assemble, linkEdit): preparations for -o
* src/port.h: typo
* src/pic/main.c (_asmCmd): gpasm supports -o
* device/lib/Makefile.in: remove intermediate files


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

diff --git a/src/z80/main.c b/src/z80/main.c
index eafbd655..c1b96e5e 100644
--- a/src/z80/main.c
+++ b/src/z80/main.c
@@ -310,11 +310,11 @@ _setValues(void)
       setMainValue ("z80outext", ".ihx");
     }
 
-  setMainValue ("z80stdobjdstfilename" , "{dstfilename}{objext}");
-  setMainValue ("z80stdlinkdstfilename", "{dstfilename}{z80outext}");
+  setMainValue ("stdobjdstfilename" , "{dstfilename}{objext}");
+  setMainValue ("stdlinkdstfilename", "{dstfilename}{z80outext}");
 
   setMainValue ("z80extraobj", joinn (relFiles, nrelFiles));
-  
+
   sprintf (buffer, "-b_CODE=0x%04X -b_DATA=0x%04X", options.code_loc, options.data_loc);
   setMainValue ("z80bases", buffer);
 }
@@ -444,13 +444,13 @@ _hasNativeMulFor (iCode *ic, sym_link *left, sym_link *right)
     "{bindir}{sep}link-{port} -n -c -- {z80bases} -m -j" \
     " {z80libspec}" \
     " {z80extralibfiles} {z80extralibpaths}" \
-    " {z80outputtypeflag} {z80linkdstfilename}" \
+    " {z80outputtypeflag} {linkdstfilename}" \
     " {z80crt0}" \
     " {dstfilename}{objext}" \
-    " {z80extraobj}" 
+    " {z80extraobj}"
 
 #define ASMCMD \
-    "{bindir}{sep}as-{port} -plosgff {z80objdstfilename} {dstfilename}{asmext}"
+    "{bindir}{sep}as-{port} -plosgff {objdstfilename} {dstfilename}{asmext}"
 
 /* Globals */
 PORT z80_port =