+2002-04-22 Michael Hope <michaelh@vroom>
+
+ * device/lib/z80/printf.c: Changed emitter to volatile to work around a pcall bug.
+
+ * configure.in (DD_COPT): Added include support required for gbdk.
+
+ * .version: Bumped version number just to increase it.
+
+ * src/SDCCmain.c: Added -nostdinc to the default options.
+
2002-04-15 Michael Hope <michaelh@vroom>
* device/lib/z80/printf.c (sprintf): Added.
* sdcc/src/SDCCcse.c: Better fix for bug # 514308
->>>>>>> 1.105
2002-03-02 <johan@FRIJA>
* src/SDCCast.c (decorateType): fixed bug #524708
sdcc_datadir_tmp=${datadir}/sdcc
fi
-
-cat >> confdefs.h <<EOF
+if test "${includedir}" = "\${prefix}/include"; then
+ cat >> confdefs.h <<EOF
#define STANDARD_INCLUDE_DIR "${sdcc_datadir_tmp}/include"
EOF
-cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
#define SDCC_INCLUDE_DIR "${sdcc_datadir_tmp}/include"
EOF
+else
+ cat >> confdefs.h <<EOF
+#define STANDARD_INCLUDE_DIR "${includedir}"
+EOF
+
+ cat >> confdefs.h <<EOF
+#define SDCC_INCLUDE_DIR "${includedir}"
+EOF
+
+fi
+
cat >> confdefs.h <<EOF
#define SDCC_LIB_DIR "${sdcc_datadir_tmp}/lib"
EOF
if test "$enable_ds390_port" = "no"; then
cat >> confdefs.h <<EOF
#define OPT_DISABLE_DS390 1
+EOF
+
+ cat >> confdefs.h <<EOF
+#define OPT_DISABLE_TININative 1
EOF
else
echo ds390 >>ports.build
cat >> confdefs.h <<EOF
#define OPT_DISABLE_DS390 0
+EOF
+
+ cat >> confdefs.h <<EOF
+#define OPT_DISABLE_TININative 0
EOF
fi
if test "$enable_libgc" = "yes"; then
echo $ac_n "checking for GC_malloc in -lgc""... $ac_c" 1>&6
-echo "configure:2808: checking for GC_malloc in -lgc" >&5
+echo "configure:2827: checking for GC_malloc in -lgc" >&5
ac_lib_var=`echo gc'_'GC_malloc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lgc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2816 "configure"
+#line 2835 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
GC_malloc()
; return 0; }
EOF
-if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
sdcc_datadir_tmp=${datadir}/sdcc
fi
+if test "${includedir}" = "\${prefix}/include"; then
+ AC_DEFINE_UNQUOTED(STANDARD_INCLUDE_DIR, "${sdcc_datadir_tmp}/include")
+ AC_DEFINE_UNQUOTED(SDCC_INCLUDE_DIR, "${sdcc_datadir_tmp}/include")
+else
+ AC_DEFINE_UNQUOTED(STANDARD_INCLUDE_DIR, "${includedir}")
+ AC_DEFINE_UNQUOTED(SDCC_INCLUDE_DIR, "${includedir}")
+fi
-AC_DEFINE_UNQUOTED(STANDARD_INCLUDE_DIR, "${sdcc_datadir_tmp}/include")
-AC_DEFINE_UNQUOTED(SDCC_INCLUDE_DIR, "${sdcc_datadir_tmp}/include")
AC_DEFINE_UNQUOTED(SDCC_LIB_DIR, "${sdcc_datadir_tmp}/lib")
AC_DEFINE_UNQUOTED(STD_LIB, "libsdcc")
AC_DEFINE_UNQUOTED(STD_INT_LIB, "libint")
echo ds390 >>ports.all
if test "$enable_ds390_port" = "no"; then
AC_DEFINE_UNQUOTED(OPT_DISABLE_DS390, 1)
+ AC_DEFINE_UNQUOTED(OPT_DISABLE_TININative, 1)
else
echo ds390 >>ports.build
AC_DEFINE_UNQUOTED(OPT_DISABLE_DS390, 0)
+ AC_DEFINE_UNQUOTED(OPT_DISABLE_TININative, 0)
fi
AC_ARG_ENABLE(pic-port,[ --disable-pic-port Excludes the PIC port])
jp _exit
;; Ordering of segments for the linker.
+ .area _HOME
.area _CODE
.area _GSINIT
.area _GSFINAL
jp _exit
;; Ordering of segments for the linker.
+ .area _HOME
.area _CODE
.area _GSINIT
.area _GSFINAL
/* PENDING */
#define NULL 0
-STATIC void _printn(unsigned u, unsigned base, char issigned, void (*emitter)(char, void *), void *pData)
+STATIC void _printn(unsigned u, unsigned base, char issigned, volatile void (*emitter)(char, void *), void *pData)
{
const char *_hex = "0123456789ABCDEF";
if (issigned && ((int)u < 0)) {
(*emitter)(_hex[u%base], pData);
}
-STATIC void _printf(const char *format, void (*emitter)(char, void *), void *pData, va_list va)
+STATIC void _printf(const char *format, volatile void (*emitter)(char, void *), void *pData, va_list va)
{
while (*format) {
if (*format == '%') {
NULL
};
-static const char *_preCmd = "{cpp} -Wall -lang-c++ -DSDCC=1 {cppextraopts} {fullsrcfilename} {cppoutfilename}";
+static const char *_preCmd = "{cpp} -nostdinc -Wall -lang-c++ -DSDCC=1 {cppextraopts} {fullsrcfilename} {cppoutfilename}";
PORT *port;