- Update to 3.1.2.2012.01.22

- Remove AVR and XA51 targets (unsupported)
- Fix build on sparc64

PR:		ports/164373
Submitted by:	Tijl Coosemans <tijl@coosemans.org> maintainer
Approved by:	gabor (mentor)

6 files changed, 132 insertions, 99 deletions

diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index 0a753bed3e94..137a045924fb 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -6,15 +6,19 @@
 #
 
 PORTNAME=	sdcc
-PORTVERSION=	3.0.2.2011.03.21
+PORTVERSION=	3.1.2.2012.01.22
 CATEGORIES=	lang
 MASTER_SITES=	SF/sdcc/snapshot_builds/sdcc-src/ \
 		http://tijl.fastmail.fm/mirror/
-DISTNAME=	${PORTNAME}-src-20110321-6331
+DISTNAME=	${PORTNAME}-src-20120122-7247
 
 MAINTAINER=	tijl@coosemans.org
 COMMENT=	Small Device C Compiler
 
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/adjacency_list.hpp:${PORTSDIR}/devel/boost-libs
+
 WRKSRC=		${WRKDIR}/sdcc
 
 GNU_CONFIGURE=	yes
@@ -23,27 +27,21 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 
 OPTIONS=	MCS51   "Intel 8051 port" on \
-		Z80     "Zilog Z80 port" on \
-		AVR     "AVR port" on \
+		Z80	"Zilog Z80/Z180, Rabbit 2000 port" on \
 		DS390   "Maxim 80DS390/DS400 port" on \
-		PIC     "Microchip PIC16 series port" on \
+		PIC14	"Microchip PIC16 series port" on \
 		PIC16   "Microchip PIC18 series port" on \
-		XA51    "Philips XA51 port" on \
 		HC08    "Motorola 68HC08 port" on \
 		DEVLIB  "Device libraries" on \
-		UCSIM   "The ucSim simulator" on \
-		PACKIHX "A tool to pack (compress) Intel hex files" on
+		UCSIM	"The ucSim simulator" on
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--docdir=${DOCSDIR}
+CONFIGURE_ARGS=	--disable-avr --docdir=${DOCSDIR} --enable-new-pics
+CONFIGURE_ENV=	ARCH=""
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
 .if defined(WITHOUT_MCS51) && defined(WITHOUT_DS390)
 CONFIGURE_ARGS+=	--disable-51
 PLIST_SUB+=		MCS51DS390="@comment "
@@ -60,20 +58,13 @@ PLIST_SUB+=		MCS51=""
 .endif
 
 .if defined(WITHOUT_Z80)
-CONFIGURE_ARGS+=	--disable-gbz80-port --disable-z80-port --disable-z80
+CONFIGURE_ARGS+=	--disable-gbz80-port --disable-r2k-port \
+			--disable-z180-port --disable-z80-port --disable-z80
 PLIST_SUB+=		Z80="@comment "
 .else
 PLIST_SUB+=		Z80=""
 .endif
 
-.if defined(WITHOUT_AVR)
-CONFIGURE_ARGS+=	--disable-avr
-PLIST_SUB+=		AVR="@comment "
-.else
-CONFIGURE_ARGS+=	--enable-avr-port
-PLIST_SUB+=		AVR=""
-.endif
-
 .if defined(WITHOUT_DS390)
 CONFIGURE_ARGS+=	--disable-ds390-port --disable-ds400-port
 PLIST_SUB+=		DS390="@comment "
@@ -81,11 +72,12 @@ PLIST_SUB+=		DS390="@comment "
 PLIST_SUB+=		DS390=""
 .endif
 
-.if defined(WITHOUT_PIC)
+.if defined(WITHOUT_PIC14)
 CONFIGURE_ARGS+=	--disable-pic14-port
 PLIST_SUB+=		PIC14="@comment "
 .else
-BUILD_DEPENDS+=		gpasm:${PORTSDIR}/devel/gputils
+BUILD_DEPENDS+=		gputils>=0.14.1:${PORTSDIR}/devel/gputils
+RUN_DEPENDS+=		gputils>=0.14.1:${PORTSDIR}/devel/gputils
 PLIST_SUB+=		PIC14=""
 .endif
 
