* support/regression/Makefile.in,

  support/regression/ports/ds390/spec.mk,
  support/regression/ports/hc08/spec.mk,
  support/regression/ports/mcs51-common/spec.mk,
  support/regression/ports/pic14/spec.mk,
  support/regression/ports/pic16/spec.mk,
  support/regression/ports/ucz80/spec.mk,
  support/regression/ports/z80/spec.mk:
  added INC_DIR and LIBDIR paths
* src/ds390/gen.c: removed duplicated selicolon

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

diff --git a/ChangeLog b/ChangeLog
index 4dcf432bbaae143bda29ec22421b4943f0a8742e..46880e094ee1fa221d8a54a1aa121334571b1157 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-05-05 Borut Razem <borut.razem AT siol.net>
+
+       * support/regression/Makefile.in,
+         support/regression/fwk/lib/testfwk.c,
+         support/regression/ports/ds390/spec.mk,
+         support/regression/ports/hc08/spec.mk,
+         support/regression/ports/mcs51-common/spec.mk,
+         support/regression/ports/pic14/spec.mk,
+         support/regression/ports/pic16/spec.mk,
+         support/regression/ports/ucz80/spec.mk,
+         support/regression/ports/z80/spec.mk:
+         added INC_DIR and LIBDIR paths
+       * src/ds390/gen.c: removed duplicated selicolon
+
 2008-05-04 Borut Razem <borut.razem AT siol.net>
 
        * support/regression/Makefile.in,

