From 6c935a87a40491361403ca56c18d1a0c7f590626 Mon Sep 17 00:00:00 2001 From: michaelh Date: Tue, 23 Apr 2002 03:56:21 +0000 Subject: [PATCH] * 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. git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2011 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- .version | 2 +- ChangeLog | 11 ++++++++++- configure | 31 +++++++++++++++++++++++++------ configure.in | 11 +++++++++-- device/lib/gbz80/crt0.s | 1 + device/lib/z80/crt0.s | 1 + device/lib/z80/printf.c | 4 ++-- src/SDCCmain.c | 2 +- 8 files changed, 50 insertions(+), 13 deletions(-) diff --git a/.version b/.version index 2bf1c1cc..f90b1afc 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.3.1 +2.3.2 diff --git a/ChangeLog b/ChangeLog index 41cfd956..a88814c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-04-22 Michael Hope + + * 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 * device/lib/z80/printf.c (sprintf): Added. @@ -105,7 +115,6 @@ * sdcc/src/SDCCcse.c: Better fix for bug # 514308 ->>>>>>> 1.105 2002-03-02 * src/SDCCast.c (decorateType): fixed bug #524708 diff --git a/configure b/configure index 8b619b78..ca471bb7 100755 --- a/configure +++ b/configure @@ -2574,15 +2574,26 @@ else sdcc_datadir_tmp=${datadir}/sdcc fi - -cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <>ports.all if test "$enable_ds390_port" = "no"; then cat >> confdefs.h <> confdefs.h <>ports.build cat >> confdefs.h <> confdefs.h <&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 @@ -2812,7 +2831,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgc $LIBS" cat > conftest.$ac_ext <&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 diff --git a/configure.in b/configure.in index be8e46f6..c848ab71 100755 --- a/configure.in +++ b/configure.in @@ -202,9 +202,14 @@ 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") @@ -261,9 +266,11 @@ AC_ARG_ENABLE(ds390-port,[ --disable-ds390-port Excludes the DS390 port]) 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]) diff --git a/device/lib/gbz80/crt0.s b/device/lib/gbz80/crt0.s index 00faa3ba..3da7e319 100644 --- a/device/lib/gbz80/crt0.s +++ b/device/lib/gbz80/crt0.s @@ -38,6 +38,7 @@ init: jp _exit ;; Ordering of segments for the linker. + .area _HOME .area _CODE .area _GSINIT .area _GSFINAL diff --git a/device/lib/z80/crt0.s b/device/lib/z80/crt0.s index 61006f37..50e9e5c6 100644 --- a/device/lib/z80/crt0.s +++ b/device/lib/z80/crt0.s @@ -33,6 +33,7 @@ init: jp _exit ;; Ordering of segments for the linker. + .area _HOME .area _CODE .area _GSINIT .area _GSFINAL diff --git a/device/lib/z80/printf.c b/device/lib/z80/printf.c index 370a4e42..8f61bbae 100644 --- a/device/lib/z80/printf.c +++ b/device/lib/z80/printf.c @@ -10,7 +10,7 @@ /* 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)) { @@ -22,7 +22,7 @@ STATIC void _printn(unsigned u, unsigned base, char issigned, void (*emitter)(ch (*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 == '%') { diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 27573f58..c1510d14 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -235,7 +235,7 @@ static const char *_baseValues[] = { 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; -- 2.30.2