* device/lib/pic16/configure.ac,

  device/lib/pic16/Makefile.common: fixed quoting issues

* device/lib/pic16/configure,
  device/lib/pic16/debug/Makefile.in,
  device/lib/pic16/libc/Makefile.in,
  device/lib/pic16/libdev/Makefile.in,
  device/lib/pic16/libio/Makefile.in,
  device/lib/pic16/libm/Makefile.in,
  device/lib/pic16/libsdcc/Makefile.in,
  device/lib/pic16/Makefile.in,
  device/lib/pic16/startup/Makefile.in: regenerated

* src/pic16/main.c (_pic16_finaliseOptions): revert to
  variant of r5216

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

diff --git a/ChangeLog b/ChangeLog
index 3d2a22a6cb10c880b7477750790a533ddb63e170..7066fec295e60ab8362b6a4b23423e039b544d16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-11-24 Raphael Neider <rneider AT web.de>
+
+       * device/lib/pic16/configure.ac,
+         device/lib/pic16/Makefile.common: fixed quoting issues
+
+       * device/lib/pic16/configure,
+         device/lib/pic16/debug/Makefile.in,
+         device/lib/pic16/libc/Makefile.in,
+         device/lib/pic16/libdev/Makefile.in,
+         device/lib/pic16/libio/Makefile.in,
+         device/lib/pic16/libm/Makefile.in,
+         device/lib/pic16/libsdcc/Makefile.in,
+         device/lib/pic16/Makefile.in,
+         device/lib/pic16/startup/Makefile.in: regenerated
+
+       * src/pic16/main.c (_pic16_finaliseOptions): revert to
+         variant of r5216
+
 2008-11-24 Raphael Neider <rneider AT web.de>
 
        * src/pic16/main.c (_pic16_finaliseOptions): do not quote the

diff --git a/device/lib/pic16/Makefile.common b/device/lib/pic16/Makefile.common
index c20b5790fa569aeff39f413af344d1e4782ce0a1..a720ccde2f43c8e2e86ca08ac5766d6985746d00 100644 (file)
--- a/device/lib/pic16/Makefile.common
+++ b/device/lib/pic16/Makefile.common
@@ -1,6 +1,6 @@
 AM_CFLAGS =
 AM_CFLAGS += --std-c99
-AM_CFLAGS += --asm=$(CCAS)
+AM_CFLAGS += --asm="$(CCAS)"
 AM_CFLAGS += -I.
 AM_CFLAGS += -I$(top_srcdir)/../../include/pic16
 AM_CFLAGS += -Wa,-q

diff --git a/device/lib/pic16/Makefile.in b/device/lib/pic16/Makefile.in
index 5bc7d8fe1ae53694d1235ac189498fe2579e423e..0b37304243ecff4bf44528868575411e9256d27d 100644 (file)
--- a/device/lib/pic16/Makefile.in
+++ b/device/lib/pic16/Makefile.in
@@ -159,7 +159,7 @@ SUBDIRS = debug libc libdev libio libm libsdcc startup
 #AM_CFLAGS += --debug-ralloc
 #AM_CFLAGS += --debug-xtra
 #AM_CFLAGS += --pcode-verbose
-AM_CFLAGS = --std-c99 --asm=$(CCAS) -I. \
+AM_CFLAGS = --std-c99 --asm="$(CCAS)" -I. \
        -I$(top_srcdir)/../../include/pic16 -Wa,-q \
        --fommit-frame-pointer --obanksel=9 --denable-peeps \
        --optimize-cmp --optimize-df --i-code-in-asm

diff --git a/device/lib/pic16/configure b/device/lib/pic16/configure
index 7896b90535e828792f047c3c6f4fbe83308a1d7f..90a278934447b5b4d5ccf1b0966f5a1971f0b145 100755 (executable)
--- a/device/lib/pic16/configure
+++ b/device/lib/pic16/configure
@@ -2185,7 +2185,7 @@ ARCH=${ARCH:-18f452}
 
 
 # We cannot use AC_PROG_CC(sdcc) as sdcc might not be built at configure-time...