diff --git a/src/ds390/gen.c b/src/ds390/gen.c
index 8baf0d171d1e371cb79070ad235911edd7b79e72..74e31a5cb440ab3ad94bb844282fd6254975f78d 100644 (file)
--- a/src/ds390/gen.c
+++ b/src/ds390/gen.c
@@ -2850,7 +2850,7 @@ unsaveRBank (int bank, iCode * ic, bool popPsw)
       if (!ic)
         {
           /* Assume r0 is available for use. */
-          r = REG_WITH_INDEX (R0_IDX);;
+          r = REG_WITH_INDEX (R0_IDX);
         }
       else
         {

diff --git a/support/regression/Makefile.in b/support/regression/Makefile.in
index c3ba976407933df9398ac4f43b748efb89d0bd4a..92cbf37a6485d699fb186ee9bf8e8daea57af252 100644 (file)
--- a/support/regression/Makefile.in
+++ b/support/regression/Makefile.in
@@ -158,6 +158,7 @@ ifdef SDCC_BIN_PATH
   SDCC = $(SDCC_BIN_PATH)/sdcc
 else
   SDCC = $(top_builddir)/bin/sdcc
+  INC_DIR ?= $(top_srcdir)/device/include
 endif
 # Base flags.
 SDCCFLAGS += --fverbose-asm -DNO_VARARGS
@@ -176,6 +177,9 @@ endif
 make_library: $(MAKE_LIBRARY)
 
 SDCCFLAGS += -I$(srcdir)/fwk/include -I$(srcdir)/tests
+#ifdef INC_DIR
+SDCCFLAGS += -I$(INC_DIR)
+#endif
 
 # List of intermediate files to keep.  Pretty much keep everything as
 # disk space is free.

diff --git a/support/regression/ports/ds390/spec.mk b/support/regression/ports/ds390/spec.mk
index 46da096af0cf634ac70d115c1d4fad1d047c3270..7c2d17c0fc5dc9d267d7b085b8ebf6b3b15b1815 100644 (file)
--- a/support/regression/ports/ds390/spec.mk
+++ b/support/regression/ports/ds390/spec.mk
@@ -13,11 +13,11 @@ else
 
   S51 = $(shell if [ -f $(S51A) ]; then echo $(S51A); else echo $(S51B); fi)
 
-  SDCCFLAGS += --nostdinc
-  LINKFLAGS += --nostdlib -L $(top_builddir)/device/lib/build/ds390 
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/ds390 
 endif
 
-SDCCFLAGS +=-mds390 --less-pedantic -DREENTRANT=reentrant -Wl-r -I$(top_srcdir)
+SDCCFLAGS +=-mds390 --less-pedantic -DREENTRANT=reentrant -Wl-r
 LINKFLAGS += libds390.lib libsdcc.lib liblong.lib libint.lib libfloat.lib
 
 OBJEXT = .rel

diff --git a/support/regression/ports/hc08/spec.mk b/support/regression/ports/hc08/spec.mk
index 0db5e33089728b4abaded6bd768f62706c154339..b8efb4b4b55f4b148ccb57e17787592558537afb 100644 (file)
--- a/support/regression/ports/hc08/spec.mk
+++ b/support/regression/ports/hc08/spec.mk
@@ -14,11 +14,11 @@ else
 
   AS_HC08 = $(top_builddir)/bin/as-hc08
 
-  SDCCFLAGS += --nostdinc
-  LINKFLAGS += --nostdlib -L $(top_builddir)/device/lib/build/hc08
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/hc08
 endif
 
-SDCCFLAGS +=-mhc08 --less-pedantic --out-fmt-ihx -DREENTRANT=reentrant -I$(top_srcdir)
+SDCCFLAGS +=-mhc08 --less-pedantic --out-fmt-ihx -DREENTRANT=reentrant
 LINKFLAGS += hc08.lib
 
 OBJEXT = .rel

diff --git a/support/regression/ports/mcs51-common/spec.mk b/support/regression/ports/mcs51-common/spec.mk
index a2ddf22baf19efab9022cafbda5200cbd8b3496b..e71d081cd37e4375bfd3cdb0ffdfa57f9e4ad48a 100644 (file)
--- a/support/regression/ports/mcs51-common/spec.mk
+++ b/support/regression/ports/mcs51-common/spec.mk
@@ -13,11 +13,11 @@ else
 
   S51 = $(shell if [ -f $(S51A) ]; then echo $(S51A); else echo $(S51B); fi)
 
-  SDCCFLAGS += --nostdinc
-  LINKFLAGS += --nostdlib
+  SDCCFLAGS += --nostdinc -I$(INC_DIR)/mcs51 -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(LIBDIR)
 endif
 
-SDCCFLAGS += --less-pedantic -DREENTRANT=reentrant -I$(INC_DIR)/mcs51 -I$(top_srcdir)
+SDCCFLAGS += --less-pedantic -DREENTRANT=reentrant
 LINKFLAGS += mcs51.lib libsdcc.lib liblong.lib libint.lib libfloat.lib
 
 OBJEXT = .rel

diff --git a/support/regression/ports/pic14/spec.mk b/support/regression/ports/pic14/spec.mk
index accf671ac39b287e8ec9373d44a5ca2bd27b2fb1..56b2a4173e7acfed30454df3a144a87634478ab4 100644 (file)
--- a/support/regression/ports/pic14/spec.mk
+++ b/support/regression/ports/pic14/spec.mk
@@ -8,11 +8,11 @@ else
 endif
 
 ifndef SDCC_BIN_PATH
-  SDCCFLAGS += --nostdinc
-  LINKFLAGS += --nostdlib -L $(top_builddir)/device/lib/build/pic
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic
 endif
 
-SDCCFLAGS += -mpic14 -pp16f877 -I$(top_srcdir)/device/include/pic --less-pedantic -Wl,-q -DREENTRANT=reentrant -I$(top_srcdir)
+SDCCFLAGS += -mpic14 -pp16f877 --less-pedantic -Wl,-q -DREENTRANT=reentrant
 LINKFLAGS += libsdcc.lib libm.lib
 
 OBJEXT = .o

diff --git a/support/regression/ports/pic16/spec.mk b/support/regression/ports/pic16/spec.mk
index d6e2339fb3a431a6e28179f414935a23e9f925f6..c436491ec05edb37bd7ae3b66d3963a5d4b1383a 100644 (file)
--- a/support/regression/ports/pic16/spec.mk
+++ b/support/regression/ports/pic16/spec.mk
@@ -8,11 +8,11 @@ else
 endif
 
 ifndef SDCC_BIN_PATH
-  SDCCFLAGS += --nostdinc
-  LINKFLAGS += --nostdlib -L $(top_builddir)/device/lib/build/pic16
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic16 -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic16
 endif
 
-SDCCFLAGS += -mpic16 -pp18f452 -I$(top_srcdir)/device/include/pic16 --less-pedantic -Wl,-q -DREENTRANT=reentrant -I$(top_srcdir)
+SDCCFLAGS += -mpic16 -pp18f452 --less-pedantic -Wl,-q -DREENTRANT=reentrant
 SDCCFLAGS += --no-peep
 LINKFLAGS += libsdcc.lib libc18f.lib libm18f.lib
 

diff --git a/support/regression/ports/ucz80/spec.mk b/support/regression/ports/ucz80/spec.mk
index 04e1b06b44d43c0e1b3ef0db3888c8f4c3d4cdf3..2189e2f740997d326694aa732948d93e7c07f3c2 100644 (file)
--- a/support/regression/ports/ucz80/spec.mk
+++ b/support/regression/ports/ucz80/spec.mk
@@ -14,11 +14,11 @@ else
 
   AS_Z80 = $(top_builddir)/bin/as-z80
 
-  SDCCFLAGS += --nostdinc
-  LINKFLAGS += --nostdlib -L $(top_builddir)/device/lib/build/z80
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/z80
 endif
 
-SDCCFLAGS +=-mz80 --less-pedantic --profile -DREENTRANT= -I$(top_srcdir)
+SDCCFLAGS +=-mz80 --less-pedantic --profile -DREENTRANT=
 #SDCCFLAGS +=--less-pedantic -DREENTRANT=reentrant
 LINKFLAGS += z80.lib
 

diff --git a/support/regression/ports/z80/spec.mk b/support/regression/ports/z80/spec.mk
index f9ee40865673c92a3814bff6fae73c79360e72ea..897774244ab0de87d2f28268011edba9593cc85b 100644 (file)
--- a/support/regression/ports/z80/spec.mk
+++ b/support/regression/ports/z80/spec.mk
@@ -19,7 +19,7 @@ EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
 
 # Rule to link into .ihx
 %.ihx: %.c $(EXTRAS)
-       $(SDCC) $(SDCCFLAGS) $(LINKFLAGS) -L $(LIBDIR) $(EXTRAS) $< -o $@
+       $(SDCC) $(SDCCFLAGS) $(LINKFLAGS) -L$(LIBDIR) $(EXTRAS) $< -o $@
 
 $(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
        $(top_builddir)/bin/as-z80 -plosgff $@ $<