* 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

diff --git a/.version b/.version
index 2bf1c1ccf363acd53eaf92ef33a7f11f5f4557c2..f90b1afc082fd7893e2baff542cf85cfb803c551 100644 (file)
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.3.1
+2.3.2

diff --git a/ChangeLog b/ChangeLog
index 41cfd956e0140f734fe94f612eb486cd2db59b9e..a88814c72f3b25612a98ca4bbfb24797a0ac1d1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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.
@@ -105,7 +115,6 @@
 
        * sdcc/src/SDCCcse.c: Better fix for bug # 514308
 
->>>>>>> 1.105
 2002-03-02    <johan@FRIJA>
 
        * src/SDCCast.c (decorateType): fixed bug #524708

diff --git a/configure b/configure
index 8b619b7881b192f6628011d04dd179b2b4a714fc..ca471bb7ad42c359740ec83ff980cf471ceff965 100755 (executable)
--- a/configure
+++ b/configure
@@ -2574,15 +2574,26 @@ else
     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
@@ -2719,12 +2730,20 @@ echo ds390 >>ports.all
 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
@@ -2804,7 +2823,7 @@ 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
@@ -2812,7 +2831,7 @@ else
   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
@@ -2823,7 +2842,7 @@ int main() {
 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

diff --git a/configure.in b/configure.in
index be8e46f61080bc158f0521061f93046538f30755..c848ab71c805ff596197934acab001a5ba7b0752 100755 (executable)
--- 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 00faa3ba2914063cacc9c897e521b7aa89216210..3da7e31970edd3613b71ebb7f82a9188631cfac4 100644 (file)
--- 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 61006f372f24f53e156003d07184a4e407c1a38b..50e9e5c6927a9f5954c45e71f2466b05c3a78e01 100644 (file)
--- 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 370a4e42173dd31a38abcf55d7917885a2c7c04e..8f61bbae3ed55315d7d4b0308ea615681fe97efc 100644 (file)
--- 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 27573f58a88e91a9e15bc1b70a42dd644ca82f5b..c1510d14e16761f8a13c1e3e22a45e8e29046aa4 100644 (file)
--- 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;