* Makefile.in, configure.in, configure,
authorborutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Mon, 19 Jan 2009 21:06:40 +0000 (21:06 +0000)
committerborutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Mon, 19 Jan 2009 21:06:40 +0000 (21:06 +0000)
  device\lib\Makefile.in, device\lib\ds390\Makefile.in,
  device\lib\ds400\Makefile.in, device\lib\gbz80\Makefile.in,
  device\lib\hc08\Makefile.in, device\lib\large\Makefile.in,
  device\lib\mcs51\Makefile.in, device\lib\medium\Makefile.in,
  device\lib\small\Makefile.in,
  device\lib\z80\Makefile.in: create ar format libraries
* support\regression\ports\mcs51-xstack-auto\spec.mk:
  use device\lib\Makefile to create library
* support\regression\tests\snprintf.c:
  floating point is not enabled in small-xstack-auto library

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

16 files changed:
ChangeLog
Makefile.in
configure
configure.in
device/lib/Makefile.in
device/lib/ds390/Makefile.in
device/lib/ds400/Makefile.in
device/lib/gbz80/Makefile.in
device/lib/hc08/Makefile.in
device/lib/large/Makefile.in
device/lib/mcs51/Makefile.in
device/lib/medium/Makefile.in
device/lib/small/Makefile.in
device/lib/z80/Makefile.in
support/regression/ports/mcs51-xstack-auto/spec.mk
support/regression/tests/snprintf.c

index b166b3d6c54658cfe1360361d6bebcf9a69ccd59..1ffd3f5c2d500da4cf9ea87b6e607af247924f0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-19 Borut Razem <borut.razem AT siol.net>
+
+       * Makefile.in, configure.in, configure,
+         device\lib\Makefile.in, device\lib\ds390\Makefile.in,
+         device\lib\ds400\Makefile.in, device\lib\gbz80\Makefile.in,
+         device\lib\hc08\Makefile.in, device\lib\large\Makefile.in,
+         device\lib\mcs51\Makefile.in, device\lib\medium\Makefile.in,
+         device\lib\small\Makefile.in,
+         device\lib\z80\Makefile.in: create ar format libraries
+       * support\regression\ports\mcs51-xstack-auto\spec.mk:
+         use device\lib\Makefile to create library
+       * support\regression\tests\snprintf.c:
+         floating point is not enabled in small-xstack-auto library
+
 2009-01-18 Borut Razem <borut.razem AT siol.net>
 
        * support/cpp/auto-host.h: fixed warning: "__STDC__" redefined,
index 9887954758373ad7b95fa5abc16461285c32cd8a..f70e2546aa5dd24dee664b2cf366ff0aa10305ac 100644 (file)
@@ -102,7 +102,7 @@ sdcc-device-inc:
        $(MAKE) -C device/include
 
 sdcc-device-lib: sdcc-cc sdcc-aslink
-       $(MAKE) -C device/lib LIB_TYPE=LIB
+       $(MAKE) -C device/lib
 
 sdcc-device-tini:
        $(MAKE) -C device/include
index d8f3cdf9878d95549c71a21aa1c124fc07852d46..19a94c1e87998ad1d7242a9361c0cab60441f647 100755 (executable)
--- a/configure
+++ b/configure
@@ -664,6 +664,7 @@ OPT_DISABLE_GBZ80
 OPT_DISABLE_MCS51
 lib_dir_suffix
 include_dir_suffix
+LIB_TYPE
 sdccconf_h_dir_separator
 EGREP
 GREP
@@ -762,6 +763,7 @@ LIBS
 CPPFLAGS
 CPP
 sdccconf_h_dir_separator
+LIB_TYPE
 include_dir_suffix
 lib_dir_suffix
 docdir'
@@ -1429,6 +1431,7 @@ Some influential environment variables:
   CPP         C preprocessor
   sdccconf_h_dir_separator
               needed in sdccconf.h: either "/" (default) or "\\"
+  LIB_TYPE    library type: LIB, SDCCLIB, AR or RANLIB (default)
   include_dir_suffix
               appended to datadir to define SDCC's include directory
   lib_dir_suffix
@@ -6314,6 +6317,14 @@ fi
 # Makefiles
 ###########
 
+# LIB_TYPE:
+# *nix default: "RANLIB"
+
+
+if test "${LIB_TYPE}" = ""; then
+    LIB_TYPE="RANLIB"
+fi
+
 # include_dir_suffix:
 # *nix default: "sdcc/include"
 
index 0de9b1afa71e4082de9161391a522b1784f6deae..dc4bab5b88fd57579cba9c02aba3656fa34a5bd5 100644 (file)
@@ -489,6 +489,14 @@ fi
 # Makefiles
 ###########
 
+# LIB_TYPE:
+# *nix default: "RANLIB"
+
+AC_ARG_VAR([LIB_TYPE], [library type: LIB, SDCCLIB, AR or RANLIB (default)])
+if test "${LIB_TYPE}" = ""; then
+    LIB_TYPE="RANLIB"
+fi
+
 # include_dir_suffix:
 # *nix default: "sdcc/include"
 
index 8e91993490f4d070746af1b736d9f35acde8b96e..44fc414383a62eb8d394898ff6f3f756f94e0b1f 100644 (file)
@@ -7,28 +7,30 @@ VERSIONHI       = @VERSIONHI@
 VERSIONLO       = @VERSIONLO@
 VERSIONP        = @VERSIONP@
 
-SHELL          = /bin/sh
-CPP            = @CPP@
-INSTALL                = @INSTALL@
+SHELL           = /bin/sh
+CPP             = @CPP@
+INSTALL         = @INSTALL@
 CP              = @CP@
 
+LIB_TYPE        = @LIB_TYPE@
+
 ifeq ($(shell uname -s),Linux)
-CP_U   = $(CP) -u
+CP_U    = $(CP) -u
 else
