* device/include/pic16/pic18fregs.h,

[fw/sdcc] / support / regression / ports / mcs51-xstack-auto / spec.mk

diff --git a/support/regression/ports/mcs51-xstack-auto/spec.mk b/support/regression/ports/mcs51-xstack-auto/spec.mk
index a0d1ab5d11f787f65821fb41db70744ba7659089..16fcc2df0a21f55e8ebcc0c30b707163f4c32986 100644 (file)
--- a/support/regression/ports/mcs51-xstack-auto/spec.mk
+++ b/support/regression/ports/mcs51-xstack-auto/spec.mk
@@ -4,15 +4,16 @@
 
 include $(PORTS_DIR)/mcs51/spec.mk
 
-LIBSRCDIR = ../../device/lib
-LIBDIR    = gen/$(PORT)/lib
+LIBSRCDIR   = $(top_srcdir)/device/lib
+LIBBUILDDIR = $(top_builddir)/device/lib
+LIBDIR      = $(PORT_CASES_DIR)/lib
 
-LIBSDCCFLAGS+=--std-sdcc99 --stack-auto --xstack
-SDCCFLAGS   +=$(LIBSDCCFLAGS)
+LIBSDCCFLAGS+= --stack-auto --xstack --std-c99
+SDCCFLAGS   += --stack-auto --xstack --std-sdcc99
 
-# copy support.c
-$(PORTS_DIR)/$(PORT)/%.c: $(PORTS_DIR)/mcs51/%.c
-       cp $< $@
+# use C sources from mcs51
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/mcs51/%.c
+       $(SDCC) $(SDCCFLAGS) -c $< -o $@
 
 SOURCES = _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \
           _decdptr.c _divsint.c _divslong.c _divuint.c \
@@ -38,7 +39,7 @@ SOURCES = _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \
           _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
           _strstr.c _strtok.c \
           _uchar2fs.c _uint2fs.c _ulong2fs.c \
-          calloc.c malloc.c realloc.c free.c \
+          _heap.c calloc.c malloc.c realloc.c free.c \
           serial.c ser_ir.c printfl.c \
           printf_large.c sprintf.c vprintf.c puts.c gets.c \
           assert.c time.c bpx.c
@@ -52,11 +53,11 @@ $(LIBDIR):
        mkdir -p $(LIBDIR)
 
 $(LIBDIR)/%.rel: $(LIBSRCDIR)/%.c
-       -$(SDCC) -I../../device/include $(LIBSDCCFLAGS) -c $< -o $@
+       -$(SDCC) -I$(top_srcdir)/device/include -I$(top_srcdir)/device/include/mcs51 $(LIBSDCCFLAGS) -c $< -o $@
 
 .PHONY: lib-files
 lib-files:
-       make -C $(LIBSRCDIR)/mcs51 all
-       cp $(LIBSRCDIR)/mcs51/*.rel $(LIBSRCDIR)/mcs51/mcs51.lib $(LIBDIR)
+       make -C $(LIBBUILDDIR)/mcs51 all
+       cp $(LIBBUILDDIR)/mcs51/*.rel $(LIBBUILDDIR)/mcs51/mcs51.lib $(LIBDIR)
        echo $(MODULES) | tr ' ' '\n' > $(LIBDIR)/libsdcc.lib
        touch $(LIBDIR)/libfloat.lib $(LIBDIR)/libint.lib $(LIBDIR)/liblong.lib