-CC=\"$abs_top_builddir/../../../bin/sdcc\"
+CC=\'$abs_top_builddir/../../../bin/sdcc\'
 
 CFLAGS="-mpic16 -p$ARCH"
 
@@ -2230,7 +2230,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-CCAS=\"$CCAS\"
+CCAS=\'$CCAS\'
 
 CCASFLAGS="-p$ARCH"
 
@@ -2275,7 +2275,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-LD=\"$LD\"
+LD=\'$LD\'
 
 # Extract the first word of "gplib", so it can be a program name with args.
 set dummy gplib; ac_word=$2
@@ -2318,7 +2318,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-AR=\"$AR\"
+AR=\'$AR\'
 
 ARFLAGS=-c
 

diff --git a/device/lib/pic16/configure.ac b/device/lib/pic16/configure.ac
index 3e27ac1e5d7da055ecbcfd0b5eae7f2d11f73ab8..f7f8f94f90e90edaafe990628620c0e83f722bad 100644 (file)
--- a/device/lib/pic16/configure.ac
+++ b/device/lib/pic16/configure.ac
@@ -39,15 +39,15 @@ libdir=$libdir/pic16
 AC_SUBST(ARCH, [${ARCH:-18f452}])
 
 # We cannot use AC_PROG_CC(sdcc) as sdcc might not be built at configure-time...