@@ -93,17 +85,11 @@ PLIST_SUB+=		PIC14=""
 CONFIGURE_ARGS+=	--disable-pic16-port
 PLIST_SUB+=		PIC16="@comment "
 .else
-BUILD_DEPENDS+=		gpasm:${PORTSDIR}/devel/gputils
+BUILD_DEPENDS+=		gputils>=0.14.1:${PORTSDIR}/devel/gputils
+RUN_DEPENDS+=		gputils>=0.14.1:${PORTSDIR}/devel/gputils
 PLIST_SUB+=		PIC16=""
 .endif
 
-.if defined(WITHOUT_XA51)
-PLIST_SUB+=		XA51="@comment "
-.else
-CONFIGURE_ARGS+=	--enable-xa51-port --enable-xa
-PLIST_SUB+=		XA51=""
-.endif
-
 .if defined(WITHOUT_HC08)
 CONFIGURE_ARGS+=	--disable-hc08-port --disable-hc08
 PLIST_SUB+=		HC08="@comment "
@@ -127,18 +113,7 @@ LIBTOOLFILES=		sim/ucsim/configure
 PLIST_SUB+=		UCSIM=""
 .endif
 
-.if defined(WITHOUT_PACKIHX)
-CONFIGURE_ARGS+=	--disable-packihx
-PLIST_SUB+=		PACKIHX="@comment "
-.else
-PLIST_SUB+=		PACKIHX=""
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} 's,ARCH,PICARCH,g' \
-		${WRKSRC}/device/lib/pic14/Makefile.common.in \
-		${WRKSRC}/device/lib/pic14/Makefile.rules \
-		${WRKSRC}/device/lib/pic16/configure
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} 's, [a-z-]*doc,,' \
 		${WRKSRC}/Makefile.in \
diff --git a/lang/sdcc-devel/distinfo b/lang/sdcc-devel/distinfo
index e5091bc67b83..757162379d25 100644
--- a/lang/sdcc-devel/distinfo
+++ b/lang/sdcc-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sdcc-src-20110321-6331.tar.bz2) = e079f871944e50cf40291d57c7c34320fd2afb2cafbf979c4235269ef3cee540
-SIZE (sdcc-src-20110321-6331.tar.bz2) = 3986228
+SHA256 (sdcc-src-20120122-7247.tar.bz2) = 875658ef83b8845cd71d11f3ddba7ee9ef088e31288f3ce309a75eb54fee19f7
+SIZE (sdcc-src-20120122-7247.tar.bz2) = 4244599
diff --git a/lang/sdcc-devel/files/patch-device-lib-Makefile.in b/lang/sdcc-devel/files/patch-device-lib-Makefile.in
index 05b5976df5b5..13563604374a 100644
--- a/lang/sdcc-devel/files/patch-device-lib-Makefile.in
+++ b/lang/sdcc-devel/files/patch-device-lib-Makefile.in
@@ -1,15 +1,15 @@
 --- device/lib/Makefile.in.orig
 +++ device/lib/Makefile.in
