- Update to version 2.7.3.2007.09.28.

PR:		ports/116718
Submitted by:	Tijl Coosemans <tijl@ulyssis.org> (maintainer)

10 files changed, 195 insertions, 192 deletions

diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index ca5cb79c878e..071f96e8c4f7 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	sdcc
-PORTVERSION=	2.6.2.2006.12.13
+PORTVERSION=	2.7.3.2007.09.28
 CATEGORIES=	lang
 MASTER_SITES=	http://sdcc.sourceforge.net/snapshots/sdcc-src/ \
-		http://kalimero.be/mirror/
-DISTNAME=	${PORTNAME}-src-20061213-4514
+		http://tijl.ulyssis.be/mirror/
+DISTNAME=	${PORTNAME}-src-20070928-4920
 
 MAINTAINER=	tijl@ulyssis.org
 COMMENT=	Small Device C Compiler
@@ -34,18 +34,24 @@ OPTIONS=	MCS51   "Intel mcs51 port" on \
 		UCSIM   "The ucSim simulator" on \
 		PACKIHX "A tool to pack (compress) Intel hex files" on
 
+CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		--datarootdir=${DATADIR} \
+		--docdir=${DOCSDIR} \
+		include_dir_suffix=include \
+		lib_dir_suffix=lib
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_MCS51) && !defined(WITHOUT_UCSIM) && ${OSVERSION} < 500019
-LIB_DEPENDS=	readline.5:${PORTSDIR}/devel/readline
-CONFIGURE_ARGS=	CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib"
+LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
 .endif
 
 .if defined(WITHOUT_MCS51) && defined(WITHOUT_DS390)
 CONFIGURE_ARGS+=	--disable-51
 PLIST_SUB+=		MCS51DS390="@comment "
 .else
-USE_AUTOTOOLS+=		autoconf:259
+USE_AUTOTOOLS+=		autoconf:261
 PLIST_SUB+=		MCS51DS390=""
 .endif
 
@@ -127,4 +133,12 @@ PLIST_SUB+=		PACKIHX="@comment "
 PLIST_SUB+=		PACKIHX=""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} 's,ARCH,PICARCH,g' \
+		${WRKSRC}/device/lib/pic/Makefile.common.in \
+		${WRKSRC}/device/lib/pic/Makefile.rules \
+		${WRKSRC}/device/lib/pic16/Makefile.common.in \
+		${WRKSRC}/device/lib/pic16/Makefile.rules \
+		${WRKSRC}/device/lib/pic16/libio/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/lang/sdcc-devel/distinfo b/lang/sdcc-devel/distinfo
index ec5160b9a83a..9c74a9597a89 100644
--- a/lang/sdcc-devel/distinfo
+++ b/lang/sdcc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdcc-src-20061213-4514.tar.bz2) = 6a45fc99e3183995bf8c6f40ed8cac4f
-SHA256 (sdcc-src-20061213-4514.tar.bz2) = 9ece65c860b950de8c4fe5955ce116a07ae57ffe2c04842345b735184ec25aa5
-SIZE (sdcc-src-20061213-4514.tar.bz2) = 3234308
+MD5 (sdcc-src-20070928-4920.tar.bz2) = ddba290f35401404683e10da0b59b8f3
+SHA256 (sdcc-src-20070928-4920.tar.bz2) = 63994f8271fe79ee486a7fb2f9434e8b703f7db20a1a2c396a7885cfa53272bb
+SIZE (sdcc-src-20070928-4920.tar.bz2) = 3461905
diff --git a/lang/sdcc-devel/files/patch-device-lib-Makefile.in b/lang/sdcc-devel/files/patch-device-lib-Makefile.in
index 9d0730ac6ceb..590ba7ab1e6f 100644
--- a/lang/sdcc-devel/files/patch-device-lib-Makefile.in
+++ b/lang/sdcc-devel/files/patch-device-lib-Makefile.in
@@ -1,6 +1,6 @@
---- device/lib/Makefile.in.orig	Sat Jun 17 16:43:52 2006
-+++ device/lib/Makefile.in	Wed Jun 28 19:08:03 2006
-@@ -337,23 +337,6 @@
+--- device/lib/Makefile.in.orig	2007-09-28 16:29:43.000000000 +0200
++++ device/lib/Makefile.in	2007-09-28 16:30:14.000000000 +0200
+@@ -345,23 +345,6 @@
  # ---------------------------------------------------
  install: all installdirs
  	$(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
@@ -14,17 +14,17 @@
 -	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
 -	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'build' -o -name 'bin' -o \
 -	    -name 'Makefile*' \) \