-AC_SUBST(CC, [\"$abs_top_builddir/../../../bin/sdcc\"])
+AC_SUBST(CC, [\'$abs_top_builddir/../../../bin/sdcc\'])
 AC_SUBST(CFLAGS, ["-mpic16 -p$ARCH"])
 AC_PATH_PROG(CCAS, gpasm, :)
-AC_SUBST(CCAS, [\"$CCAS\"])
+AC_SUBST(CCAS, [\'$CCAS\'])
 AC_SUBST(CCASFLAGS, ["-p$ARCH"])
 AC_PATH_PROG(LD, gplink, :)
-AC_SUBST(LD, [\"$LD\"])
+AC_SUBST(LD, [\'$LD\'])
 AC_PATH_PROG(AR, gplib, :)
-AC_SUBST(AR, [\"$AR\"])
+AC_SUBST(AR, [\'$AR\'])
 AC_SUBST(ARFLAGS, [-c])
 
 # $RANLIB is called by the autotools but not provided nor required

diff --git a/device/lib/pic16/debug/Makefile.in b/device/lib/pic16/debug/Makefile.in
index f75989c43399454d34cc9f3d264f9bdab8537747..f8790114cfba6135677e6a0868f265bde7f64c23 100644 (file)
--- a/device/lib/pic16/debug/Makefile.in
+++ b/device/lib/pic16/debug/Makefile.in
@@ -157,7 +157,7 @@ libdebug_a_SOURCES = gstack/gstack.c
 #AM_CFLAGS += --debug-ralloc
 #AM_CFLAGS += --debug-xtra
 #AM_CFLAGS += --pcode-verbose
-AM_CFLAGS = --std-c99 --asm=$(CCAS) -I. \
+AM_CFLAGS = --std-c99 --asm="$(CCAS)" -I. \
        -I$(top_srcdir)/../../include/pic16 -Wa,-q \
        --fommit-frame-pointer --obanksel=9 --denable-peeps \
        --optimize-cmp --optimize-df --i-code-in-asm

diff --git a/device/lib/pic16/libc/Makefile.in b/device/lib/pic16/libc/Makefile.in
index 608bbee28d719156e77360ee45c5c99c1df65235..a0f0e567cf0055664f7b61f6485404242ae7bf00 100644 (file)
--- a/device/lib/pic16/libc/Makefile.in
+++ b/device/lib/pic16/libc/Makefile.in
@@ -207,7 +207,7 @@ libc18f_a_SOURCES = ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c \
 #AM_CFLAGS += --debug-ralloc
 #AM_CFLAGS += --debug-xtra
 #AM_CFLAGS += --pcode-verbose
-AM_CFLAGS = --std-c99 --asm=$(CCAS) -I. \
+AM_CFLAGS = --std-c99 --asm="$(CCAS)" -I. \
        -I$(top_srcdir)/../../include/pic16 -Wa,-q \
        --fommit-frame-pointer --obanksel=9 --denable-peeps \
        --optimize-cmp --optimize-df --i-code-in-asm

diff --git a/device/lib/pic16/libdev/Makefile.in b/device/lib/pic16/libdev/Makefile.in
index 98b2b62c6647097a81edaff47d246ffc7668a379..10ec93052441ad199f761485c35caf07fdc5486b 100644 (file)
--- a/device/lib/pic16/libdev/Makefile.in
+++ b/device/lib/pic16/libdev/Makefile.in
@@ -713,7 +713,7 @@ libdev18f97j60_a_CFLAGS = -p18f97j60 $(AM_CFLAGS)
 #AM_CFLAGS += --debug-ralloc
 #AM_CFLAGS += --debug-xtra
 #AM_CFLAGS += --pcode-verbose
-AM_CFLAGS = --std-c99 --asm=$(CCAS) -I. \
+AM_CFLAGS = --std-c99 --asm="$(CCAS)" -I. \
        -I$(top_srcdir)/../../include/pic16 -Wa,-q \
        --fommit-frame-pointer --obanksel=9 --denable-peeps \
        --optimize-cmp --optimize-df --i-code-in-asm

diff --git a/device/lib/pic16/libio/Makefile.in b/device/lib/pic16/libio/Makefile.in
index 08ea996ceb8b142d81274add43321304198b6bda..c4714447db20f8f6f11f63b1a87ebfee8f5be3a0 100644 (file)
--- a/device/lib/pic16/libio/Makefile.in
+++ b/device/lib/pic16/libio/Makefile.in
@@ -3001,7 +3001,7 @@ libio18f97j60_a_CFLAGS = -p18f97j60 $(AM_CFLAGS)
 #AM_CFLAGS += --debug-ralloc
 #AM_CFLAGS += --debug-xtra
 #AM_CFLAGS += --pcode-verbose
-AM_CFLAGS = --std-c99 --asm=$(CCAS) -I. \
+AM_CFLAGS = --std-c99 --asm="$(CCAS)" -I. \
        -I$(top_srcdir)/../../include/pic16 -Wa,-q \
        --fommit-frame-pointer --obanksel=9 --denable-peeps \
        --optimize-cmp --optimize-df --i-code-in-asm

diff --git a/device/lib/pic16/libm/Makefile.in b/device/lib/pic16/libm/Makefile.in
index dcb7ccde89d53002b66231abf142202ca85ae53f..14490c67c1414dddcbb64bc225add8e99076c8d7 100644 (file)
--- a/device/lib/pic16/libm/Makefile.in
+++ b/device/lib/pic16/libm/Makefile.in
@@ -168,7 +168,7 @@ libm18f_a_SOURCES = acosf.c asincosf.c asinf.c atan2f.c atanf.c \
 #AM_CFLAGS += --debug-ralloc
 #AM_CFLAGS += --debug-xtra
 #AM_CFLAGS += --pcode-verbose
-AM_CFLAGS = --std-c99 --asm=$(CCAS) -I. \
+AM_CFLAGS = --std-c99 --asm="$(CCAS)" -I. \
        -I$(top_srcdir)/../../include/pic16 -Wa,-q \
        --fommit-frame-pointer --obanksel=9 --denable-peeps \
        --optimize-cmp --optimize-df --i-code-in-asm

diff --git a/device/lib/pic16/libsdcc/Makefile.in b/device/lib/pic16/libsdcc/Makefile.in
index df9176ea1c0b9c0ed6dfea8616162d7716b0011b..380a18f76ce60e7bf734a00f38e1229aa874f239 100644 (file)
--- a/device/lib/pic16/libsdcc/Makefile.in
+++ b/device/lib/pic16/libsdcc/Makefile.in
@@ -208,7 +208,7 @@ libsdcc_a_SOURCES = char/divschar.c char/divuchar.c char/modschar.c \
 #AM_CFLAGS += --debug-ralloc
 #AM_CFLAGS += --debug-xtra
 #AM_CFLAGS += --pcode-verbose
-AM_CFLAGS = --std-c99 --asm=$(CCAS) -I. \
+AM_CFLAGS = --std-c99 --asm="$(CCAS)" -I. \
        -I$(top_srcdir)/../../include/pic16 -Wa,-q \
        --fommit-frame-pointer --obanksel=9 --denable-peeps \
        --optimize-cmp --optimize-df --i-code-in-asm

diff --git a/device/lib/pic16/startup/Makefile.in b/device/lib/pic16/startup/Makefile.in
index ebbc85161f6b2c34c03b4b7638ac94910ce36277..0469416f4bec9124699af06ac0862e054d5cda84 100644 (file)
--- a/device/lib/pic16/startup/Makefile.in
+++ b/device/lib/pic16/startup/Makefile.in
@@ -177,7 +177,7 @@ crt_DATA = crt0.o crt0i.o crt0iz.o
 #AM_CFLAGS += --debug-ralloc
 #AM_CFLAGS += --debug-xtra
 #AM_CFLAGS += --pcode-verbose
-AM_CFLAGS = --std-c99 --asm=$(CCAS) -I. \
+AM_CFLAGS = --std-c99 --asm="$(CCAS)" -I. \
        -I$(top_srcdir)/../../include/pic16 -Wa,-q \
        --fommit-frame-pointer --obanksel=9 --denable-peeps \
        --optimize-cmp --optimize-df --i-code-in-asm

diff --git a/src/pic16/main.c b/src/pic16/main.c
index 3a5de295e19c0fee3126087970afd3092ecf2863..90dcae34644384cf0eba3624072a9eb9f9f88917 100644 (file)
--- a/src/pic16/main.c
+++ b/src/pic16/main.c
@@ -762,46 +762,12 @@ _pic16_finaliseOptions (void)
 
   if (alt_asm && alt_asm[0] != '\0')
     {
-      size_t len = strlen(alt_asm);
-      char *cmd = malloc(len + 3);
-
-      if (0)
-        {
-          // fails for --asm="/bin/sh script.sh --options"
-          cmd[0] = '"';
-          memcpy(&cmd[1], alt_asm, len);
-          cmd[len + 1] = '"';
-          cmd[len + 2] = '\0';
-        }
-      else
-        {
-          // requires --asm="'my prog with spaces'"
-          memcpy(&cmd[0], alt_asm, len);
-          cmd[len] = 0;
-        }
-      pic16_asmCmd[0] = cmd;
+      pic16_asmCmd[0] = alt_asm;
     }
 
   if (alt_link && alt_link[0] != '\0')
     {
-      size_t len = strlen(alt_link);
-      char *cmd = malloc(len + 3);
-
-      if (0)
-        {
-          // fails for --link="/bin/sh script.sh --options"
-          cmd[0] = '"';
-          memcpy(&cmd[1], alt_link, len);
-          cmd[len + 1] = '"';
-          cmd[len + 2] = '\0';
-        }
-      else
-        {
-          // requires --link="'my prog with spaces'"
-          memcpy(&cmd[0], alt_link, len);
-          cmd[len] = 0;
-        }
-      pic16_linkCmd[0] = cmd;
+      pic16_linkCmd[0] = alt_link;
     }
 
   if (!pic16_options.no_crt)
@@ -814,7 +780,7 @@ _pic16_finaliseOptions (void)
     {
       addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_SMALL"));
     }
-  else if(options.model == MODEL_LARGE)
+  else if (options.model == MODEL_LARGE)
     {
       char buf[128];