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
+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
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
#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
# 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"
fi
-CCAS=\"$CCAS\"
+CCAS=\'$CCAS\'
CCASFLAGS="-p$ARCH"
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
fi
-AR=\"$AR\"
+AR=\'$AR\'
ARFLAGS=-c
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
#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
#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
#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
#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
#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
#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
#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
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)
{
addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_SMALL"));
}
- else if(options.model == MODEL_LARGE)
+ else if (options.model == MODEL_LARGE)
{
char buf[128];