--	    -exec rm -r {} \; ; \
+-	    -exec rm -rf {}+ \; ; \
 -	done
 -	find $(sdcc_libdir)/src/mcs51 -depth \
 -	  \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
 -	  -name '*.lst' -o -name '.svn' -o -name 'build' -o -name 'bin' -o \
 -	  -name 'Makefile*' \) \
--	  -exec rm -r {} \;
+-	  -exec rm -rf {}+ \;
  
  # Deleting all the installed files
  # --------------------------------
-@@ -374,14 +357,6 @@
+@@ -382,14 +365,6 @@
  # ---------------------------------
  installdirs:
  	[ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir)
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.common.in b/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.common.in
deleted file mode 100644
index 5841fddbebe9..000000000000
--- a/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.common.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- device/lib/pic/Makefile.common.in.orig	Mon May  1 22:47:12 2006
-+++ device/lib/pic/Makefile.common.in	Wed Jun 28 17:27:29 2006
-@@ -12,7 +12,6 @@
- ### $Id: Makefile.common.in 4148 2006-05-01 20:47:12Z tecodev $
- ###
- 
--SHELL = bash
- 
- #################################################
- ### verboseness
-@@ -24,10 +23,10 @@
- #################################################
- ### compiler switches
- # ARCH might be overwritten in libio
--ARCH   ?= 877
-+PICARCH   ?= 877
- 
- CFLAGS ?=
--CFLAGS += -mpic14 -p16f$(ARCH)
-+CFLAGS += -mpic14 -p16f$(PICARCH)
- CFLAGS += --std-c99
- CFLAGS += -I. -I$(top_srcdir)/../../include/pic
- 
-@@ -54,7 +53,7 @@
- #################################################
- ### assembler switches
- ASFLAGS ?=
--ASFLAGS += -pp16f$(ARCH)
-+ASFLAGS += -pp16f$(PICARCH)
- ASFLAGS += -I$(top_srcdir)/../../include/pic
- ASFLAGS += -I. -I$(srcdir)
- 
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.rules b/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.rules
deleted file mode 100644
index 2cca46ac5f16..000000000000
--- a/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.rules
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/lib/pic/Makefile.rules.orig	Mon May  1 22:47:12 2006
-+++ device/lib/pic/Makefile.rules	Thu Jun 29 00:39:50 2006
-@@ -56,7 +56,7 @@
- ifneq (,$(strip $(SUBDIRS)))
- recurse : force
- 	$(Q)+for DIR in $(SUBDIRS) ; do \
--		$(GREP) "^$${ARCH}$$" "$${DIR}.ignore" &> /dev/null || ( \
-+		$(GREP) "^$${PICARCH}$$" "$${DIR}.ignore" 2>&1 /dev/null || ( \
- 			$(MKDIR) "$(top_builddir)$(builddir)/$${DIR}"; \
- 			$(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \
- 		) || exit 1; \
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in
deleted file mode 100644
index 6e9a61f39a43..000000000000
--- a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- device/lib/pic16/Makefile.common.in.orig	Mon May  1 22:47:12 2006
-+++ device/lib/pic16/Makefile.common.in	Wed Jun 28 17:35:09 2006
-@@ -16,7 +16,6 @@
- ### $Id: Makefile.common.in 4148 2006-05-01 20:47:12Z tecodev $
- ###
- 
--SHELL = bash
- 
- #################################################
- ### verboseness
-@@ -27,10 +26,10 @@
- 
- #################################################
- ### compiler switches
--ARCH   ?= 452		# might be overwritten in libio
-+PICARCH   ?= 452		# might be overwritten in libio
- 
- CFLAGS ?=
--CFLAGS += -mpic16 -p18f$(ARCH)
-+CFLAGS += -mpic16 -p18f$(PICARCH)
- CFLAGS += --std-c99
- CFLAGS += -I. -I$(top_srcdir)/../../include/pic16
- 
-@@ -63,7 +62,7 @@
- #################################################
- ### assembler switches
- ASFLAGS ?=
--ASFLAGS += -pp18f$(ARCH)
-+ASFLAGS += -pp18f$(PICARCH)
- ASFLAGS += -I$(top_srcdir)/../../include/pic16
- ASFLAGS += -I$(srcdir)
- 
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules
deleted file mode 100644
index ee9903adff1b..000000000000
--- a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/lib/pic16/Makefile.rules.orig	Mon May  1 22:47:12 2006
-+++ device/lib/pic16/Makefile.rules	Thu Jun 29 00:40:44 2006
-@@ -58,7 +58,7 @@
- ifneq (,$(strip $(SUBDIRS)))
- recurse : force
- 	$(Q)+for DIR in $(SUBDIRS) ; do \
--		$(GREP) "^$${ARCH}$$" "$(srcdir)/$${DIR}.ignore" &> /dev/null || ( \
-+		$(GREP) "^$${PICARCH}$$" "$(srcdir)/$${DIR}.ignore" 2>&1 /dev/null || ( \
- 			$(MKDIR) "$(top_builddir)$(builddir)/$${DIR}"; \
- 			$(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \
- 		) || exit 1; \
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile b/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile
deleted file mode 100644
index ba1c24193692..000000000000
--- a/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/lib/pic16/libio/Makefile.in.orig	Mon May  1 22:47:12 2006
-+++ device/lib/pic16/libio/Makefile.in	Wed Jun 28 17:40:48 2006
-@@ -38,7 +38,7 @@
- 		| while read arch; do \
- 			[ "x$${arch}" = "x" ] \
- 			|| ( $(MKDIR) "$(top_builddir)$(builddir)/$${arch}"; \
--				$(MAKE) MKLIB=libio18f$${arch}.lib builddir=$(builddir)/$${arch} ARCH=$${arch} IO_ARCH=$${arch} $(MAKECMDGOALS); ) \
-+				$(MAKE) MKLIB=libio18f$${arch}.lib builddir=$(builddir)/$${arch} PICARCH=$${arch} IO_ARCH=$${arch} $(MAKECMDGOALS); ) \
- 			|| exit 1; \
- 	done
- 
diff --git a/lang/sdcc-devel/files/patch-sim-ucsim-cmd.src-Makefile.in b/lang/sdcc-devel/files/patch-sim-ucsim-cmd.src-Makefile.in
deleted file mode 100644
index 6edf30962522..000000000000
--- a/lang/sdcc-devel/files/patch-sim-ucsim-cmd.src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sim/ucsim/cmd.src/Makefile.in.orig	Mon Apr 24 23:19:58 2006
-+++ sim/ucsim/cmd.src/Makefile.in	Wed Jun 28 17:19:54 2006
-@@ -45,7 +45,7 @@
- 		  cmduc.o cmdstat.o cmdmem.o \
- 		  cmdpars.o cmdlex.o
- 
--DEVEL		= $(shell ( bash -c "test -e $(top_builddir)devel && echo yes" ))
-+DEVEL		= no
- 
- # Compiling entire program or any subproject
- # ------------------------------------------
diff --git a/lang/sdcc-devel/pkg-plist b/lang/sdcc-devel/pkg-plist
index 5909877d8381..00329888ebbd 100644
--- a/lang/sdcc-devel/pkg-plist
+++ b/lang/sdcc-devel/pkg-plist
@@ -18,70 +18,70 @@ bin/sdcclib
 bin/sdcpp
 %%UCSIM%%%%HC08%%bin/shc08
 %%UCSIM%%%%Z80%%bin/sz80
-%%DATADIR%%/doc/INSTALL.txt
-%%DATADIR%%/doc/README.txt
-%%DATADIR%%/doc/TININative.txt
-%%Z80%%%%DATADIR%%/doc/aslink/README
-%%Z80%%%%DATADIR%%/doc/aslink/abstra.doc
-%%Z80%%%%DATADIR%%/doc/aslink/appendk.txt
-%%Z80%%%%DATADIR%%/doc/aslink/asmlnk.doc
-%%Z80%%%%DATADIR%%/doc/aslink/asxhtm.html
-%%Z80%%%%DATADIR%%/doc/aslink/format.txt
-%%DATADIR%%/doc/avr/avr_design.txt
-%%DATADIR%%/doc/builtins.txt
-%%DATADIR%%/doc/choices.txt
-%%DATADIR%%/doc/libdoc.txt
-%%DATADIR%%/doc/macro-sys-design.txt
-%%DATADIR%%/doc/random-notes.txt
-%%UCSIM%%%%DATADIR%%/doc/ucsim/UCsim.jpg
-%%UCSIM%%%%DATADIR%%/doc/ucsim/analyzer.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/burst.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/chip.fig
-%%UCSIM%%%%DATADIR%%/doc/ucsim/chip.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cmd.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cmd_bp.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cmd_dump.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cmd_exec.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cmd_general.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cmd_memory.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cmd_removed.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cmd_set.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/commref.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cpu-mem.fig
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cpu-mem.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cpu-mem.jpg
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cpu.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cpu.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/cpu_types.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/decoded.fig
-%%UCSIM%%%%DATADIR%%/doc/ucsim/decoded.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/decoded.jpg
-%%UCSIM%%%%DATADIR%%/doc/ucsim/index.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/interrupt.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/interrupt.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/invoke.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/memory.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/mulcons.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/new.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/obsolete.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/post.jpg
-%%UCSIM%%%%DATADIR%%/doc/ucsim/serial.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/serial1.fig
-%%UCSIM%%%%DATADIR%%/doc/ucsim/serial1.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/serial2.fig
-%%UCSIM%%%%DATADIR%%/doc/ucsim/serial2.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/share-chip.fig
-%%UCSIM%%%%DATADIR%%/doc/ucsim/share-chip.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/syntax.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/term_cpuopt.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/term_cpuopt.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/timers.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/timers.html
-%%UCSIM%%%%DATADIR%%/doc/ucsim/wins.gif
-%%UCSIM%%%%DATADIR%%/doc/ucsim/wins.html
-%%DATADIR%%/doc/z80/Makefile
-%%DATADIR%%/doc/z80/README
-%%DATADIR%%/doc/z80/combined_i186_z80_design.tex
+%%DOCSDIR%%/INSTALL.txt
+%%DOCSDIR%%/README.txt
+%%DOCSDIR%%/TININative.txt
+%%Z80%%%%DOCSDIR%%/aslink/README
+%%Z80%%%%DOCSDIR%%/aslink/abstra.doc
+%%Z80%%%%DOCSDIR%%/aslink/appendk.txt
+%%Z80%%%%DOCSDIR%%/aslink/asmlnk.doc
+%%Z80%%%%DOCSDIR%%/aslink/asxhtm.html
+%%Z80%%%%DOCSDIR%%/aslink/format.txt
+%%DOCSDIR%%/avr/avr_design.txt
+%%DOCSDIR%%/builtins.txt
+%%DOCSDIR%%/choices.txt
+%%DOCSDIR%%/libdoc.txt
+%%DOCSDIR%%/macro-sys-design.txt
+%%DOCSDIR%%/random-notes.txt
+%%UCSIM%%%%DOCSDIR%%/ucsim/UCsim.jpg
+%%UCSIM%%%%DOCSDIR%%/ucsim/analyzer.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/burst.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/chip.fig
+%%UCSIM%%%%DOCSDIR%%/ucsim/chip.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/cmd.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cmd_bp.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cmd_dump.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cmd_exec.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cmd_general.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cmd_memory.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cmd_removed.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cmd_set.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/commref.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cpu-mem.fig
+%%UCSIM%%%%DOCSDIR%%/ucsim/cpu-mem.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/cpu-mem.jpg
+%%UCSIM%%%%DOCSDIR%%/ucsim/cpu.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/cpu.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/cpu_types.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/decoded.fig
+%%UCSIM%%%%DOCSDIR%%/ucsim/decoded.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/decoded.jpg
+%%UCSIM%%%%DOCSDIR%%/ucsim/index.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/interrupt.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/interrupt.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/invoke.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/memory.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/mulcons.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/new.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/obsolete.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/post.jpg
+%%UCSIM%%%%DOCSDIR%%/ucsim/serial.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/serial1.fig
+%%UCSIM%%%%DOCSDIR%%/ucsim/serial1.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/serial2.fig
+%%UCSIM%%%%DOCSDIR%%/ucsim/serial2.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/share-chip.fig
+%%UCSIM%%%%DOCSDIR%%/ucsim/share-chip.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/syntax.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/term_cpuopt.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/term_cpuopt.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/timers.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/timers.html
+%%UCSIM%%%%DOCSDIR%%/ucsim/wins.gif
+%%UCSIM%%%%DOCSDIR%%/ucsim/wins.html
+%%DOCSDIR%%/z80/Makefile
+%%DOCSDIR%%/z80/README
+%%DOCSDIR%%/z80/combined_i186_z80_design.tex
 %%DATADIR%%/include/80c51xa.h
 %%DATADIR%%/include/asm/default/features.h
 %%DATADIR%%/include/asm/ds390/features.h
@@ -96,6 +96,7 @@ bin/sdcpp
 %%DATADIR%%/include/ds80c390.h
 %%DATADIR%%/include/errno.h
 %%DATADIR%%/include/float.h
+%%HC08%%%%DATADIR%%/include/hc08/mc68hc908apxx.h
 %%HC08%%%%DATADIR%%/include/hc08/mc68hc908gp32.h
 %%HC08%%%%DATADIR%%/include/hc08/mc68hc908jb8.h
 %%HC08%%%%DATADIR%%/include/hc08/mc68hc908jkjl.h
@@ -105,6 +106,7 @@ bin/sdcpp
 %%DATADIR%%/include/math.h
 %%MCS51%%%%DATADIR%%/include/mcs51/8051.h
 %%MCS51%%%%DATADIR%%/include/mcs51/8052.h
+%%MCS51%%%%DATADIR%%/include/mcs51/ADuC84x.h
 %%MCS51%%%%DATADIR%%/include/mcs51/C8051F000.h
 %%MCS51%%%%DATADIR%%/include/mcs51/C8051F018.h
 %%MCS51%%%%DATADIR%%/include/mcs51/C8051F020.h
@@ -119,12 +121,15 @@ bin/sdcpp
 %%MCS51%%%%DATADIR%%/include/mcs51/C8051F330.h
 %%MCS51%%%%DATADIR%%/include/mcs51/C8051F340.h
 %%MCS51%%%%DATADIR%%/include/mcs51/C8051F350.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F360.h
 %%MCS51%%%%DATADIR%%/include/mcs51/C8051F410.h
 %%MCS51%%%%DATADIR%%/include/mcs51/C8051F520.h
 %%MCS51%%%%DATADIR%%/include/mcs51/P89LPC901.h
 %%MCS51%%%%DATADIR%%/include/mcs51/P89LPC922.h
+%%MCS51%%%%DATADIR%%/include/mcs51/P89LPC925.h
 %%MCS51%%%%DATADIR%%/include/mcs51/P89LPC932.h
 %%MCS51%%%%DATADIR%%/include/mcs51/P89c51RD2.h
+%%MCS51%%%%DATADIR%%/include/mcs51/SST89x5xRDx.h
 %%MCS51%%%%DATADIR%%/include/mcs51/XC866.h
 %%MCS51%%%%DATADIR%%/include/mcs51/at89S8252.h
 %%MCS51%%%%DATADIR%%/include/mcs51/at89c51ed2.h
@@ -142,12 +147,14 @@ bin/sdcpp
 %%MCS51%%%%DATADIR%%/include/mcs51/mcs51reg.h
 %%MCS51%%%%DATADIR%%/include/mcs51/msc1210.h
 %%MCS51%%%%DATADIR%%/include/mcs51/msm8xc154s.h
+%%MCS51%%%%DATADIR%%/include/mcs51/p89c66x.h
 %%MCS51%%%%DATADIR%%/include/mcs51/p89v51rd2.h
 %%MCS51%%%%DATADIR%%/include/mcs51/reg51.h
 %%MCS51%%%%DATADIR%%/include/mcs51/reg764.h
 %%MCS51%%%%DATADIR%%/include/mcs51/regc515c.h
 %%MCS51%%%%DATADIR%%/include/mcs51/sab80515.h
 %%MCS51%%%%DATADIR%%/include/mcs51/serial_IO.h
+%%MCS51%%%%DATADIR%%/include/mcs51/uPSD33xx.h
 %%PIC%%%%DATADIR%%/include/pic/errno.h
 %%PIC%%%%DATADIR%%/include/pic/float.h
 %%PIC%%%%DATADIR%%/include/pic/limits.h
@@ -233,6 +240,8 @@ bin/sdcpp
 %%PIC%%%%DATADIR%%/include/pic/pic16f877.h
 %%PIC%%%%DATADIR%%/include/pic/pic16f877a.h
 %%PIC%%%%DATADIR%%/include/pic/pic16f88.h
+%%PIC%%%%DATADIR%%/include/pic/pic16f886.h
+%%PIC%%%%DATADIR%%/include/pic/pic16f887.h
 %%PIC%%%%DATADIR%%/include/pic/pic16f913.h
 %%PIC%%%%DATADIR%%/include/pic/pic16f914.h
 %%PIC%%%%DATADIR%%/include/pic/pic16f916.h
@@ -249,24 +258,51 @@ bin/sdcpp
 %%PIC16%%%%DATADIR%%/include/pic16/malloc.h
 %%PIC16%%%%DATADIR%%/include/pic16/math.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f1220.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f1320.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f2220.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2221.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2320.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2321.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2331.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f242.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2420.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2431.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f2455.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f248.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f24j10.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f252.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2520.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2525.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f2550.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f258.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2585.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f25j10.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f2620.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2680.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2682.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2685.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4220.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4221.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4320.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4321.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4331.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f442.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4420.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4431.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4455.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f448.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f44j10.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f452.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4520.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4525.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4550.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f458.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4585.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f45j10.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4620.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4680.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4682.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4685.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f6520.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f6620.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f6680.h
@@ -1447,6 +1483,7 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/cotf.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/cotf.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/crtbank.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/crtcall.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/crtclear.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/crtpagesfr.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/crtstart.rel
@@ -1719,6 +1756,7 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/cotf.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/cotf.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/crtbank.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/crtcall.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/crtclear.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/crtpagesfr.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/crtstart.rel
@@ -1805,6 +1843,10 @@ bin/sdcpp
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/libm.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/libsdcc.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic12f629.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic12f635.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic12f675.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic12f683.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c432.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c433.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c554.lib
@@ -1819,6 +1861,9 @@ bin/sdcpp
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c622a.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c63a.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c65b.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c71.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c710.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c711.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c715.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c717.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c72.lib
@@ -1834,8 +1879,19 @@ bin/sdcpp
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c782.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c925.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c926.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f627.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f627a.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f628.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f628a.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f630.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f636.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f639.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f648a.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f676.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f684.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f685.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f687.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f688.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f689.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f690.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f716.lib
@@ -1847,8 +1903,11 @@ bin/sdcpp
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f767.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f77.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f777.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f785.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f818.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f819.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f84.lib
+%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f84a.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f87.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f870.lib
 %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f871.lib
@@ -1875,18 +1934,28 @@ bin/sdcpp
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f1320.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2220.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2320.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2331.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f242.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2420.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2431.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2455.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f248.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f252.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2525.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2550.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f258.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2585.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2620.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2680.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2682.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2685.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4220.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4320.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4331.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f442.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4420.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4431.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4455.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f448.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f452.lib
@@ -1894,7 +1963,11 @@ bin/sdcpp
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4525.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4550.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f458.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4585.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4620.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4680.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4682.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4685.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6680.lib
@@ -1909,27 +1982,49 @@ bin/sdcpp
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f1220.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f1320.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2220.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2221.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2320.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2321.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2331.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f242.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2420.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2431.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2455.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f248.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f24j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f252.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2525.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2550.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f258.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2585.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f25j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2620.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2680.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2682.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2685.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4220.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4221.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4320.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4321.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4331.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f442.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4420.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4431.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4455.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f448.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f44j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f452.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4525.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4550.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f458.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4585.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f45j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4620.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4680.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4682.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4685.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f6520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f6620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f6680.lib
@@ -2127,6 +2222,7 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/cotf.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/cotf.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/crtbank.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/crtcall.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/crtclear.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/crtpagesfr.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/crtstart.rel
@@ -2399,6 +2495,7 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/cotf.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/cotf.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/crtbank.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/crtcall.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/crtclear.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/crtpagesfr.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/crtstart.rel
@@ -2716,9 +2813,9 @@ bin/sdcpp
 @dirrm %%DATADIR%%/include/asm/default
 @dirrm %%DATADIR%%/include/asm
 @dirrm %%DATADIR%%/include
-@dirrm %%DATADIR%%/doc/z80
-%%UCSIM%%@dirrm %%DATADIR%%/doc/ucsim
-@dirrm %%DATADIR%%/doc/avr
-%%Z80%%@dirrm %%DATADIR%%/doc/aslink
-@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/z80
+%%UCSIM%%@dirrm %%DOCSDIR%%/ucsim
+@dirrm %%DOCSDIR%%/avr
+%%Z80%%@dirrm %%DOCSDIR%%/aslink
+@dirrm %%DOCSDIR%%