-@@ -422,25 +422,6 @@
+@@ -443,25 +443,6 @@
  # ---------------------------------------------------
  install: all installdirs
  	[ ! -d "$(BUILDDIR)" ] || $(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
 -	$(CP_U) -r $(MODELS) $(srcdir)/mcs51 $(srcdir)/ds390 $(srcdir)/ds400 \
--	                     $(srcdir)/gbz80 $(srcdir)/z80 $(srcdir)/hc08 \
+-	                     $(srcdir)/z80 $(srcdir)/z180 $(srcdir)/r2k $(srcdir)/gbz80 $(srcdir)/hc08 \
 -	                     $(srcdir)/pic14 $(srcdir)/pic16 $(srcdir)/*.c $(sdcc_libdir)/src
--	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 gbz80 z80 hc08 $(sdcc_libdir)/src
+-	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 r2k gbz80 hc08 $(sdcc_libdir)/src
 -
--	for src in $(MODELS) ds390 ds400 gbz80 z80 hc08 pic14 pic16; do \
+-	for src in $(MODELS) ds390 ds400 z80 z180 r2k gbz80 hc08 pic14 pic16; do \
 -	  find $(sdcc_libdir)/src/$$src -depth \
 -	    \( -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 'autom4te.cache' -o \
@@ -26,7 +26,7 @@
  
  # Deleting all the installed files
  # --------------------------------
-@@ -460,13 +441,7 @@
+@@ -481,13 +462,7 @@
  # Creating installation directories
  # ---------------------------------
  installdirs:
diff --git a/lang/sdcc-devel/files/patch-sdas-linksrc-Makefile.in b/lang/sdcc-devel/files/patch-sdas-linksrc-Makefile.in
deleted file mode 100644
index 346c16610028..000000000000
--- a/lang/sdcc-devel/files/patch-sdas-linksrc-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- sdas/linksrc/Makefile.in.orig	2010-04-20 19:07:51.000000000 +0200
-+++ sdas/linksrc/Makefile.in	2010-04-20 19:08:24.000000000 +0200
-@@ -63,7 +63,7 @@
- 
- # Compiling entire program or any subproject
- # ------------------------------------------
--all: sdcc-ld8051 sdcc-ldz80 sdcc-ldgb sdcc-ld6808
-+all: sdcc-ld8051
- 
- sdcc-ld8051: checkconf $(ASLINK)
- 
-@@ -82,7 +82,7 @@
- # Compiling and installing everything and running test
- # ----------------------------------------------------
- install: all installdirs
--	for ld in $(ASLINK) $(top_builddir)/bin/sdldz80$(EXEEXT) $(top_builddir)/bin/sdldgb$(EXEEXT) $(top_builddir)/bin/sdld6808$(EXEEXT); \
-+	for ld in $(ASLINK); \
- 	do \
- 	  $(INSTALL) $$ld `echo $(DESTDIR)$(bindir)/\`basename $$ld\` | sed '$(transform)'`; \
- 	  $(STRIP) `echo $(DESTDIR)$(bindir)/\`basename $$ld\` | sed '$(transform)'`; \
diff --git a/lang/sdcc-devel/pkg-descr b/lang/sdcc-devel/pkg-descr
index cdef85433509..adf4934c0ee2 100644
--- a/lang/sdcc-devel/pkg-descr
+++ b/lang/sdcc-devel/pkg-descr
@@ -1,9 +1,6 @@
-SDCC is a Freeware, retargettable, optimizing ANSI-C compiler that
-targets the Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola
-68HC08 based MCUs. Work is in progress on supporting the Microchip
-PIC16 and PIC18 series.
-
-SDCC also comes with the source level debugger SDCDB, using the
-current version of Daniel's s51 simulator.
+SDCC is a retargettable, optimizing ANSI C compiler that targets the
+Intel 8051, Maxim 80DS390, Zilog Z80, Z180, Rabbit 2000 and the Motorola
+68HC08 based MCUs. Work is in progress on supporting the Microchip PIC16
+and PIC18 series.
 
 WWW: http://sdcc.sourceforge.net/
diff --git a/lang/sdcc-devel/pkg-plist b/lang/sdcc-devel/pkg-plist
index 3bc8956811bd..1b01e80cf255 100644
--- a/lang/sdcc-devel/pkg-plist
+++ b/lang/sdcc-devel/pkg-plist
@@ -1,12 +1,11 @@
 bin/as2gbmap
-bin/asranlib
 bin/makebin
-%%PACKIHX%%bin/packihx
+bin/packihx
 %%UCSIM%%%%MCS51DS390%%bin/s51
-%%UCSIM%%%%AVR%%bin/savr
 %%HC08%%bin/sdas6808
 %%MCS51DS390%%bin/sdas8051
 %%Z80%%bin/sdasgb
+%%Z80%%bin/sdasrab
 %%Z80%%bin/sdasz80
 bin/sdcc
 bin/sdcclib
@@ -15,18 +14,15 @@ bin/sdcclib
 %%UCSIM%%%%MCS51%%bin/sdcdbsrc.el
 bin/sdcpp
 bin/sdld
+bin/sdld6808
+bin/sdldgb
+bin/sdldz80
+bin/sdranlib
 %%UCSIM%%%%HC08%%bin/shc08
-%%UCSIM%%%%XA51%%bin/sxa
 %%UCSIM%%%%Z80%%bin/sz80
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/TININative.txt
-%%PORTDOCS%%%%DOCSDIR%%/avr/avr_design.txt
-%%PORTDOCS%%%%DOCSDIR%%/builtins.txt
-%%PORTDOCS%%%%DOCSDIR%%/choices.txt
-%%PORTDOCS%%%%DOCSDIR%%/libdoc.txt
-%%PORTDOCS%%%%DOCSDIR%%/macro-sys-design.txt
-%%PORTDOCS%%%%DOCSDIR%%/random-notes.txt
 %%UCSIM%%%%PORTDOCS%%%%DOCSDIR%%/ucsim/UCsim.jpg
 %%UCSIM%%%%PORTDOCS%%%%DOCSDIR%%/ucsim/analyzer.html
 %%UCSIM%%%%PORTDOCS%%%%DOCSDIR%%/ucsim/burst.gif
@@ -73,15 +69,14 @@ bin/sdld
 %%UCSIM%%%%PORTDOCS%%%%DOCSDIR%%/ucsim/timers.html
 %%UCSIM%%%%PORTDOCS%%%%DOCSDIR%%/ucsim/wins.gif
 %%UCSIM%%%%PORTDOCS%%%%DOCSDIR%%/ucsim/wins.html
-%%PORTDOCS%%%%DOCSDIR%%/z80/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/z80/README
-%%PORTDOCS%%%%DOCSDIR%%/z80/combined_i186_z80_design.tex
 %%DATADIR%%/include/asm/default/features.h
 %%DATADIR%%/include/asm/ds390/features.h
 %%DATADIR%%/include/asm/gbz80/features.h
 %%DATADIR%%/include/asm/mcs51/features.h
 %%DATADIR%%/include/asm/pic14/features.h
 %%DATADIR%%/include/asm/pic16/features.h
+%%DATADIR%%/include/asm/r2k/features.h
+%%DATADIR%%/include/asm/z180/features.h
 %%DATADIR%%/include/asm/z80/features.h
 %%DATADIR%%/include/assert.h
 %%DATADIR%%/include/ctype.h
@@ -95,6 +90,7 @@ bin/sdld
 %%HC08%%%%DATADIR%%/include/hc08/mc68hc908jb8.h
 %%HC08%%%%DATADIR%%/include/hc08/mc68hc908jkjl.h
 %%HC08%%%%DATADIR%%/include/hc08/mc68hc908qy.h
+%%DATADIR%%/include/iso646.h
 %%DATADIR%%/include/limits.h
 %%DATADIR%%/include/malloc.h
 %%DATADIR%%/include/math.h
@@ -144,6 +140,7 @@ bin/sdld
 %%MCS51%%%%DATADIR%%/include/mcs51/cc1110.h
 %%MCS51%%%%DATADIR%%/include/mcs51/cc2430.h
 %%MCS51%%%%DATADIR%%/include/mcs51/cc2510fx.h
+%%MCS51%%%%DATADIR%%/include/mcs51/cc2530.h
 %%MCS51%%%%DATADIR%%/include/mcs51/compiler.h
 %%MCS51%%%%DATADIR%%/include/mcs51/lint.h
 %%MCS51%%%%DATADIR%%/include/mcs51/mcs51reg.h
@@ -186,6 +183,7 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/include/pic16/limits.h
 %%PIC16%%%%DATADIR%%/include/pic16/malloc.h
 %%PIC16%%%%DATADIR%%/include/pic16/math.h
+%%PIC16%%%%DATADIR%%/include/pic16/p18fxxx.inc
 %%PIC16%%%%DATADIR%%/include/pic16/pic16devices.txt
 %%PIC16%%%%DATADIR%%/include/pic16/pic18fregs.h
 %%PIC16%%%%DATADIR%%/include/pic16/sdcc-lib.h
@@ -205,13 +203,12 @@ bin/sdld
 %%DATADIR%%/include/stdint.h
 %%DATADIR%%/include/stdio.h
 %%DATADIR%%/include/stdlib.h
+%%DATADIR%%/include/stdnoreturn.h
 %%DATADIR%%/include/string.h
 %%DATADIR%%/include/time.h
 %%DATADIR%%/include/tinibios.h
 %%DATADIR%%/include/typeof.h
-%%XA51%%%%DATADIR%%/include/xa51/80c51xa.h
-%%Z80%%%%DATADIR%%/include/z80/types.h
-%%Z80%%%%DATADIR%%/include/z80/z180.h
+%%Z80%%%%DATADIR%%/include/z180/z180.h
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/libds390.lib
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/libfloat.lib
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/libint.lib
@@ -236,7 +233,9 @@ bin/sdld
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/libsdcc.lib
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/mcs51.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/lib/pic14/libm.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/lib/pic14/libme.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/lib/pic14/libsdcc.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/lib/pic14/libsdcce.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/crt0.o
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/crt0i.o
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/crt0iz.o
@@ -255,6 +254,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2321.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2331.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f23k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f23k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2410.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f242.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2420.lib
@@ -267,6 +267,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f24j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f24j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f24k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f24k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2510.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2515.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f252.lib
@@ -280,6 +281,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f25j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f25j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f25k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f25k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2610.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2680.lib
@@ -287,12 +289,14 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2685.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f26j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f26k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f26k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4220.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4221.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4320.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4321.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4331.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f43k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f43k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4410.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f442.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4420.lib
@@ -305,6 +309,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f44j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f44j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f44k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f44k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4510.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4515.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f452.lib
@@ -318,6 +323,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f45j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f45j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f45k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f45k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4610.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4680.lib
@@ -325,6 +331,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4685.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f46j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f46k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f46k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6527.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6585.lib
@@ -362,6 +369,8 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f97j60.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libm18f.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libsdcc.lib
+%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/r2k/crt0.rel
+%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/r2k/r2k.lib
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/libfloat.lib
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/libint.lib
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/liblong.lib
@@ -372,8 +381,12 @@ bin/sdld
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/liblong.lib
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/libsdcc.lib
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/mcs51.lib
+%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z180/crt0.rel
+%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z180/z180.lib
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/crt0.rel
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/z80.lib
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic12f1822.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic12f1840.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic12f629.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic12f635.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic12f675.h
@@ -411,6 +424,26 @@ bin/sdld
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16c782.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16c925.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16c926.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1455.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1458.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1459.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1507.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1782.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1783.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1823.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1824.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1825.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1826.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1827.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1828.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1829.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1847.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1933.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1934.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1936.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1937.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1938.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f1939.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f616.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f627.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f627a.h
@@ -461,6 +494,11 @@ bin/sdld
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f916.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16f917.h
 %%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16hv616.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16lf1902.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16lf1903.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16lf1904.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16lf1906.h
+%%PIC14%%%%DATADIR%%/non-free/include/pic14/pic16lf1907.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f1220.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f1320.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f13k50.h
@@ -471,6 +509,7 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2321.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2331.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f23k20.h
+%%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f23k22.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2410.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f242.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2420.h
@@ -483,6 +522,7 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f24j10.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f24j50.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f24k20.h
+%%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f24k22.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2510.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2515.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f252.h
@@ -496,6 +536,7 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f25j10.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f25j50.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f25k20.h
+%%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f25k22.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2610.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2620.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2680.h
@@ -503,12 +544,14 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f2685.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f26j50.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f26k20.h
+%%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f26k22.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4220.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4221.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4320.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4321.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4331.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f43k20.h
+%%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f43k22.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4410.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f442.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4420.h
@@ -521,6 +564,7 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f44j10.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f44j50.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f44k20.h
+%%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f44k22.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4510.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4515.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f452.h
@@ -534,6 +578,7 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f45j10.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f45j50.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f45k20.h
+%%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f45k22.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4610.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4620.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4680.h
@@ -541,6 +586,7 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f4685.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f46j50.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f46k20.h
+%%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f46k22.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f6520.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f6527.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f6585.h
@@ -577,6 +623,8 @@ bin/sdld
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f96j65.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18f97j60.h
 %%PIC16%%%%DATADIR%%/non-free/include/pic16/pic18fam.h
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic12f1822.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic12f1840.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic12f629.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic12f635.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic12f675.lib
@@ -613,6 +661,26 @@ bin/sdld
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16c782.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16c925.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16c926.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1455.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1458.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1459.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1507.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1782.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1783.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1823.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1824.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1825.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1826.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1827.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1828.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1829.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1847.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1933.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1934.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1936.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1937.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1938.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f1939.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f616.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f627.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f627a.lib
@@ -663,6 +731,11 @@ bin/sdld
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f916.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16f917.lib
 %%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16hv616.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16lf1902.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16lf1903.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16lf1904.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16lf1906.lib
+%%DEVLIB%%%%PIC14%%%%DATADIR%%/non-free/lib/pic14/pic16lf1907.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f1220.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f1320.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f13k50.lib
@@ -673,6 +746,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2321.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2331.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f23k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f23k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2410.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f242.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2420.lib
@@ -685,6 +759,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f24j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f24j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f24k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f24k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2510.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2515.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f252.lib
@@ -698,6 +773,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f25j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f25j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f25k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f25k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2610.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2680.lib
@@ -705,12 +781,14 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f2685.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f26j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f26k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f26k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4220.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4221.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4320.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4321.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4331.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f43k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f43k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4410.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f442.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4420.lib
@@ -723,6 +801,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f44j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f44j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f44k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f44k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4510.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4515.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f452.lib
@@ -736,6 +815,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f45j10.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f45j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f45k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f45k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4610.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4680.lib
@@ -743,6 +823,7 @@ bin/sdld
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f4685.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f46j50.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f46k20.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f46k22.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f6520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f6527.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/non-free/lib/pic16/libdev18f6585.lib
@@ -789,8 +870,10 @@ bin/sdld
 @dirrm %%DATADIR%%/non-free/include
 @dirrm %%DATADIR%%/non-free
 %%DEVLIB%%%%Z80%%@dirrm %%DATADIR%%/lib/z80
+%%DEVLIB%%%%Z80%%@dirrm %%DATADIR%%/lib/z180
 %%DEVLIB%%%%MCS51%%@dirrm %%DATADIR%%/lib/small-stack-auto
 %%DEVLIB%%%%MCS51%%@dirrm %%DATADIR%%/lib/small
+%%DEVLIB%%%%Z80%%@dirrm %%DATADIR%%/lib/r2k
 %%DEVLIB%%%%PIC16%%@dirrm %%DATADIR%%/lib/pic16
 %%DEVLIB%%%%PIC14%%@dirrm %%DATADIR%%/lib/pic14
 %%DEVLIB%%%%MCS51%%@dirrm %%DATADIR%%/lib/medium
@@ -801,10 +884,8 @@ bin/sdld
 %%DEVLIB%%%%DS390%%@dirrm %%DATADIR%%/lib/ds390
 %%DEVLIB%%@exec mkdir -p %D/%%DATADIR%%/lib
 %%DEVLIB%%@dirrm %%DATADIR%%/lib
-@exec mkdir -p %D/%%DATADIR%%/include/z80
-@dirrm %%DATADIR%%/include/z80
-@exec mkdir -p %D/%%DATADIR%%/include/xa51
-@dirrm %%DATADIR%%/include/xa51
+@exec mkdir -p %D/%%DATADIR%%/include/z180
+@dirrm %%DATADIR%%/include/z180
 @exec mkdir -p %D/%%DATADIR%%/include/pic16
 @dirrm %%DATADIR%%/include/pic16
 @exec mkdir -p %D/%%DATADIR%%/include/pic14
@@ -818,6 +899,8 @@ bin/sdld
 @exec mkdir -p %D/%%DATADIR%%/include/ds390
 @dirrm %%DATADIR%%/include/ds390
 @dirrm %%DATADIR%%/include/asm/z80
+@dirrm %%DATADIR%%/include/asm/z180
+@dirrm %%DATADIR%%/include/asm/r2k
 @dirrm %%DATADIR%%/include/asm/pic16
 @dirrm %%DATADIR%%/include/asm/pic14
 @dirrm %%DATADIR%%/include/asm/mcs51
@@ -827,7 +910,5 @@ bin/sdld
 @dirrm %%DATADIR%%/include/asm
 @dirrm %%DATADIR%%/include
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/z80
 %%UCSIM%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/ucsim
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/avr
 %%PORTDOCS%%@dirrm %%DOCSDIR%%