8 files changed, 237 insertions, 144 deletions

diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index 93cc82b384d3..a613147d136d 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	prc-tools
-PORTVERSION=	2.2
-PORTREVISION=	2
+PORTVERSION=	2.3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= prc-tools binutils/releases gcc/releases/gcc-2.95.3 gdb/old-releases
+MASTER_SITE_SUBDIR=	prc-tools binutils/releases \
+		gcc/releases/gcc-2.95.3 gdb/old-releases gcc/releases/gcc-3.3.1
 DISTNAME=	prc-tools-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.gz \
-		binutils-2.12.1.tar.bz2 gdb-5.0.tar.bz2 gcc-2.95.3.tar.bz2
-EXTRACT_ONLY=	binutils-2.12.1.tar.bz2 gdb-5.0.tar.bz2 gcc-2.95.3.tar.bz2
+		binutils-2.14.tar.bz2 gdb-5.3.tar.bz2 gcc-2.95.3.tar.bz2 \
+		gcc-3.3.1.tar.bz2
+EXTRACT_ONLY=	binutils-2.14.tar.bz2 gdb-5.3.tar.bz2 gcc-2.95.3.tar.bz2 \
+		gcc-3.3.1.tar.bz2
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=		Collection of tools supporting C and C++ programming for Palm OS
+COMMENT=	Collection of tools supporting C and C++ programming for Palm OS
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/autoheader:${PORTSDIR}/devel/autoconf
 
-BROKEN=		"Broken pkg-plist on 4.x, does not compile on 5.x; will be removed after Feb 2"
-
 # it is unknown whether it could actually be made to work elsewhere,
 # but right now it does not.
 ONLY_FOR_ARCHS=	i386
@@ -34,9 +34,10 @@ PREFIX=		${LOCALBASE}/pilot
 WRKSRC=		${WRKDIR}/build
 HAS_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../prc-tools-${PORTVERSION}/configure
-CONFIGURE_ARGS=	--target=m68k-palmos --enable-languages=c,c++ \
+CONFIGURE_ARGS=	--enable-targets=m68k-palmos,arm-palmos \
+		--enable-languages=c,c++ \
 		--sharedstatedir=${LOCALBASE}/palmdev --prefix=${PREFIX} \
-		--with-headers=${WRKSRC}/empty  --disable-nls
+		--with-headers=${WRKSRC}/empty --disable-nls
 CONFIGURE_ENV=	PATH=${PATH}:${PREFIX}/bin
 MAKE_ENV=	PATH=${PATH}:${PREFIX}/bin
 MAN1=		cccp.1 m68k-palmos-g++.1 m68k-palmos-gcc.1 \
@@ -48,7 +49,18 @@ MAN1=		cccp.1 m68k-palmos-g++.1 m68k-palmos-gcc.1 \
 		m68k-palmos-size.1 m68k-palmos-strings.1 \
 		m68k-palmos-strip.1 m68k-palmos-dlltool.1 \
 		m68k-palmos-readelf.1 m68k-palmos-windres.1 \
-		m68k-palmos-gdb.1
+		m68k-palmos-gdb.1 build-prc.1 palmdev-prep.1 \
+		arm-palmos-addr2line.1 arm-palmos-ar.1 \
+		arm-palmos-as.1 arm-palmos-c++filt.1 \
+		arm-palmos-dlltool.1 arm-palmos-g++.1 \
+		arm-palmos-gcc.1 arm-palmos-ld.1 \
+		arm-palmos-nlmconv.1 arm-palmos-nm.1 \
+		arm-palmos-objcopy.1 arm-palmos-objdump.1 \
+		arm-palmos-ranlib.1 arm-palmos-readelf.1 \
+		arm-palmos-size.1 arm-palmos-strings.1 \
+		arm-palmos-strip.1 arm-palmos-windres.1 \
+		cpp.1 gcov.1
+MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 .include <bsd.port.pre.mk>
 
@@ -61,20 +73,51 @@ pre-patch:
 	${MKDIR} ${WRKSRC}/empty
 
 post-patch:
