* as/z80/z80mch.c: fixed bug #1704376: missing as-z80 errors

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

diff --git a/src/pic16/main.c b/src/pic16/main.c
index bd4a7e49ae01a0b2f70899f1ad418929d2ace75a..68172c6c07b7a5c0a843462ec27d509e527969f9 100644 (file)
--- a/src/pic16/main.c
+++ b/src/pic16/main.c
@@ -674,8 +674,8 @@ static void _pic16_linkEdit(void)
 
     shash_add(&linkValues, "linker", pic16_linkCmd[0]);
 
-    mergeSets(&tSet, libDirsSet);
     mergeSets(&tSet, libPathsSet);
+    mergeSets(&tSet, libDirsSet);
 
     shash_add(&linkValues, "incdirs", joinStrSet( appendStrSet(tSet, "-I\"", "\"")));
     shash_add(&linkValues, "lflags", joinStrSet(linkOptionsSet));
@@ -762,37 +762,25 @@ _pic16_finaliseOptions (void)
 
   if (alt_asm && alt_asm[0] != '\0')
     {
-      size_t len = strlen(alt_asm);
-      char *cmd = malloc(len + 3);
-
-      cmd[0] = '"';
-      memcpy(&cmd[1], alt_asm, len);
-      cmd[len + 1] = '"';
-      cmd[len + 2] = '\0';
-      pic16_linkCmd[0] = cmd;
+      pic16_asmCmd[0] = alt_asm;
     }
 
   if (alt_link && alt_link[0] != '\0')
     {
-      size_t len = strlen(alt_asm);
-      char *cmd = malloc(len + 3);
-
-      cmd[0] = '"';
-      memcpy(&cmd[1], alt_link, len);
-      cmd[len + 1] = '"';
-      cmd[len + 2] = '\0';
-      pic16_linkCmd[0] = cmd;
+      pic16_linkCmd[0] = alt_link;
     }
 
-  if  (!pic16_options.no_crt)
+  if (!pic16_options.no_crt)
     {
       pic16_options.omit_ivt = 1;
       pic16_options.leave_reset = 0;
     }
 
-  if  (options.model == MODEL_SMALL)
-    addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_SMALL"));
-  else if(options.model == MODEL_LARGE)
+  if (options.model == MODEL_SMALL)
+    {
+      addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_SMALL"));
+    }
+  else if (options.model == MODEL_LARGE)
     {
       char buf[128];
 
@@ -803,7 +791,7 @@ _pic16_finaliseOptions (void)
       addSet(&asmOptionsSet, Safe_strdup(buf));
     }
 
-  if  (STACK_MODEL_LARGE)
+  if (STACK_MODEL_LARGE)
     {
       addSet(&preArgvSet, Safe_strdup("-DSTACK_MODEL_LARGE"));
       addSet(&asmOptionsSet, Safe_strdup("-DSTACK_MODEL_LARGE"));