* src/SDCCsymt.c: no more _modifier in printTypeChain()

        * support/regression/tests/driverstruct.c: REENTRANT for mcs51
        * support/regression/ports/gbz80/spec.mk: removed GENERIC
        * support/regression/ports/host/spec.mk: removed GENERIC
        * support/regression/ports/mcs51/spec.mk: removed GENERIC
        * support/regression/ports/z80/spec.mk: removed GENERIC

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

diff --git a/ChangeLog b/ChangeLog
index 0ce35093387872c30fcbac3385248493d12fa249..39b882135fb830d61e8d250546fabec9099e2165 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-01 Bernhard Held <bernhard@bernhardheld.de>
+
+       * src/SDCCsymt.c: no more _modifier in printTypeChain()
+       * support/regression/tests/driverstruct.c: REENTRANT for mcs51
+       * support/regression/ports/gbz80/spec.mk: removed GENERIC
+       * support/regression/ports/host/spec.mk: removed GENERIC
+       * support/regression/ports/mcs51/spec.mk: removed GENERIC
+       * support/regression/ports/z80/spec.mk: removed GENERIC
+
 2001-10-01    <johan@FRIJA>
 
        * src/SDCC.y: fixed bug #466586 part 1

diff --git a/src/SDCCsymt.c b/src/SDCCsymt.c
index 7dced18745cd139a6b365e60a3c55ec366822e8c..f42072ebda806002308cc92f42f5477854eadf80 100644 (file)
--- a/src/SDCCsymt.c
+++ b/src/SDCCsymt.c
@@ -1895,43 +1895,43 @@ printTypeChain (sym_link * type, FILE * of)
              fprintf (of, "function ");
              break;
            case GPOINTER:
-             fprintf (of, "_generic * ");
+             fprintf (of, "generic * ");
              if (DCL_PTR_CONST (type))
                fprintf (of, "const ");
              break;
            case CPOINTER:
-             fprintf (of, "_code * ");
+             fprintf (of, "code * ");
              if (DCL_PTR_CONST (type))
                fprintf (of, "const ");
              break;
            case FPOINTER:
-             fprintf (of, "_far * ");
+             fprintf (of, "far * ");
              if (DCL_PTR_CONST (type))
                fprintf (of, "const ");
              break;
            case EEPPOINTER:
-             fprintf (of, "_eeprom * ");
+             fprintf (of, "eeprom * ");
              if (DCL_PTR_CONST (type))
                fprintf (of, "const ");
              break;
 
            case POINTER:
-             fprintf (of, "_near * ");
+             fprintf (of, "near * ");
              if (DCL_PTR_CONST (type))
                fprintf (of, "const ");
              break;
            case IPOINTER:
-             fprintf (of, "_idata *");
+             fprintf (of, "idata *");
              if (DCL_PTR_CONST (type))
                fprintf (of, "const ");
              break;
            case PPOINTER:
-             fprintf (of, "_pdata *");
+             fprintf (of, "pdata *");
              if (DCL_PTR_CONST (type))
                fprintf (of, "const ");
              break;
            case UPOINTER:
-             fprintf (of, " _unkown *");
+             fprintf (of, "unkown *");
              if (DCL_PTR_CONST (type))
                fprintf (of, "const ");
              break;

diff --git a/support/regression/ports/gbz80/spec.mk b/support/regression/ports/gbz80/spec.mk
index 4646e81e958a2a6c0e328d034e346364b6b4c10c..d8b33ede2fc03cea874fd97dc23f0c6994d17d7d 100644 (file)
--- a/support/regression/ports/gbz80/spec.mk
+++ b/support/regression/ports/gbz80/spec.mk
@@ -2,7 +2,7 @@
 
 EMU = $(SDCC_EXTRA_DIR)/emu/rrgb/rrgb
 
-SDCCFLAGS += --lesspedantic -DREENTRANT= -DGENERIC=
+SDCCFLAGS += --lesspedantic -DREENTRANT=
 
 EXEEXT = .gb
 