-CP_U   = $(CP)
+CP_U    = $(CP)
 endif
 
-top_builddir   = @top_builddir@
-top_srcdir     = @top_srcdir@
+top_builddir    = @top_builddir@
+top_srcdir      = @top_srcdir@
 VPATH           = @srcdir@
 srcdir          = @srcdir@
-INCDIR         = $(top_srcdir)/device/include
+INCDIR          = $(top_srcdir)/device/include
 ifndef PORTINCDIR
-PORTINCDIR     = $(INCDIR)/mcs51
+PORTINCDIR      = $(INCDIR)/mcs51
 endif
 
-CC             = $(top_builddir)/bin/sdcc
-CPP            = $(top_builddir)/bin/sdcpp
+CC              = $(top_builddir)/bin/sdcc
+CPP             = $(top_builddir)/bin/sdcpp
 
 prefix          = @prefix@
 exec_prefix     = @exec_prefix@
@@ -47,13 +49,13 @@ lib_dir_suffix  = @lib_dir_suffix@
 sdcc_libdir     = $(DESTDIR)$(datadir)/$(lib_dir_suffix)
 
 CPPFLAGS        = -I$(INCDIR) -I$(PORTINCDIR)
-CFLAGS         = $(MODELFLAGS) --nostdinc --std-c99
+CFLAGS          = $(MODELFLAGS) --nostdinc --std-c99
 
 BUILDDIR        = build
 # Default
 PORT            = z80
 ifndef PORTDIR
-PORTDIR         = $(BUILDDIR)/$(PORT)
+PORTDIR         = $(abspath $(BUILDDIR)/$(PORT))
 endif
 
 OPT_DISABLE_AVR   = @OPT_DISABLE_AVR@
@@ -67,131 +69,218 @@ OPT_DISABLE_PIC16 = @OPT_DISABLE_PIC16@
 OPT_DISABLE_XA51  = @OPT_DISABLE_XA51@
 OPT_DISABLE_Z80   = @OPT_DISABLE_Z80@
 