-	(cd ${WRKDIR} && \
-	 ${CAT}	prc-tools-${PORTVERSION}/binutils-2.12.1.palmos.diff \
-		prc-tools-${PORTVERSION}/gdb-5.0.palmos.diff \
-		prc-tools-${PORTVERSION}/gcc-2.95.3.palmos.diff | ${PATCH} -p0)
+	@(cd ${WRKDIR} && \
+	 ${CAT}	prc-tools-${PORTVERSION}/binutils-2.14.palmos.diff \
+		prc-tools-${PORTVERSION}/gdb-5.3.palmos.diff \
+		prc-tools-${PORTVERSION}/gcc-2.95.3.palmos.diff \
+		prc-tools-${PORTVERSION}/gcc-3.3.1.palmos.diff | ${PATCH} -p0)
+	@${MV} ${WRKDIR}/gcc-2.95.3/gcc/config/i386/freebsd.h ${WRKDIR}/gcc-2.95.3/gcc/config/i386/freebsd-aout.h
+	@${MV} ${WRKDIR}/gcc-2.95.3/gcc/config/i386/freebsd-elf.h ${WRKDIR}/gcc-2.95.3/gcc/config/i386/freebsd.h
+	@${MV} ${WRKDIR}/gcc-2.95.3/libstdc++/stl/stl_bvector.h \
+		${WRKDIR}/gcc-2.95.3/libstdc++/stl/stl_bvector.h.orig
+	@${SED} -e "s,_WORD_BIT,_WORD_BIT_GCC295,g" \
+		< ${WRKDIR}/gcc-2.95.3/libstdc++/stl/stl_bvector.h.orig \
+		> ${WRKDIR}/gcc-2.95.3/libstdc++/stl/stl_bvector.h
+	@(cd ${WRKDIR}/gcc-2.95.3; \
+	 PATCHES_APPLIED="" ; \
+	 for i in ${PORTSDIR}/lang/gcc295/files/patch-*; do \
+		if ${PATCH} -p0 --forward --quiet -E < $$i; then \
+			PATCHES_APPLIED="$$PATCHES_APPLIED $$i"; \
+		else \
+			${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly."` ; \
+		fi; \
+	 done)
+	@(cd ${WRKDIR}/gcc-3.3.1; \
+	 PATCHES_APPLIED="" ; \
+	 for i in ${PORTSDIR}/lang/gcc33/files/patch-*; do \
+		if ${PATCH} -p0 --forward --quiet -E < $$i; then \
+			PATCHES_APPLIED="$$PATCHES_APPLIED $$i"; \
+		else \
+			${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly."` ; \
+		fi; \
+	 done)
+	@cd ${WRKDIR}/gcc-2.95.3 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc:strerror.c
+	@cd ${WRKDIR}/gcc-3.3.1 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc:Makefile.in
+
 
 pre-configure:
 	(cd ${WRKDIR}/prc-tools-${PORTVERSION} && \
-	 ${LN} -sf ../binutils-2.12.1 binutils; \
-	 ${LN} -sf ../gdb-5.0 gdb; \
-	 ${LN} -sf ../gcc-2.95.3 gcc)
+	 ${LN} -sf ../binutils-2.14 binutils; \
+	 ${LN} -sf ../gdb-5.3 gdb; \
+	 ${LN} -sf ../gcc-2.95.3 gcc295; \
+	 ${LN} -sf ../gcc-3.3.1 gcc; )
 
 post-install:
 	${RM} ${PREFIX}/bin/m68k-palmos-c++filt
 	${RM} ${PREFIX}/lib/libiberty.a
 	${RM} -f ${PREFIX}/m68k-palmos/sys-include/COPIED
+	${RM} -f ${PREFIX}/arm-palmos/sys-include/COPIED
 
 .include <bsd.port.post.mk>
diff --git a/palm/prc-tools/distinfo b/palm/prc-tools/distinfo
index 75cc1b208e15..d375aa2e73b0 100644
--- a/palm/prc-tools/distinfo
+++ b/palm/prc-tools/distinfo
@@ -1,4 +1,5 @@
-MD5 (prc-tools-2.2.tar.gz) = 91a9a04d2042fcf673ff212a3ffd7ab9
-MD5 (binutils-2.12.1.tar.bz2) = f67fe2e8065c5683bc34782de131f5d3
-MD5 (gdb-5.0.tar.bz2) = b2720def719fd024e380793d9084da2a
+MD5 (prc-tools-2.3.tar.gz) = 038a42a71a984fee6f906abc85a032ec
+MD5 (binutils-2.14.tar.bz2) = 2da8def15d28af3ec6af0982709ae90a
+MD5 (gdb-5.3.tar.bz2) = 70e4ade69a2dff2c7b9af9a4ef44798f
 MD5 (gcc-2.95.3.tar.bz2) = 87ee083a830683e2aaa57463940a0c3c
+MD5 (gcc-3.3.1.tar.bz2) = 1135a104e9fa36fdf7c663598fab5c40
diff --git a/palm/prc-tools/files/patch-gcc:strerror.c b/palm/prc-tools/files/patch-gcc:strerror.c
deleted file mode 100644
index e00130466ece..000000000000
--- a/palm/prc-tools/files/patch-gcc:strerror.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../gcc-2.95.3/libiberty/strerror.c-	Mon May  5 11:38:25 2003
-+++ ../gcc-2.95.3/libiberty/strerror.c	Mon May  5 11:38:48 2003
-@@ -462,8 +462,6 @@
- 
- #else
- 
--extern int sys_nerr;
--extern char *sys_errlist[];
- 
- #endif
- 
diff --git a/palm/prc-tools/files/patch-gcc:strsignal.c b/palm/prc-tools/files/patch-gcc:strsignal.c
deleted file mode 100644
index eabfc1bbcfdf..000000000000
--- a/palm/prc-tools/files/patch-gcc:strsignal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../gcc-2.95.3/libiberty/strsignal.c~	Fri May 15 23:42:42 1998
-+++ ../gcc-2.95.3/libiberty/strsignal.c	Mon May  5 14:16:36 2003
-@@ -244,7 +244,7 @@
- #else
- 
- #ifdef NSIG
--static int sys_nsig = NSIG;
-+static const int sys_nsig = NSIG;
- #else
- #ifdef _NSIG
- static int sys_nsig = _NSIG;
diff --git a/palm/prc-tools/files/patch-gdb:strerror.c b/palm/prc-tools/files/patch-gdb:strerror.c
deleted file mode 100644
index cd73e63fbef4..000000000000
--- a/palm/prc-tools/files/patch-gdb:strerror.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../gdb-5.0/libiberty/strerror.c.orig	Mon May  3 07:28:54 1999
-+++ ../gdb-5.0/libiberty/strerror.c	Mon May  5 14:27:09 2003
-@@ -462,8 +462,6 @@
- 
- #else
- 
--extern int sys_nerr;
--extern char *sys_errlist[];
- 
- #endif
- 
diff --git a/palm/prc-tools/files/post-patch-gcc:Makefile.in b/palm/prc-tools/files/post-patch-gcc:Makefile.in
new file mode 100644
index 000000000000..d499e41ef1f0
--- /dev/null
+++ b/palm/prc-tools/files/post-patch-gcc:Makefile.in
@@ -0,0 +1,11 @@
+--- gcc/Makefile.in.orig	Sat Feb  7 10:51:36 2004
++++ gcc/Makefile.in	Sat Feb  7 10:50:59 2004
+@@ -659,7 +659,7 @@
+ # -I$(@D) and -I$(srcdir)/$(@D) cause the subdirectory of the file
+ # currently being compiled, in both source trees, to be examined as well.
+ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
+-	   -I$(srcdir)/config -I$(srcdir)/../include
++	   -I$(srcdir)/config -I$(srcdir)/../include -I/usr/include
+ 
+ # Always use -I$(srcdir)/config when compiling.
+ .c.o:
diff --git a/palm/prc-tools/files/post-patch-gcc:strerror.c b/palm/prc-tools/files/post-patch-gcc:strerror.c
new file mode 100644
index 000000000000..6f1cf7acddf6
--- /dev/null
+++ b/palm/prc-tools/files/post-patch-gcc:strerror.c
@@ -0,0 +1,18 @@
+--- libiberty/strerror.c.orig2	Fri Feb  6 19:04:47 2004
++++ libiberty/strerror.c	Fri Feb  6 19:04:54 2004
+@@ -13,7 +13,6 @@
+    incompatible with our later declaration, perhaps by using const
+    attributes.  So we hide the declaration in errno.h (if any) using a
+    macro. */
+-#define sys_nerr sys_nerr__
+ #define sys_errlist sys_errlist__
+ #endif
+ 
+@@ -21,7 +20,6 @@
+ #include <errno.h>
+ 
+ #ifdef HAVE_SYS_ERRLIST
+-#undef sys_nerr
+ #undef sys_errlist
+ #endif
+ 
diff --git a/palm/prc-tools/pkg-plist b/palm/prc-tools/pkg-plist
index caadc7b72c74..bf79f3579529 100644
--- a/palm/prc-tools/pkg-plist
+++ b/palm/prc-tools/pkg-plist
@@ -1,3 +1,33 @@
+arm-palmos/bin/ar
+arm-palmos/bin/as
+arm-palmos/bin/c++
+arm-palmos/bin/g++
+arm-palmos/bin/gcc
+arm-palmos/bin/ld
+arm-palmos/bin/nm
+arm-palmos/bin/ranlib
+arm-palmos/bin/strip
+arm-palmos/include/errno.h
+arm-palmos/include/malloc.h
+arm-palmos/include/setjmp.h
+arm-palmos/include/stdio.h
+arm-palmos/include/sys/types.h
+arm-palmos/lib/ldscripts/armelf.x
+arm-palmos/lib/ldscripts/armelf.xbn
+arm-palmos/lib/ldscripts/armelf.xc
+arm-palmos/lib/ldscripts/armelf.xn
+arm-palmos/lib/ldscripts/armelf.xr
+arm-palmos/lib/ldscripts/armelf.xs
+arm-palmos/lib/ldscripts/armelf.xsc
+arm-palmos/lib/ldscripts/armelf.xu
+arm-palmos/lib/ldscripts/armpalmos.x
+arm-palmos/lib/ldscripts/armpalmos.xbn
+arm-palmos/lib/ldscripts/armpalmos.xc
+arm-palmos/lib/ldscripts/armpalmos.xn
+arm-palmos/lib/ldscripts/armpalmos.xr
+arm-palmos/lib/ldscripts/armpalmos.xu
+arm-palmos/lib/libc.a
+arm-palmos/lib/libstdc++.a
 m68k-palmos/bin/nm
 m68k-palmos/bin/strip
 m68k-palmos/bin/ar
@@ -29,15 +59,51 @@ m68k-palmos/lib/libm.a
 m68k-palmos/lib/text_64k
 m68k-palmos/lib/text_64k_palmos3
 m68k-palmos/include/sys/types.h
-m68k-palmos/include/ctype.h
 m68k-palmos/include/errno.h
 m68k-palmos/include/malloc.h
 m68k-palmos/include/setjmp.h
 m68k-palmos/include/stdio.h
-m68k-palmos/include/string.h
 m68k-palmos/include/stdlib.h
 m68k-palmos/include/mathf.h
 m68k-palmos/include/math.h
+lib/gcc-lib/arm-palmos/3.3.1/cc1
+lib/gcc-lib/arm-palmos/3.3.1/cc1plus
+lib/gcc-lib/arm-palmos/3.3.1/collect2
+lib/gcc-lib/arm-palmos/3.3.1/crtbegin.o
+lib/gcc-lib/arm-palmos/3.3.1/crtend.o
+lib/gcc-lib/arm-palmos/3.3.1/crti.o
+lib/gcc-lib/arm-palmos/3.3.1/crtn.o
+lib/gcc-lib/arm-palmos/3.3.1/include/README
+lib/gcc-lib/arm-palmos/3.3.1/include/float.h
+lib/gcc-lib/arm-palmos/3.3.1/include/iso646.h
+lib/gcc-lib/arm-palmos/3.3.1/include/limits.h
+lib/gcc-lib/arm-palmos/3.3.1/include/stdarg.h
+lib/gcc-lib/arm-palmos/3.3.1/include/stdbool.h
+lib/gcc-lib/arm-palmos/3.3.1/include/stddef.h
+lib/gcc-lib/arm-palmos/3.3.1/include/syslimits.h
+lib/gcc-lib/arm-palmos/3.3.1/include/unwind.h
+lib/gcc-lib/arm-palmos/3.3.1/include/varargs.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/fixinc.sh
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/fixincl
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/gsyslimits.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/README
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/float.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/iso646.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/limits.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stdarg.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stdbool.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stddef.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/unwind.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/varargs.h
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/mkheaders
+lib/gcc-lib/arm-palmos/3.3.1/install-tools/mkheaders.conf
+lib/gcc-lib/arm-palmos/3.3.1/libgcc.a
+lib/gcc-lib/arm-palmos/3.3.1/specs
+lib/gcc-lib/arm-palmos/3.3.1/thumb/crtbegin.o
+lib/gcc-lib/arm-palmos/3.3.1/thumb/crtend.o
+lib/gcc-lib/arm-palmos/3.3.1/thumb/crti.o
+lib/gcc-lib/arm-palmos/3.3.1/thumb/crtn.o
+lib/gcc-lib/arm-palmos/3.3.1/thumb/libgcc.a
 lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/syslimits.h
 lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdarg.h
 lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stddef.h
@@ -79,11 +145,27 @@ lib/gcc-lib/m68k-palmos/2.95.3-kgpd/specs
 lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cpp0
 lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp/libgcc.a
 lib/gcc-lib/m68k-palmos/2.95.3-kgpd/libgcc.a
-lib/libbfd.la
-lib/libbfd.a
-lib/libopcodes.la
-lib/libopcodes.a
 lib/libmmalloc.a
+bin/arm-palmos-addr2line
+bin/arm-palmos-ar
+bin/arm-palmos-as
+bin/arm-palmos-c++
+bin/arm-palmos-c++filt
+bin/arm-palmos-cpp
+bin/arm-palmos-g++
+bin/arm-palmos-gcc
+bin/arm-palmos-gcc-3.3.1
+bin/arm-palmos-gccbug
+bin/arm-palmos-gcov
+bin/arm-palmos-ld
+bin/arm-palmos-nm
+bin/arm-palmos-objcopy
+bin/arm-palmos-objdump
+bin/arm-palmos-ranlib
+bin/arm-palmos-readelf
+bin/arm-palmos-size
+bin/arm-palmos-strings
+bin/arm-palmos-strip
 bin/build-prc
 bin/m68k-palmos-size
 bin/m68k-palmos-objdump
@@ -96,7 +178,6 @@ bin/m68k-palmos-readelf
 bin/m68k-palmos-nm
 bin/m68k-palmos-strip
 bin/m68k-palmos-as
-bin/m68k-palmos-gasp
 bin/m68k-palmos-ld
 bin/m68k-palmos-gdb
 bin/palmdev-prep
@@ -107,86 +188,67 @@ bin/m68k-palmos-c++
 bin/m68k-palmos-g++
 bin/m68k-palmos-cpp
 bin/m68k-palmos-gcc
-include/bfd.h
-include/ansidecl.h
-include/symcat.h
-include/bfdlink.h
+bin/m68k-palmos-trapfilt
 info/dir
 info/bfd.info
 info/bfd.info-1
-info/bfd.info-2
-info/bfd.info-3
-info/bfd.info-4
-info/bfd.info-5
-info/bfd.info-6
-info/bfd.info-7
-info/bfd.info-8
-info/bfd.info-9
 info/prc-tools.info
 info/binutils.info
-info/binutils.info-1
-info/binutils.info-2
-info/binutils.info-3
 info/standards.info
 info/configure.info
 info/configure.info-1
 info/configure.info-2
 info/configure.info-3
 info/as.info
-info/as.info-1
-info/as.info-2
-info/as.info-3
-info/as.info-4
-info/as.info-5
-info/as.info-6
-info/as.info-7
-info/as.info-8
-info/as.info-9
-info/as.info-10
-info/gasp.info
 info/ld.info
-info/ld.info-1
-info/ld.info-2
-info/ld.info-3
-info/ld.info-4
-info/ld.info-5
-info/ld.info-6
 info/cpp.info
-info/cpp.info-1
-info/cpp.info-2
-info/cpp.info-3
 info/gcc.info
-info/gcc.info-1
-info/gcc.info-10
-info/gcc.info-11
-info/gcc.info-12
-info/gcc.info-13
-info/gcc.info-14
-info/gcc.info-15
-info/gcc.info-16
-info/gcc.info-17
-info/gcc.info-18
-info/gcc.info-19
-info/gcc.info-2
-info/gcc.info-20
-info/gcc.info-21
-info/gcc.info-22
-info/gcc.info-23
-info/gcc.info-24
-info/gcc.info-25
-info/gcc.info-26
-info/gcc.info-27
-info/gcc.info-28
-info/gcc.info-29
-info/gcc.info-3
-info/gcc.info-30
-info/gcc.info-4
-info/gcc.info-5
-info/gcc.info-6
-info/gcc.info-7
-info/gcc.info-8
-info/gcc.info-9
-@unexec rmdir %D/m68k-palmos/sys-include 2>/dev/null || true
+info/gccint.info
+info/gdb.info
+info/gdb.info-1
+info/gdb.info-10
+info/gdb.info-11
+info/gdb.info-12
+info/gdb.info-13
+info/gdb.info-14
+info/gdb.info-15
+info/gdb.info-2
+info/gdb.info-3
+info/gdb.info-4
+info/gdb.info-5
+info/gdb.info-6
+info/gdb.info-7
+info/gdb.info-8
+info/gdb.info-9
+info/gdbint.info
+info/gdbint.info-1
+info/gdbint.info-2
+info/gdbint.info-3
+info/gdbint.info-4
+info/gdbint.info-5
+info/gdbint.info-6
+info/gdbint.info-7
+info/mmalloc.info
+info/stabs.info
+info/stabs.info-1
+info/stabs.info-2
+info/stabs.info-3
+info/stabs.info-4
+share/prc-tools/include/EntryPoints.h
+share/prc-tools/include/NewTypes.h
+share/prc-tools/include/PalmOS.h
+share/prc-tools/include/Pilot.h
+share/prc-tools/include/Standalone.h
+share/prc-tools/include/ctype.h
+share/prc-tools/include/stdint.h
+share/prc-tools/include/stdlib.h
+share/prc-tools/include/string.h
+@dirrm arm-palmos/bin
+@dirrm arm-palmos/include/sys
+@dirrm arm-palmos/include
+@dirrm arm-palmos/lib/ldscripts
+@dirrm arm-palmos/lib
+@dirrm arm-palmos
 @dirrm m68k-palmos/lib/mown-gp
 @dirrm m68k-palmos/lib/ldscripts
 @dirrm m68k-palmos/lib
@@ -194,25 +256,16 @@ info/gcc.info-9
 @dirrm m68k-palmos/include
 @dirrm m68k-palmos/bin
 @dirrm m68k-palmos
+@dirrm lib/gcc-lib/arm-palmos/3.3.1/include
+@dirrm lib/gcc-lib/arm-palmos/3.3.1/install-tools/include
+@dirrm lib/gcc-lib/arm-palmos/3.3.1/install-tools
+@dirrm lib/gcc-lib/arm-palmos/3.3.1/thumb
+@dirrm lib/gcc-lib/arm-palmos/3.3.1
+@dirrm lib/gcc-lib/arm-palmos
 @dirrm lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp
 @dirrm lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include
 @dirrm lib/gcc-lib/m68k-palmos/2.95.3-kgpd
 @dirrm lib/gcc-lib/m68k-palmos
 @dirrm lib/gcc-lib
-@unexec rmdir %D/libexec 2>/dev/null || true
-@unexec rmdir %D/libdata 2>/dev/null || true
-@unexec rmdir %D/lib 2>/dev/null || true
-@unexec rmdir %D/info 2>/dev/null || true
-@unexec rmdir %D/include 2>/dev/null || true
-@unexec rmdir %D/bin 2>/dev/null || true
-@unexec rmdir %D/man/man1 2>/dev/null || true
-@unexec rmdir %D/man/man2 2>/dev/null || true
-@unexec rmdir %D/man/man3 2>/dev/null || true
-@unexec rmdir %D/man/man4 2>/dev/null || true
-@unexec rmdir %D/man/man5 2>/dev/null || true
-@unexec rmdir %D/man/man6 2>/dev/null || true
-@unexec rmdir %D/man/man7 2>/dev/null || true
-@unexec rmdir %D/man/man8 2>/dev/null || true
-@unexec rmdir %D/man/man9 2>/dev/null || true
-@unexec rmdir %D/man/mann 2>/dev/null || true
-@unexec rmdir %D/man 2>/dev/null || true
+@dirrm share/prc-tools/include
+@dirrm share/prc-tools