diff --git a/support/regression/ports/host/spec.mk b/support/regression/ports/host/spec.mk
index 583f1ea7754a5ccf70c5b74bc0766e022becd397..0e03a3f4cebbe8e5c6d42d1bc17af27a643c7efc 100644 (file)
--- a/support/regression/ports/host/spec.mk
+++ b/support/regression/ports/host/spec.mk
@@ -1,6 +1,6 @@
 # Port specification for compiling on the host machines version of gcc
 SDCC = gcc
-SDCCFLAGS = -Wall -fsigned-char -DREENTRANT= -DGENERIC=
+SDCCFLAGS = -Wall -fsigned-char -DREENTRANT=
 
 EXEEXT = .bin
 

diff --git a/support/regression/ports/mcs51/spec.mk b/support/regression/ports/mcs51/spec.mk
index 5695411be64daceeee234c349ac580d570064a2f..8485e3ecde76c631e90f83479b42fb8c0c976ae4 100644 (file)
--- a/support/regression/ports/mcs51/spec.mk
+++ b/support/regression/ports/mcs51/spec.mk
@@ -2,7 +2,7 @@
 
 S51 = ../../sim/ucsim/s51.src/s51
 
-SDCCFLAGS += --lesspedantic -DREENTRANT=reentrant -DGENERIC= --stack-after-data
+SDCCFLAGS += --lesspedantic -DREENTRANT=reentrant --stack-after-data
 
 OBJEXT = .rel
 EXEEXT = .ihx

diff --git a/support/regression/ports/z80/spec.mk b/support/regression/ports/z80/spec.mk
index cfe9ea06c6204a361b73557fbf765dccaa82057a..474afe1c5a8241a6e9a8db0dab149d94c4238d3b 100644 (file)
--- a/support/regression/ports/z80/spec.mk
+++ b/support/regression/ports/z80/spec.mk
@@ -3,7 +3,7 @@
 
 RRZ80 = $(SDCC_EXTRA_DIR)/emu/rrz80/rrz80
 
-SDCCFLAGS += --lesspedantic --profile -DREENTRANT= -DGENERIC=
+SDCCFLAGS += --lesspedantic --profile -DREENTRANT=
 
 EXEEXT = .bin
 

diff --git a/support/regression/tests/driverstruct.c b/support/regression/tests/driverstruct.c
index f6219e6149236e478574ee2903a63a37ebc595a2..542c2db3876899ab23b7ca298b7e37527b1003cb 100644 (file)
--- a/support/regression/tests/driverstruct.c
+++ b/support/regression/tests/driverstruct.c
@@ -17,16 +17,16 @@ typedef unsigned char uchar;
 
 typedef struct s_devsw {
        uchar   minors;         /* # of minor device numbers */
-       int     (*dev_init)(uchar NAME(minor));
-       int     (*dev_open)(uchar NAME(minor));
-       int     (*dev_close)(uchar NAME(minor));
-       int     (*dev_read)(uchar NAME(minor), uchar NAME(w));
-       int     (*dev_write)(uchar NAME(minor), uchar NAME(w));
-       int     (*dev_ioctl)(uchar NAME(minor), int cmd, void *data);
+       int     (*dev_init)(uchar NAME(minor)) REENTRANT;
+       int     (*dev_open)(uchar NAME(minor)) REENTRANT;
+       int     (*dev_close)(uchar NAME(minor)) REENTRANT;
+       int     (*dev_read)(uchar NAME(minor), uchar NAME(w)) REENTRANT;
+       int     (*dev_write)(uchar NAME(minor), uchar NAME(w)) REENTRANT;
+       int     (*dev_ioctl)(uchar NAME(minor), int cmd, void *data) REENTRANT;
 } devsw_t;
 
 static int
-_init(uchar minor)
+_init(uchar minor) REENTRANT
 {
   return minor;
 }