-SOURCES =      _autobaud.c _bp.c _decdptr.c \
-               _gptrget.c _gptrgetc.c _gptrput.c \
-               _ser.c _setjmp.c \
-               serial.c ser_ir.c \
-               _atof.c _atoi.c _atol.c _itoa.c _ltoa.c \
-               _schar2fs.c _sint2fs.c _slong2fs.c \
-               _uchar2fs.c _uint2fs.c _ulong2fs.c \
-               _fs2schar.c _fs2sint.c _fs2slong.c \
-               _fs2uchar.c _fs2uint.c _fs2ulong.c \
-               _fsadd.c _fsdiv.c _fsmul.c _fssub.c \
-               _fseq.c _fsgt.c _fslt.c _fsneq.c \
-               _divsint.c _divslong.c _divuint.c _divulong.c \
-               _modsint.c _modslong.c _moduint.c _modulong.c \
-               _mulint.c _mullong.c \
-               abs.c labs.c rand.c \
-               _iscntrl.c _isdigit.c _isgraph.c \
-               _isprint.c _ispunct.c _isspace.c \
-               _islower.c _isupper.c _isxdigit.c \
-               _spx.c _startup.c \
-               _strcat.c _strchr.c _strcmp.c _strcpy.c \
-               _strcspn.c _strlen.c _strncat.c _strncmp.c \
-               _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
-               _strstr.c _strtok.c \
-               _memcmp.c _memcpy.c _memmove.c _memset.c \
-               _heap.c _calloc.c _malloc.c _realloc.c _free.c \
-               printf_large.c sprintf.c vprintf.c puts.c gets.c \
-               printf_fast.c printf_fast_f.c printf_tiny.c printfl.c \
-               assert.c time.c bpx.c \
-               _fscmp.c _fsget1arg.c _fsget2args.c _fsnormalize.c \
-               _fsreturnval.c _fsrshift.c _fsswapargs.c _logexpf.c \
-               fabsf.c frexpf.c ldexpf.c expf.c powf.c sincosf.c sinf.c \
-               cosf.c logf.c log10f.c sqrtf.c tancotf.c tanf.c cotf.c \
-               asincosf.c asinf.c acosf.c atanf.c atan2f.c sincoshf.c \
-               sinhf.c coshf.c tanhf.c floorf.c ceilf.c modff.c errno.c
-
-OBJECTS                = $(patsubst %.c,$(PORTDIR)/%.rel,$(SOURCES))
-
-Z80SOURCES =   \
-               _atof.c _atoi.c _atol.c _itoa.c _ltoa.c \
-               _schar2fs.c _sint2fs.c _slong2fs.c \
-               _uchar2fs.c _uint2fs.c _ulong2fs.c \
-               _fs2schar.c _fs2sint.c _fs2slong.c \
-               _fs2uchar.c _fs2uint.c _fs2ulong.c \
-               _fsadd.c _fsdiv.c _fsmul.c _fssub.c \
-               _fseq.c _fsgt.c _fslt.c _fsneq.c \
-               _divslong.c _divulong.c \
-               _modslong.c _modulong.c \
-               _mullong.c \
-               abs.c labs.c rand.c \
-               _iscntrl.c _isdigit.c _isgraph.c \
-               _isprint.c _ispunct.c _isspace.c \
-               _islower.c _isupper.c _isxdigit.c \
-               _startup.c \
-               _strcat.c _strchr.c _strcmp.c _strcpy.c \
-               _strcspn.c _strncat.c _strncmp.c \
-               _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
-               _strstr.c _strtok.c \
-               _memcmp.c _memcpy.c _memset.c \
-               _calloc.c _malloc.c _realloc.c _free.c \
-               printf_large.c sprintf.c vprintf.c puts.c gets.c \
-               assert.c time.c \
-               fabsf.c frexpf.c ldexpf.c expf.c powf.c sincosf.c sinf.c \
-               cosf.c logf.c log10f.c sqrtf.c tancotf.c tanf.c cotf.c \
-               asincosf.c asinf.c acosf.c atanf.c atan2f.c sincoshf.c \
-               sinhf.c coshf.c tanhf.c floorf.c ceilf.c modff.c errno.c
-
-Z80OBJECTS      = $(Z80SOURCES:%.c=$(PORTDIR)/%.o)
-
-XA51SOURCES      = _atof.c _atoi.c _atol.c _schar2fs.c \
-                 _divsint.c _divslong.c _divuint.c \
-                 _divulong.c _fs2schar.c _fs2sint.c _fs2slong.c \
-                 _fs2uchar.c _fs2uint.c _fs2ulong.c _fsadd.c \
-                 _fsdiv.c _fseq.c _fsgt.c _fslt.c _fsmul.c \
-                 _fsneq.c _fssub.c \
-                 _sint2fs.c _iscntrl.c _isdigit.c _isgraph.c \
-                 _islower.c _isprint.c _ispunct.c _isspace.c \
-                 _isupper.c _isxdigit.c _slong2fs.c _memcmp.c \
-                 _memcpy.c _memmove.c _memset.c _modsint.c _modslong.c \
-                 _moduint.c _modulong.c _mulint.c _mullong.c \
-                 abs.c labs.c rand.c \
-                 _strcat.c _strchr.c _strcmp.c _strcpy.c \
-                 _strcspn.c _strlen.c _strncat.c _strncmp.c \
-                 _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
-                 _strstr.c _strtok.c \
-                 _uchar2fs.c _uint2fs.c _ulong2fs.c \
-                 _heap.c _calloc.c _malloc.c _realloc.c _free.c \
-                 puts.c gets.c \
-                 printf_large.c puts.c gets.c \
-                 assert.c time.c \
-                 fabsf.c frexpf.c ldexpf.c expf.c powf.c sincosf.c sinf.c \
-                 cosf.c logf.c log10f.c sqrtf.c tancotf.c tanf.c cotf.c \
-                 asincosf.c asinf.c acosf.c atanf.c atan2f.c sincoshf.c \
-                 sinhf.c coshf.c tanhf.c floorf.c ceilf.c modff.c errno.c
-
-XA51OBJECTS      = $(XA51SOURCES:%.c=$(PORTDIR)/%.rel)
-
-HC08SOURCES =  \
-               _atof.c _atoi.c _atol.c _itoa.c _ltoa.c \
-               _schar2fs.c _sint2fs.c _slong2fs.c \
-               _uchar2fs.c _uint2fs.c _ulong2fs.c \
-               _fs2schar.c _fs2sint.c _fs2slong.c \
-               _fs2uchar.c _fs2uint.c _fs2ulong.c \
-               _fsadd.c _fsdiv.c _fsmul.c _fssub.c \
-               _fseq.c _fsgt.c _fslt.c _fsneq.c \
-               _divsint.c _divslong.c \
-               _modsint.c _modslong.c _moduint.c _modulong.c \
-               abs.c labs.c rand.c \
-               _iscntrl.c _isdigit.c _isgraph.c \
-               _isprint.c _ispunct.c _isspace.c \
-               _islower.c _isupper.c _isxdigit.c \
-               _spx.c _startup.c \
-               _strcat.c _strchr.c _strcmp.c _strcpy.c \
-               _strcspn.c _strlen.c _strncat.c _strncmp.c \
-               _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
-               _strstr.c _strtok.c \
-               _memcmp.c _memcpy.c _memmove.c _memset.c \
-               _heap.c _calloc.c _malloc.c _realloc.c _free.c \
-               printf_large.c sprintf.c vprintf.c puts.c gets.c \
-               assert.c time.c \
-               fabsf.c frexpf.c ldexpf.c expf.c powf.c sincosf.c sinf.c \
-               cosf.c logf.c log10f.c sqrtf.c tancotf.c tanf.c cotf.c \
-               asincosf.c asinf.c acosf.c atanf.c atan2f.c sincoshf.c \
-               sinhf.c coshf.c tanhf.c floorf.c ceilf.c modff.c errno.c
-
-HC08OBJECTS    = $(patsubst %.c,$(PORTDIR)/%.rel,$(HC08SOURCES))
+COMMON_FLOAT = \
+  _atof.c \
+  _schar2fs.c \
+  _sint2fs.c \
+  _slong2fs.c \
+  _uchar2fs.c \
+  _uint2fs.c \
+  _ulong2fs.c \
+  _fs2schar.c \
+  _fs2sint.c \
+  _fs2slong.c \
+  _fs2uchar.c \
+  _fs2uint.c \
+  _fs2ulong.c \
+  _fsadd.c \
+  _fsdiv.c \
+  _fsmul.c \
+  _fssub.c \
+  _fseq.c \
+  _fsgt.c \
+  _fslt.c \
+  _fsneq.c \
+  fabsf.c \
+  frexpf.c \
+  ldexpf.c \
+  expf.c \
+  powf.c \
+  sincosf.c \
+  sinf.c \
+  cosf.c \
+  logf.c \
+  log10f.c \
+  sqrtf.c \
+  tancotf.c \
+  tanf.c \
+  cotf.c \
+  asincosf.c \
+  asinf.c \
+  acosf.c \
+  atanf.c \
+  atan2f.c \
+  sincoshf.c \
+  sinhf.c \
+  coshf.c \
+  tanhf.c \
+  floorf.c \
+  ceilf.c \
+  modff.c \
+  errno.c
+
+COMMON_LONG = \
+  _divslong.c \
+  _modslong.c \
+  _modulong.c
+
+COMMON_SDCC = \
+  _atoi.c \
+  _atol.c \
+  abs.c \
+  labs.c \
+  rand.c \
+  _iscntrl.c \
+  _isdigit.c \
+  _isgraph.c \
+  _isprint.c \
+  _ispunct.c \
+  _isspace.c \
+  _islower.c \
+  _isupper.c \
+  _isxdigit.c \
+  _strcat.c \
+  _strchr.c \
+  _strcmp.c \
+  _strcpy.c \
+  _strcspn.c \
+  _strncat.c \
+  _strncmp.c \
+  _strncpy.c \
+  _strpbrk.c \
+  _strrchr.c \
+  _strspn.c \
+  _strstr.c \
+  _strtok.c \
+  _memcmp.c \
+  _memcpy.c \
+  _memset.c \
+  _calloc.c \
+  _malloc.c \
+  _realloc.c \
+  _free.c \
+  printf_large.c \
+  puts.c \
+  gets.c \
+  assert.c \
+  time.c
+
+SOURCES_FLOAT = $(COMMON_FLOAT) \
+  _fscmp.c \
+  _fsget1arg.c \
+  _fsget2args.c \
+  _fsnormalize.c \
+  _fsreturnval.c \
+  _fsrshift.c \
+  _fsswapargs.c \
+  _logexpf.c
+
+SOURCES_INT = $(COMMON_INT) \
+  _divsint.c \
+  _divuint.c \
+  _modsint.c \
+  _moduint.c \
+  _mulint.c
+
+SOURCES_LONG = $(COMMON_LONG) \
+  _divulong.c \
+  _mullong.c
+
+SOURCES_SDCC = $(COMMON_SDCC) \
+  _autobaud.c \
+  _bp.c \
+  _decdptr.c \
+  _gptrget.c \
+  _gptrgetc.c \
+  _gptrput.c \
+  _ser.c \
+  _setjmp.c \
+  serial.c \
+  _itoa.c \
+  _ltoa.c \
+  _spx.c \
+  _startup.c \
+  _strlen.c \
+  _memmove.c \
+  _heap.c \
+  sprintf.c \
+  vprintf.c \
+  printf_fast.c \
+  printf_fast_f.c \
+  printf_tiny.c \
+  printfl.c \
+  bpx.c
+
+SOURCES = $(SOURCES_FLOAT) $(SOURCES_INT) $(SOURCES_LONG) $(SOURCES_SDCC)
+
+OBJECTS_FLOAT = $(SOURCES_FLOAT:%.c=$(PORT)/%.rel)
+OBJECTS_INT = $(SOURCES_INT:%.c=$(PORT)/%.rel)
+OBJECTS_LONG = $(SOURCES_LONG:%.c=$(PORT)/%.rel)
+OBJECTS_SDCC = $(SOURCES_SDCC:%.c=$(PORT)/%.rel)
+
+OBJECTS = $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC)
+
+Z80_FLOAT = $(COMMON_FLOAT)
+
+Z80_INT = $(COMMON_INT)
+
+Z80_LONG = $(COMMON_LONG) \
+  _divulong.c \
+  _mullong.c
+
+Z80_SDCC = $(COMMON_SDCC) \
+  _itoa.c \
+  _ltoa.c \
+  _startup.c \
+  sprintf.c \
+  vprintf.c
+
+Z80SOURCES = $(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC)
+Z80OBJECTS = $(Z80SOURCES:%.c=$(PORT)/%.o)
+
+XA51_FLOAT = $(COMMON_FLOAT)
+
+XA51_INT = $(COMMON_INT) \
+  _divsint.c \
+  _divuint.c \
+  _modsint.c \
+  _moduint.c \
+  _mulint.c
+
+XA51_LONG = $(COMMON_LONG) \
+  _divulong.c \
+  _mullong.c
+
+XA51_SDCC = $(COMMON_SDCC) \
+  _memmove.c \
+  _strlen.c \
+  _heap.c
+
+XA51SOURCES = $(Z80_FLOAT) $(XA51_INT) $(XA51_LONG) $(XA51_SDCC)
+XA51OBJECTS = $(XA51SOURCES:%.c=$(PORT)/%.rel)
+
+HC08_FLOAT = $(COMMON_FLOAT)
+
+HC08_INT = $(COMMON_INT) \
+  _divsint.c \
+  _modsint.c \
+  _moduint.c
+
+HC08_LONG = $(COMMON_LONG)
+
+HC08_SDCC = $(COMMON_SDCC) \
+  _itoa.c \
+  _ltoa.c \
+  _spx.c \
+  _startup.c \
+  _strlen.c \
+  _memmove.c \
+  _heap.c \
+  sprintf.c \
+  vprintf.c
+
+HC08SOURCES = $(HC08_FLOAT) $(HC08_INT) $(HC08_LONG) $(HC08_SDCC)
+HC08OBJECTS = $(patsubst %.c,$(PORT)/%.rel,$(HC08SOURCES))
 
 OEXT            = .rel
 
@@ -244,20 +333,23 @@ models:
 
 small-mcs51-stack-auto:
        if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \
-         $(MAKE) MODELFLAGS="--model-small --stack-auto" PORT=small PORTDIR=$(BUILDDIR)/small-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
+         mkdir -p small-stack-auto; cp small/Makefile small-stack-auto; \
+         $(MAKE) MODELFLAGS="--model-small --stack-auto" PORT=small-stack-auto PORTDIR=$(abspath $(BUILDDIR)/small-stack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \
        fi
 
 model-mcs51-stack-auto:
        if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \
          for model in $(MODELS); do \
-           $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
+            mkdir -p $${model}-stack-auto; cp $${model}/Makefile $${model}-stack-auto; \
+           $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$${model}-stack-auto PORTDIR=$(abspath $(BUILDDIR)/$${model}-stack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \
          done \
        fi
 
 model-mcs51-xstack-auto:
        if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \
          for model in $(MODELS); do \
-           $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-xstack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
+           mkdir -p $${model}-xstack-auto; cp $${model}/Makefile $${model}-xstack-auto; \
+           $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack" PORT=$${model}-xstack-auto PORTDIR=$(abspath $(BUILDDIR)/$${model}-xstack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \
          done \
        fi
 
@@ -277,7 +369,18 @@ model-xa51:
        fi
 
 objects-xa51: build-dir $(XA51OBJECTS) port-specific-objects
-       cd $(PORTDIR); ls *$(OEXT) > lib$(PORT).lib
+ifeq ($(LIB_TYPE), SDCCLIB)
+       ../../bin/sdcclib -a $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Sq $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Sq $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
+       $(top_builddir)/bin/asranlib $(PORTDIR)/lib$(PORT).lib
+else
+       rm -f $(PORTDIR)/lib$(PORT).lib
+       for i in $(notdir $(basename $(XA51OBJECTS))); do echo $$i >> $(PORTDIR)/lib$(PORT).lib; done
+       cp $(XA51OBJECTS) $(PORTDIR)
+endif
 
 model-z80:
        if grep '^z80\>' $(top_builddir)/ports.build > /dev/null; then \
@@ -290,7 +393,18 @@ model-gbz80:
        fi
 
 objects-z80: build-dir $(Z80OBJECTS) port-specific-objects clean_intermediate
-       cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib
+ifeq ($(LIB_TYPE), SDCCLIB)
+       ../../bin/sdcclib -a $(PORTDIR)/$(PORT).lib $(Z80OBJECTS)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Sq $(PORTDIR)/$(PORT).lib $(Z80OBJECTS)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Sq $(PORTDIR)/$(PORT).lib $(Z80OBJECTS)
+       $(top_builddir)/bin/asranlib $(PORTDIR)/$(PORT).lib
+else
+       rm -f $(PORTDIR)/lib$(PORT).lib
+       for i in $(notdir $(basename $(Z80OBJECTS))); do echo $$i >> $(PORTDIR)/lib$(PORT).lib; done
+       cp $(Z80OBJECTS) $(PORTDIR)
+endif
 
 model-hc08:
        if grep '^hc08\>' $(top_builddir)/ports.build > /dev/null; then \
@@ -298,7 +412,18 @@ model-hc08:
        fi
 
 objects-hc08: build-dir $(HC08OBJECTS) port-specific-objects clean_intermediate
-       cd $(PORTDIR); ls *$(OEXT) > $(PORT).lib
+ifeq ($(LIB_TYPE), SDCCLIB)
+       ../../bin/sdcclib -a $(PORTDIR)/$(PORT).lib $(HC08OBJECTS)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Sq $(PORTDIR)/$(PORT).lib $(HC08OBJECTS)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Sq $(PORTDIR)/$(PORT).lib $(HC08OBJECTS)
+       $(top_builddir)/bin/asranlib $(PORTDIR)/$(PORT).lib
+else
+       rm -f $(PORTDIR)/lib$(PORT).lib
+       for i in $(notdir $(basename $(HC08OBJECTS))); do echo $$i >> $(PORTDIR)/lib$(PORT).lib; done
+       cp $(HC08OBJECTS) $(PORTDIR)
+endif
 
 model-pic16:
        if grep '^pic16\>' $(top_builddir)/ports.build > /dev/null; then \
@@ -314,16 +439,24 @@ model-pic14:
 
 objects-pic14: build-dir port-specific-objects-pic14 clean_intermediate-pic14
 
-build-dir: $(PORTDIR)
+build-dir: $(PORTDIR) $(PORT)
 
 $(PORTDIR):
        mkdir -p $(PORTDIR)
 
+$(PORT):
+       mkdir -p $(PORT)
+
 port-specific-objects:
+ifneq ($(LIB_TYPE), LIB)
        -if [ -f $(PORT)/Makefile ]; then \
-         $(MAKE) -C $(PORT); \
-         cp -f $(PORT)/*.lib $(PORT)/*$(OEXT) $(PORTDIR); \
+         $(MAKE) -C $(PORT) PORT=$(PORT); \
        fi
+else
+       -if [ -f $(PORT)/Makefile ]; then \
+         $(MAKE) -C $(PORT) PORT=$(PORT); \
+        fi
+endif
 
 port-specific-objects-pic16:
        -if [ -f $(PORT)/Makefile ]; then \
@@ -340,7 +473,35 @@ port-specific-objects-pic14:
        fi
 
 lib-files:
-       cp $(srcdir)/*.lib $(PORTDIR)
+ifeq ($(LIB_TYPE), SDCCLIB)
+       ../../bin/sdcclib -a $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
+       ../../bin/sdcclib -a $(PORTDIR)/libint.lib $(OBJECTS_INT)
+       ../../bin/sdcclib -a $(PORTDIR)/liblong.lib $(OBJECTS_LONG)
+       ../../bin/sdcclib -a $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Scq $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
+       ar -Scq $(PORTDIR)/libint.lib $(OBJECTS_INT)
+       ar -Scq $(PORTDIR)/liblong.lib $(OBJECTS_LONG)
+       ar -Scq $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Scq $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(PORTDIR)/libfloat.lib
+       ar -Scq $(PORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(PORTDIR)/libint.lib
+       ar -Scq $(PORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(PORTDIR)/liblong.lib
+       ar -Scq $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(PORTDIR)/libsdcc.lib
+else
+       rm -f $(PORTDIR)/libfloat.lib
+       for i in $(notdir $(basename $(OBJECTS_FLOAT))); do echo $$i >> $(PORTDIR)/libfloat.lib; done
+       cp $(OBJECTS_FLOAT) $(PORTDIR)
+       rm -f $(PORTDIR)/libint.lib
+       for i in $(notdir $(basename $(OBJECTS_INT))); do echo $$i >> $(PORTDIR)/libint.lib; done
+       cp $(OBJECTS_INT) $(PORTDIR)
+       rm -f $(PORTDIR)/liblong.lib
+       for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(PORTDIR)/liblong.lib; done
+       cp $(OBJECTS_LONG) $(PORTDIR)
+       rm -f $(PORTDIR)/libsdcc.lib
+       for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(PORTDIR)/libsdcc.lib; done
+       cp $(OBJECTS_SDCC) $(PORTDIR)
+endif
 
 clean_intermediate:
        rm -f $(PORTDIR)/*.lst $(PORTDIR)/*.sym
@@ -426,7 +587,7 @@ include $(srcdir)/clean.mk
 
 .SUFFIXES: .rel .o
 
-$(PORTDIR)/%$(OEXT): %.c
+$(PORT)/%$(OEXT): %.c
        $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 # Remaking configuration
index 4dbedf34f6a0a66ec80ed8522938ca37eeb3ae39..135dce7286c879b3e6badaaa06a61a4d97a8a930 100644 (file)
@@ -1,8 +1,13 @@
 VPATH  = @srcdir@
 srcdir = @srcdir@
+top_builddir = @top_builddir@
+
+LIB_TYPE        = @LIB_TYPE@
 
 CC = ../../../bin/sdcc
 
+PORTDIR = ../build/ds390
+
 #VERBOSE = --verbose
 
 OBJECTS = tinibios.rel memcpyx.rel  lcd390.rel i2c390.rel rtc390.rel putchar.rel
@@ -12,7 +17,7 @@ SOURCES = $(patsubst %.rel,%.c,$(OBJECTS))
 CPPFLAGS = -I$(srcdir)/../../include
 CFLAGS = -mds390 $(CPPFLAGS) $(VERBOSE) --std-c99
 
-all: $(OBJECTS) libds390.lib
+all: $(OBJECTS) $(PORTDIR)/libds390.lib
 
 clean:
        rm -f *.lst *.rel *.sym *.cdb *.asm \#* *~ *.rst *.hex
@@ -21,11 +26,20 @@ clean:
 distclean: clean
        rm -f Makefile Makefile.dep
 
-libds390.lib: $(OBJECTS)
+$(PORTDIR)/libds390.lib: $(OBJECTS)
+ifeq ($(LIB_TYPE), SDCCLIB)
        rm -f $@; \
-       for libfile in $(OBJECTS); do \
-               echo $$libfile >>$@; \
-       done;
+       ../../../bin/sdcclib -a $@ $(OBJECTS)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Scq $@ $(OBJECTS)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Scq $@ $(OBJECTS)
+       $(top_builddir)/bin/asranlib $@
+else
+       rm -f $@;
+       for libfile in $(basename $(OBJECTS)); do echo $$libfile >>$@; done
+       cp $(OBJECTS) $(PORTDIR)
+endif
 
 %.rel: %.c
        $(CC) -c $(CFLAGS) $<
index 234df089677e14e14e17e3e832f0c0538c4f8e60..f29c9142c776efb3a3cd1a97f683504ca1200527 100644 (file)
@@ -1,7 +1,12 @@
-CC = ../../../bin/sdcc
-
 VPATH  = @srcdir@
 srcdir = @srcdir@
+top_builddir = @top_builddir@
+
+LIB_TYPE     = @LIB_TYPE@
+
+CC = ../../../bin/sdcc
+
+PORTDIR = ../build/ds400
 
 #VERBOSE = --verbose
 
@@ -12,7 +17,7 @@ SOURCES = $(patsubst %.rel,%.c,$(OBJECTS))
 CPPFLAGS = -I$(srcdir)/../../include
 CFLAGS = -mds400 $(CPPFLAGS) $(VERBOSE) --std-c99
 
-all: $(OBJECTS) libds400.lib
+all: $(OBJECTS) $(PORTDIR)/libds400.lib
 
 clean:
        rm -f *.lst *.rel *.sym *.cdb *.asm \#* *~ *.rst *.hex 
@@ -21,11 +26,20 @@ clean:
 distclean: clean
        rm -f Makefile Makefile.dep
 
-libds400.lib: $(OBJECTS)
+$(PORTDIR)/libds400.lib: $(OBJECTS)
+ifeq ($(LIB_TYPE), SDCCLIB)
        rm -f $@; \
-       for libfile in $(OBJECTS); do \
-               echo $$libfile >>$@; \
-       done;
+       ../../../bin/sdcclib -a $@ $(OBJECTS)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Scq $@ $(OBJECTS)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Scq $@ $(OBJECTS)
+       $(top_builddir)/bin/asranlib $@
+else
+       rm -f $@;
+       for libfile in $(basename $(OBJECTS)); do echo $$libfile >>$@; done
+       cp $(OBJECTS) $(PORTDIR)
+endif
 
 %.rel: %.c
        $(CC) -c $(CFLAGS) $<
index cc38628a509ce82ab412db17a2e3b817a39bbc63..1828b97186744e1c1e9e2cfbb1576725c0bada8b 100644 (file)
@@ -2,12 +2,17 @@
 
 VPATH  = @srcdir@
 srcdir = @srcdir@
+top_builddir = @top_builddir@
+
+LIB_TYPE     = @LIB_TYPE@
 
 TOPDIR = ../../..
 
 SCC = $(TOPDIR)/bin/sdcc -mgbz80
 SAS = $(TOPDIR)/bin/as-gbz80
 
+PORTDIR = ../build/gbz80
+
 OBJ = div.o mul.o putchar.o printf.o shift.o stubs.o crt0_rle.o heap.o fstubs.o
 
 LIB = gbz80.lib
@@ -15,11 +20,22 @@ CC = $(SCC)
 AS = $(SAS)
 CFLAGS = -I$(srcdir)/../../include -I. --std-c89
 
-all: $(LIB) crt0.o
-
-$(LIB): $(OBJ) Makefile _dummy
-       rm -f $(LIB)
-       for i in $(OBJ); do echo $$i >> $(LIB); done
+all: $(PORTDIR)/$(LIB) crt0.o
+
+$(PORTDIR)/$(LIB): $(OBJ) Makefile _dummy
+ifeq ($(LIB_TYPE), SDCCLIB)
+       rm -f $@; \
+       ../../../bin/sdcclib -a $@ $(OBJ)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Scq $@ $(OBJ)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Scq $@ $(OBJ)
+       $(top_builddir)/bin/asranlib $@
+else
+       rm -f $@
+       for i in $(basename $(OBJ)); do echo $$i >>$@; done
+       cp $(OBJ) $(PORTDIR)
+endif
 
 .c.o:
        $(CC) $(CFLAGS) -c $<
index 56596653ee1d3f751c0024ea01f617fdf21a5558..7b8e7a079dfe35ace196cf381bb7f48ecb4bfb6b 100644 (file)
@@ -2,12 +2,17 @@
 
 VPATH  = @srcdir@
 srcdir = @srcdir@
+top_builddir = @top_builddir@
+
+LIB_TYPE     = @LIB_TYPE@
 
 TOPDIR = ../../..
 
 SCC = $(TOPDIR)/bin/sdcc -mhc08
 SAS = $(TOPDIR)/bin/as6808
 
+PORTDIR = ../build/hc08
+
 OBJ = _ret.rel _divuint.rel _divulong.rel _mulint.rel _mullong.rel
 
 LIB = hc08.lib
@@ -17,11 +22,22 @@ ASFLAGS = -plosgff
 
 CFLAGS = -I$(srcdir)/../../include -I. --std-c99
 
-all: $(LIB)
-
-$(LIB): $(OBJ) Makefile _dummy
-       rm -f $(LIB)
-       for i in $(OBJ); do echo $$i >> $(LIB); done
+all: $(PORTDIR)/$(LIB)
+
+$(PORTDIR)/$(LIB): $(OBJ) Makefile _dummy
+ifeq ($(LIB_TYPE), SDCCLIB)
+       rm -f $@; \
+       ../../../bin/sdcclib -a $@ $(OBJ)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Scq $@ $(OBJ)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Scq $@ $(OBJ)
+       $(top_builddir)/bin/asranlib $@
+else
+       rm -f $@
+       for i in $(basename $(OBJ)); do echo $$i >>$@; done
+       cp $(OBJ) $(PORTDIR)
+endif
 
 %.rel: %.c
        $(CC) $(CFLAGS) -c $<
index 4acca3f09e69f73abe2e2555858bb8f41660b7a5..472b7016b959a6e695354cc9a3607f02d946467b 100644 (file)
@@ -1,11 +1,10 @@
 all:
        $(MAKE) -C ../mcs51 all
-       cp ../mcs51/*.rel ../mcs51/*.lib .
-       touch dummy.lib
+       cp ../mcs51/*.rel .
        touch dummy.rel
 
 clean:
-       rm -f *.rel *.lib
+       rm -f *.rel
 
 distclean: clean
        rm -f Makefile
\ No newline at end of file
index 294048428a0eeacd867e19b95567c34b7a5b5cc4..16a2deab337b3a4aac6743f739c105be731772bc 100644 (file)
@@ -4,9 +4,12 @@ srcdir = @srcdir@
 top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
 
+LIB_TYPE     = @LIB_TYPE@
 SAS = $(top_builddir)/bin/asx8051
 SCC = $(top_builddir)/bin/sdcc
 
+PORTDIR = ../build/$(PORT)
+
 OBJ = crtstart.rel crtxinit.rel crtxclear.rel crtclear.rel crtxstack.rel \
       crtpagesfr.rel crtbank.rel crtcall.rel
 
@@ -18,11 +21,22 @@ ASFLAGS = -plosgff
 
 CFLAGS = -I$(top_srcdir)/include --std-c89
 
-all: $(LIB)
-
-$(LIB): $(OBJ) Makefile
-       rm -f $(LIB)
-       for i in $(OBJ); do echo $$i >> $(LIB); done
+all: $(PORTDIR)/$(LIB)
+
+$(PORTDIR)/$(LIB): $(OBJ) Makefile
+ifeq ($(LIB_TYPE), SDCCLIB)
+       rm -f $@; \
+       ../../../bin/sdcclib -a $@ $(OBJ)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Scq $@ $(OBJ)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Scq $@ $(OBJ)
+       $(top_builddir)/bin/asranlib $@
+else
+       rm -f $@
+       for i in $(basename $(OBJ)); do echo $$i >>$@; done
+       cp $(OBJ) $(PORTDIR)
+endif
 
 %.rel: %.c
        $(CC) $(CFLAGS) -c $<
index 4acca3f09e69f73abe2e2555858bb8f41660b7a5..472b7016b959a6e695354cc9a3607f02d946467b 100644 (file)
@@ -1,11 +1,10 @@
 all:
        $(MAKE) -C ../mcs51 all
-       cp ../mcs51/*.rel ../mcs51/*.lib .
-       touch dummy.lib
+       cp ../mcs51/*.rel .
        touch dummy.rel
 
 clean:
-       rm -f *.rel *.lib
+       rm -f *.rel
 
 distclean: clean
        rm -f Makefile
\ No newline at end of file
index 4acca3f09e69f73abe2e2555858bb8f41660b7a5..472b7016b959a6e695354cc9a3607f02d946467b 100644 (file)
@@ -1,11 +1,10 @@
 all:
        $(MAKE) -C ../mcs51 all
-       cp ../mcs51/*.rel ../mcs51/*.lib .
-       touch dummy.lib
+       cp ../mcs51/*.rel .
        touch dummy.rel
 
 clean:
-       rm -f *.rel *.lib
+       rm -f *.rel
 
 distclean: clean
        rm -f Makefile
\ No newline at end of file
index 0be6444d33c2120bf30dac5b1eeac4ada4afdb23..cf98fbfec31a5abbe2c3a56c60552c300b36f8cf 100644 (file)
@@ -2,12 +2,17 @@
 
 VPATH  = @srcdir@
 srcdir = @srcdir@
+top_builddir = @top_builddir@
+
+LIB_TYPE     = @LIB_TYPE@
 
 TOPDIR = ../../..
 
 SCC = $(TOPDIR)/bin/sdcc -mz80
 SAS = $(TOPDIR)/bin/as-z80
 
+PORTDIR = ../build/z80
+
 OBJ = div.o divsigned.o mod.o mul.o mulchar.o putchar.o shift.o stubs.o crt0_rle.o heap.o fstubs.o memmove.o strlen.o
 
 LIB = z80.lib
@@ -17,11 +22,25 @@ ASFLAGS = -plosgff
 
 CFLAGS = -I$(srcdir)/../../include -I. --std-c89
 
-all: $(LIB) crt0.o
-
-$(LIB): $(OBJ) Makefile _dummy
-       rm -f $(LIB)
-       for i in $(OBJ); do echo $$i >> $(LIB); done
+all: $(PORTDIR)/$(LIB) $(PORTDIR)/crt0.o
+
+$(PORTDIR)/crt0.o: crt0.o
+       cp crt0.o $(PORTDIR)/crt0.o
+
+$(PORTDIR)/$(LIB): $(OBJ) Makefile _dummy
+ifeq ($(LIB_TYPE), SDCCLIB)
+       rm -f $@; \
+       ../../../bin/sdcclib -a $@ $(OBJ)
+else ifeq ($(LIB_TYPE), AR)
+       ar -Scq $@ $(OBJ)
+else ifeq ($(LIB_TYPE), RANLIB)
+       ar -Scq $@ $(OBJ)
+       $(top_builddir)/bin/asranlib $@
+else
+       rm -f $@; \
+       for i in $(basename $(OBJ)); do echo $$i >>$@; done
+       cp $(OBJ) $(PORTDIR)
+endif
 
 .c.o:
        $(CC) $(CFLAGS) -c $<
index 3281a8a4383e672b70d33d6c5caf63a8351d9951..99d9c3febbe50b0afb1a31d98287a9f134ad5026 100644 (file)
@@ -2,58 +2,15 @@
 #
 # model small xstack-auto
 
-include $(PORTS_DIR)/mcs51-common/spec.mk
-
-LIBSRCDIR   = $(top_srcdir)/device/lib
-LIBBUILDDIR = $(top_builddir)/device/lib
-LIBDIR      = $(PORT_CASES_DIR)/lib
-
 LIBSDCCFLAGS+= --stack-auto --xstack --std-c99 -DUSE_FLOATS=1
 SDCCFLAGS   += --stack-auto --xstack --std-sdcc99
 
-SOURCES = _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \
-          _decdptr.c _divsint.c _divslong.c _divuint.c \
-          _divulong.c _fs2schar.c _fs2sint.c _fs2slong.c \
-          _fs2uchar.c _fs2uint.c _fs2ulong.c \
-          _fsadd.c _fssub.c _fsdiv.c _fsmul.c \
-          _fseq.c _fsneq.c _fsgt.c _fslt.c _fscmp.c \
-          fabsf.c sqrtf.c logf.c log10f.c powf.c tanf.c \
-          errno.c frexpf.c ldexpf.c expf.c tancotf.c \
-          _fsget1arg.c _fsget2args.c _fsnormalize.c \
-          _fsreturnval.c _fsrshift.c _fsswapargs.c \
-          _gptrget.c _gptrput.c \
-          _sint2fs.c _iscntrl.c _isdigit.c _isgraph.c \
-          _islower.c _isprint.c _ispunct.c _isspace.c \
-          _isupper.c _isxdigit.c _slong2fs.c \
-          _memcmp.c _memcpy.c _memmove.c _memset.c \
-          _modsint.c _modslong.c _moduint.c _modulong.c \
-          _mulint.c _mullong.c \
-          _ser.c _setjmp.c \
-          _spx.c _startup.c \
-          _strcat.c _strchr.c _strcmp.c _strcpy.c \
-          _strcspn.c _strlen.c _strncat.c _strncmp.c \
-          _strncpy.c _strpbrk.c _strrchr.c _strspn.c \
-          _strstr.c _strtok.c \
-          _uchar2fs.c _uint2fs.c _ulong2fs.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
-
-OBJECTS = $(patsubst %.c,$(LIBDIR)/%.rel,$(SOURCES))
-MODULES = $(patsubst %.c,%,$(SOURCES))
-
-MAKE_LIBRARY = $(LIBDIR) $(OBJECTS) lib-files
+include $(PORTS_DIR)/mcs51-common/spec.mk
 
-$(LIBDIR):
-       mkdir -p $(LIBDIR)
+LIBDIR      = $(top_builddir)/device/lib/build/small-xstack-auto
 
-$(LIBDIR)/%.rel: $(LIBSRCDIR)/%.c
-       -$(SDCC) -I$(top_srcdir)/device/include -I$(top_srcdir)/device/include/mcs51 $(LIBSDCCFLAGS) -c $< -o $@
+MAKE_LIBRARY = lib-files
 
 .PHONY: lib-files
 lib-files:
-       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
+       make -C $(top_builddir)/device/lib model-mcs51-xstack-auto MODELS=small
index c06d32546d9b684a57cc0df7acf9b73daa0e438e..6ed6972d2d55f01e26dad02258b3a9cd34e854bf 100644 (file)
@@ -98,7 +98,7 @@
        } static const cases[]={
                // arg, fmt,    result
                // ... there should be more ...
-               #if defined(SDCC) && !defined(SDCC_ds390) && !(defined(SDCC_mcs51) && defined(SDCC_USE_XSTACK))
+               #if defined(SDCC) && !defined(SDCC_ds390)
                {1.0,   "%f",   "<NO FLOAT>"},
                #else
                {1.0,   "%f",   "1.000000"},