# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	src.diff
#	gnu/usr.bin/cc/Makefile.ver
#	gnu/usr.bin/cc/cc_tools/Makefile.dep
#	gnu/usr.bin/cc/cc_tools/freebsd.opt
#	gnu/usr.bin/cc/cc_tools/i386-freebsd.opt
#	gnu/usr.bin/cc/cc_tools/size-host.h
#	gnu/usr.bin/cc/libcpp
#	gnu/usr.bin/cc/libcpp/Makefile
#	gnu/usr.bin/cc/libcpp/config.h
#	gnu/usr.bin/cc/libiberty
#	gnu/usr.bin/cc/libiberty/Makefile
#	gnu/usr.bin/cc/libiberty/config.h
#	src.diff
#
echo x - src.diff
sed 's/^X//' >src.diff << 'END-of-src.diff'
XIndex: Makefile.inc1
X===================================================================
XRCS file: /usr/download/ncvs2/src/Makefile.inc1,v
Xretrieving revision 1.570
Xdiff -u -r1.570 Makefile.inc1
X--- Makefile.inc1	9 Mar 2007 12:11:56 -0000	1.570
X+++ Makefile.inc1	2 Apr 2007 14:55:09 -0000
X@@ -988,21 +988,31 @@
X #
X libraries:
X 	cd ${.CURDIR}; \
X+	    ${MAKE} -f Makefile.inc1 _prereq_libs; \
X 	    ${MAKE} -f Makefile.inc1 _startup_libs; \
X 	    ${MAKE} -f Makefile.inc1 _prebuild_libs; \
X 	    ${MAKE} -f Makefile.inc1 _generic_libs;
X 
X+#
X+# static libgcc.a prerequisite for shared libc
X+#
X+_prereq_libs= gnu/lib/libgcc
X+
X # These dependencies are not automatically generated:
X #
X-# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all
X-# shared libraries for ELF.
X+# gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before
X+# all shared libraries for ELF.
X #
X-_startup_libs=	gnu/lib/csu gnu/lib/libgcc
X+_startup_libs=	gnu/lib/csu
X .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
X _startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
X .else
X _startup_libs+=	lib/csu/${MACHINE_ARCH}
X .endif
X+_startup_libs+=	gnu/lib/libgcc
X+_startup_libs+=	lib/libc
X+
X+gnu/lib/libgcc__L: lib/libc__L
X 
X _prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
X 		${_kerberos5_lib_libroken} \
X@@ -1058,6 +1068,18 @@
X lib/libradius__L: lib/libmd__L
X .endif
X 
X+.for _lib in ${_prereq_libs}
X+${_lib}__PL: .PHONY
X+.if exists(${.CURDIR}/${_lib})
X+	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
X+		cd ${.CURDIR}/${_lib}; \
X+		${MAKE} DIRPRFX=${_lib}/ obj; \
X+		${MAKE} DIRPRFX=${_lib}/ depend; \
X+		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
X+		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
X+.endif
X+.endfor
X+
X .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
X ${_lib}__L: .PHONY
X .if exists(${.CURDIR}/${_lib})
X@@ -1081,6 +1103,7 @@
X 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
X 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
X 
X+_prereq_libs:  ${_prereq_libs:S/$/__PL/}
X _startup_libs: ${_startup_libs:S/$/__L/}
X _prebuild_libs: ${_prebuild_libs:S/$/__L/}
X _generic_libs: ${_generic_libs:S/$/__L/}
XIndex: bin/df/df.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/bin/df/df.c,v
Xretrieving revision 1.67
Xdiff -u -r1.67 df.c
X--- bin/df/df.c	8 Mar 2007 06:10:17 -0000	1.67
X+++ bin/df/df.c	14 Mar 2007 01:06:38 -0000
X@@ -384,7 +384,7 @@
X static void
X prtstat(struct statfs *sfsp, struct maxwidths *mwp)
X {
X-	static u_long blocksize;
X+	static long blocksize;
X 	static int headerlen, timesthrough = 0;
X 	static const char *header;
X 	int64_t used, availblks, inodes;
X@@ -461,7 +461,7 @@
X static void
X update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp)
X {
X-	static u_long blocksize = 0;
X+	static long blocksize = 0;
X 	int dummy;
X 
X 	if (blocksize == 0)
XIndex: bin/ed/cbc.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/bin/ed/cbc.c,v
Xretrieving revision 1.20
Xdiff -u -r1.20 cbc.c
X--- bin/ed/cbc.c	6 Apr 2004 20:06:47 -0000	1.20
X+++ bin/ed/cbc.c	17 Dec 2006 06:49:26 -0000
X@@ -175,7 +175,7 @@
X 		/*
X 		 * copy it, nul-padded, into the key area
X 		 */
X-		expand_des_key(msgbuf, p);
X+		expand_des_key((char *)msgbuf, p);
X 		MEMZERO(p, _PASSWORD_LEN);
X 		set_des_key(&msgbuf);
X 		MEMZERO(msgbuf, sizeof msgbuf);
XIndex: contrib/amd/hlfsd/homedir.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/amd/hlfsd/homedir.c,v
Xretrieving revision 1.7
Xdiff -u -r1.7 homedir.c
X--- contrib/amd/hlfsd/homedir.c	6 Jul 2004 13:16:46 -0000	1.7
X+++ contrib/amd/hlfsd/homedir.c	17 Dec 2006 06:49:26 -0000
X@@ -68,7 +68,7 @@
X static uid2home_t *pwtab;
X static void delay(uid2home_t *, int);
X static void table_add(int, const char *, const char *);
X-static char mboxfile[MAXPATHLEN];
X+char mboxfile[MAXPATHLEN];
X static char *root_home;		/* root's home directory */
X 
X /* GLOBAL FUNCTIONS */
XIndex: contrib/binutils/gas/config/tc-i386.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/binutils/gas/config/tc-i386.c,v
Xretrieving revision 1.16
Xdiff -u -r1.16 tc-i386.c
X--- contrib/binutils/gas/config/tc-i386.c	16 Jun 2004 06:55:47 -0000	1.16
X+++ contrib/binutils/gas/config/tc-i386.c	17 Dec 2006 06:49:26 -0000
X@@ -363,7 +363,7 @@
X    prefix), and doesn't work, unless the destination is in the bottom
X    64k of the code segment (The top 16 bits of eip are zeroed).  */
X 
X-const relax_typeS md_relax_table[] =
X+static const relax_typeS md_relax_table[] =
X {
X   /* The fields are:
X      1) most positive reach of this state,
X@@ -402,6 +402,8 @@
X   {0, 0, 4, 0}
X };
X 
X+const relax_typeS *md_relax_table_p = &md_relax_table[0];
X+
X static const arch_entry cpu_arch[] = {
X   {"i8086",	Cpu086 },
X   {"i186",	Cpu086|Cpu186 },
XIndex: contrib/binutils/gas/config/tc-i386.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/binutils/gas/config/tc-i386.h,v
Xretrieving revision 1.11
Xdiff -u -r1.11 tc-i386.h
X--- contrib/binutils/gas/config/tc-i386.h	16 Jun 2004 06:55:47 -0000	1.11
X+++ contrib/binutils/gas/config/tc-i386.h	17 Dec 2006 06:49:26 -0000
X@@ -448,8 +448,8 @@
X 
X #define md_operand(x)
X 
X-extern const struct relax_type md_relax_table[];
X-#define TC_GENERIC_RELAX_TABLE md_relax_table
X+extern const struct relax_type *md_relax_table_p;
X+#define TC_GENERIC_RELAX_TABLE md_relax_table_p
X 
X extern int optimize_align_code;
X 
XIndex: contrib/csup/mux.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/csup/mux.c,v
Xretrieving revision 1.1.1.1
Xdiff -u -r1.1.1.1 mux.c
X--- contrib/csup/mux.c	3 Mar 2006 04:11:28 -0000	1.1.1.1
X+++ contrib/csup/mux.c	17 Dec 2006 06:49:26 -0000
X@@ -784,6 +784,7 @@
X 	uint16_t hdrsize, size, len;
X 	int error, id, iovcnt, what;
X 
X+	what = 0;
X 	m = (struct mux *)arg;
X again:
X 	id = sender_waitforwork(m, &what);
XIndex: contrib/csup/queue.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/csup/queue.h,v
Xretrieving revision 1.1.1.2
Xdiff -u -r1.1.1.2 queue.h
X--- contrib/csup/queue.h	3 Mar 2006 18:45:12 -0000	1.1.1.2
X+++ contrib/csup/queue.h	17 Dec 2006 06:49:26 -0000
X@@ -35,7 +35,7 @@
X #ifndef _QUEUE_H_
X #define	_QUEUE_H_
X 
X-#undef __ofsetof
X+#undef __offsetof
X #define	__offsetof(type, field)	((size_t)(&((type *)0)->field))
X 
X /*
XIndex: contrib/gdb/gdb/i386fbsd-tdep.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/gdb/gdb/i386fbsd-tdep.c,v
Xretrieving revision 1.1.1.1
Xdiff -u -r1.1.1.1 i386fbsd-tdep.c
X--- contrib/gdb/gdb/i386fbsd-tdep.c	20 Jun 2004 18:17:51 -0000	1.1.1.1
X+++ contrib/gdb/gdb/i386fbsd-tdep.c	17 Dec 2006 06:49:26 -0000
X@@ -45,7 +45,7 @@
X CORE_ADDR i386fbsd_sigtramp_end_addr = 0xbfbfdff0;
X 
X /* From <machine/signal.h>.  */
X-static int i386fbsd_sc_reg_offset[] =
X+int i386fbsd_sc_reg_offset[] =
X {
X   8 + 14 * 4,			/* %eax */
X   8 + 13 * 4,			/* %ecx */
XIndex: contrib/openpam/lib/openpam_readline.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/openpam/lib/openpam_readline.c,v
Xretrieving revision 1.1.1.2
Xdiff -u -r1.1.1.2 openpam_readline.c
X--- contrib/openpam/lib/openpam_readline.c	17 Jun 2005 08:11:42 -0000	1.1.1.2
X+++ contrib/openpam/lib/openpam_readline.c	17 Dec 2006 06:49:26 -0000
X@@ -52,7 +52,7 @@
X char *
X openpam_readline(FILE *f, int *lineno, size_t *lenp)
X {
X-	unsigned char *line;
X+	char *line;
X 	size_t len, size;
X 	int ch;
X 
X@@ -63,7 +63,7 @@
X 
X #define line_putch(ch) do { \
X 	if (len >= size - 1) { \
X-		unsigned char *tmp = realloc(line, size *= 2); \
X+		char *tmp = realloc(line, size *= 2); \
X 		if (tmp == NULL) \
X 			goto fail; \
X 		line = tmp; \
XIndex: contrib/telnet/telnetd/ext.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/telnet/telnetd/ext.h,v
Xretrieving revision 1.11
Xdiff -u -r1.11 ext.h
X--- contrib/telnet/telnetd/ext.h	30 Nov 2001 22:28:07 -0000	1.11
X+++ contrib/telnet/telnetd/ext.h	17 Dec 2006 06:49:26 -0000
X@@ -175,7 +175,7 @@
X 	wontoption(int);
X 
X int	output_data(const char *, ...) __printflike(1, 2);
X-void	output_datalen(const char *, int);
X+void	output_datalen(const unsigned char *, int);
X void	startslave(char *, int, char *);
X 
X #ifdef	ENCRYPTION
XIndex: contrib/telnet/telnetd/state.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/telnet/telnetd/state.c,v
Xretrieving revision 1.14
Xdiff -u -r1.14 state.c
X--- contrib/telnet/telnetd/state.c	4 May 2003 02:54:49 -0000	1.14
X+++ contrib/telnet/telnetd/state.c	17 Dec 2006 06:49:27 -0000
X@@ -1600,14 +1600,14 @@
X 	va_start(args, format);
X 	if ((len = vasprintf(&buf, format, args)) == -1)
X 		return -1;
X-	output_datalen(buf, len);
X+	output_datalen((unsigned char *)buf, len);
X 	va_end(args);
X 	free(buf);
X 	return (len);
X }
X 
X void
X-output_datalen(const char *buf, int len)
X+output_datalen(const unsigned char *buf, int len)
X {
X 	int remaining, copied;
X 	
XIndex: contrib/telnet/telnetd/telnetd.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/telnet/telnetd/telnetd.c,v
Xretrieving revision 1.29
Xdiff -u -r1.29 telnetd.c
X--- contrib/telnet/telnetd/telnetd.c	26 Sep 2006 21:46:11 -0000	1.29
X+++ contrib/telnet/telnetd/telnetd.c	17 Dec 2006 06:49:27 -0000
X@@ -133,11 +133,12 @@
X {
X 	u_long ultmp;
X 	struct sockaddr_storage from;
X-	int on = 1, fromlen;
X+	int on = 1;
X 	int ch;
X #if	defined(IPPROTO_IP) && defined(IP_TOS)
X 	int tos = -1;
X #endif
X+	socklen_t fromlen;
X 	char *ep;
X 
X 	pfrontp = pbackp = ptyobuf;
X@@ -328,7 +329,8 @@
X 	argv += optind;
X 
X 	if (debug) {
X-	    int s, ns, foo, error;
X+	    int s, ns, error;
X+	    socklen_t foo;
X 	    const char *service = "telnet";
X 	    struct addrinfo hints, *res;
X 
XIndex: contrib/telnet/telnetd/utility.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/telnet/telnetd/utility.c,v
Xretrieving revision 1.13
Xdiff -u -r1.13 utility.c
X--- contrib/telnet/telnetd/utility.c	4 May 2003 02:54:49 -0000	1.13
X+++ contrib/telnet/telnetd/utility.c	17 Dec 2006 06:49:27 -0000
X@@ -916,7 +916,7 @@
X 			"MUTUAL" : "ONE-WAY");
X 
X     		{
X-		    char buf[512];
X+		    unsigned char buf[512];
X 		    auth_printsub(&pointer[1], length - 1, buf, sizeof(buf));
X 		    output_data("%s", buf);
X 		}
X@@ -994,7 +994,7 @@
X 		    output_data(" %d (unknown)", pointer[2]);
X 
X 		{
X-		    char buf[512];
X+		    unsigned char buf[512];
X 		    encrypt_printsub(&pointer[1], length - 1, buf, sizeof(buf));
X 		    output_data("%s", buf);
X 		}
XIndex: crypto/heimdal/lib/asn1/gen_glue.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/crypto/heimdal/lib/asn1/gen_glue.c,v
Xretrieving revision 1.1.1.1
Xdiff -u -r1.1.1.1 gen_glue.c
X--- crypto/heimdal/lib/asn1/gen_glue.c	9 Jan 2000 20:57:39 -0000	1.1.1.1
X+++ crypto/heimdal/lib/asn1/gen_glue.c	17 Dec 2006 06:49:27 -0000
X@@ -103,7 +103,9 @@
X     int tag = -1;
X 
X     fprintf (headerfile,
X-	     "extern struct units %s_units[];",
X+	     "#ifdef __PARSE_UNITS_H__\n"
X+	     "extern struct units %s_units[];\n"
X+	     "#endif /* __PARSE_UNITS_H__ */\n",
X 	     s->gen_name);
X 
X     fprintf (codefile,
XIndex: etc/mtree/BSD.include.dist
X===================================================================
XRCS file: /usr/download/ncvs2/src/etc/mtree/BSD.include.dist,v
Xretrieving revision 1.111
Xdiff -u -r1.111 BSD.include.dist
X--- etc/mtree/BSD.include.dist	27 Feb 2007 04:01:57 -0000	1.111
X+++ etc/mtree/BSD.include.dist	3 Mar 2007 17:06:21 -0000
X@@ -14,15 +14,17 @@
X     bsnmp
X     ..
X     c++
X-        3.4
X-            backward
X-            ..
X+	4.1
X+	    backward
X+	    ..
X             bits
X             ..
X             debug
X             ..
X             ext
X             ..
X+            tr1
X+            ..
X         ..
X     ..
X     cam
XIndex: gnu/lib/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/Makefile,v
Xretrieving revision 1.41
Xdiff -u -r1.41 Makefile
X--- gnu/lib/Makefile	17 Mar 2006 18:54:22 -0000	1.41
X+++ gnu/lib/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -14,8 +14,4 @@
X SUBDIR+= libobjc
X .endif
X 
X-.if ${MK_FORTRAN} != "no"
X-SUBDIR+= libg2c
X-.endif
X-
X .include <bsd.subdir.mk>
XIndex: gnu/lib/csu/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/csu/Makefile,v
Xretrieving revision 1.24
Xdiff -u -r1.24 Makefile
X--- gnu/lib/csu/Makefile	10 Sep 2004 06:48:04 -0000	1.24
X+++ gnu/lib/csu/Makefile	4 Apr 2007 19:15:47 -0000
X@@ -1,20 +1,21 @@
X # $FreeBSD: src/gnu/lib/csu/Makefile,v 1.24 2004/09/10 06:48:04 ru Exp $
X 
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X CCDIR=	${.CURDIR}/../../usr.bin/cc
X .include "${CCDIR}/Makefile.tgt"
X 
X .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
X 
X-SRCS=		crtstuff.c tconfig.h tm.h
X-OBJS=		crtbegin.o crtend.o
X+SRCS=		crtstuff.c tconfig.h tm.h options.h
X+OBJS=		crtbegin.o crtend.o crtbeginT.o
X SOBJS=		crtbegin.So crtend.So
X CSTD?=		gnu89
X-CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR
X+CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3
X CFLAGS+=	-finhibit-size-directive -fno-inline-functions \
X 		-fno-exceptions -fno-zero-initialized-in-bss \
X 		-fno-omit-frame-pointer -fno-unit-at-a-time
X-CFLAGS+=	-I${GCCDIR}/config -I${GCCDIR} -I. \
X+CFLAGS+=	-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \
X 		-I${CCDIR}/cc_tools
X CRTS_CFLAGS=	-DCRTSTUFFS_O -DSHARED ${PICFLAG}
X MKDEP=		-DCRT_BEGIN
X@@ -46,6 +47,10 @@
X 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN \
X 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
X 
X+crtbeginT.o:	${BEGINSRC}
X+	${CC} ${CFLAGS} -g0 -DCRT_BEGIN -DCRTSTUFFT_O \
X+		-c -o ${.TARGET} ${.ALLSRC:N*.h}
X+
X crtbegin.So:	${BEGINSRC}
X 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \
X 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
X@@ -58,8 +63,8 @@
X 	${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
X 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
X 
X-CLEANFILES+=	tm.h tconfig.h
X-tm.h tconfig.h: ${CCDIR}/cc_tools/Makefile
X+CLEANFILES+=	tm.h tconfig.h options.h optionlist cs-tconfig.h cs-tm.h
X+tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile
X 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X 
X realinstall:
XIndex: gnu/lib/libgcc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libgcc/Makefile,v
Xretrieving revision 1.56
Xdiff -u -r1.56 Makefile
X--- gnu/lib/libgcc/Makefile	12 Oct 2006 16:43:15 -0000	1.56
X+++ gnu/lib/libgcc/Makefile	5 Apr 2007 13:11:12 -0000
X@@ -1,43 +1,24 @@
X # $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.56 2006/10/12 16:43:15 cognet Exp $
X+GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X+
X+LIB=		gcc
X+SHLIB_NAME=	libgcc_s.so.1
X+SHLIBDIR?=	/lib
X 
X .include <bsd.own.mk>
X .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
X 
X-GCCDIR=	${.CURDIR}/../../../contrib/gcc
X .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
X 
X-# allow to be overridden for the a.out case
X-.if !defined(LIB) || ${LIB} != "gcc_r"
X-LIB=	gcc
X-.endif
X-
X-#SHLIB_MAJOR=	1
X-
X-# We need to install libgcc_pic.a as well, for use by shared libs.
X-INSTALL_PIC_ARCHIVE=
X-
X-#
X-# XXX This is a hack, but it seems to work.
X-# libgcc2.a is meant to be compiled by *this* version of gcc.
X-#
X-# Normally, this does not make any difference, since we only have gcc, but
X-# when bootstrapping from gcc-2.6.3, we have to use the freshly built 2.7.2
X-# compiler for some of the libgcc2.c __attribute__ stuff.
X-#
X-# We now depend on a bootstrap pass (normally in `make world') to build
X-# and install the new version of gcc before we get here.  This makes
X-# finding the new version (XCC) easy but may break finding the old version
X-# (CC).
X-#
X-XCC=	${CC}
X-XCXX=	${CXX}
X-
X-CFLAGS+=	-fexceptions
X CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
X-		-DFINE_GRAINED_LIBRARIES
X-CFLAGS+=	-D_PTHREADS -DGTHREAD_USE_WEAK
X-CFLAGS+=	-I${.CURDIR}/../../usr.bin/cc/cc_tools \
X-		-I${GCCDIR}/config -I${GCCDIR} -I.
X+		-DHAVE_GTHR_DEFAULT \
X+		-I${GCCLIB}/include \
X+		-I${GCCDIR}/config -I${GCCDIR} -I. \
X+		-I${.CURDIR}/../../usr.bin/cc/cc_tools
X+
X+LDFLAGS+=	-nodefaultlibs
X+LDADD+=		-lc
X 
X OBJS=		# added to below in various ways depending on TARGET_ARCH
X 
X@@ -46,27 +27,48 @@
X # When upgrading GCC, get the following defintions straight from Makefile.in
X #
X # Library members defined in libgcc2.c.
X-LIB2FUNCS = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
X+LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
X 	_cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \
X 	_fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi \
X 	_floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf _clear_cache \
X 	_enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
X 	_addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \
X 	_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
X-	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 
X+	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
X+	_powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 \
X+	_divxc3 _divtc3
X+
X+LIB2ADD = $(LIB2FUNCS_EXTRA)
X+LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
X+
X+# Additional sources to handle exceptions; overridden by targets as needed.
X+LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \
X+	unwind-c.c
X+LIB2ADDEHSTATIC = $(LIB2ADDEH)
X+LIB2ADDEHSHARED = $(LIB2ADDEH)
X+
X+# List of extra C and assembler files to add to static and shared libgcc2.
X+# Assembler files should have names ending in `.asm'.
X+LIB2FUNCS_EXTRA =
X+
X+# List of extra C and assembler files to add to static libgcc2.
X+# Assembler files should have names ending in `.asm'.
X+LIB2FUNCS_STATIC_EXTRA =
X 
X # Defined in libgcc2.c, included only in the static library.
X+# KAN: Excluded _sf_to_tf and _df_to_tf as TPBIT_FUNCS are not
X+# built on any of our platforms.
X LIB2FUNCS_ST = _eprintf __gcc_bcmp
X 
X FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \
X     _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \
X     _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \
X-    _sf_to_df _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf
X+    _sf_to_df _thenan_sf _sf_to_usi _usi_to_sf
X 
X DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
X     _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \
X     _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \
X-    _df_to_sf _df_to_tf _thenan_df _df_to_usi _usi_to_df
X+    _df_to_sf _thenan_df _df_to_usi _usi_to_df
X 
X TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \
X     _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \
X@@ -77,81 +79,48 @@
X # unwinder info.
X LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
X 
X-LIB2ADD = $(LIB2FUNCS_EXTRA)
X-LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
X-
X-# Additional sources to handle exceptions; overridden by targets as needed.
X-LIB2ADDEH = unwind-dw2.c unwind-dw2-fde.c unwind-sjlj.c gthr-gnat.c unwind-c.c
X-
X #-----------------------------------------------------------------------
X #
X #	Platform specific bits.
X-#	When upgrading GCC, get the following defintions from config/<cpu>/t-*
X+#	When upgrading GCC, get the following definitions from config/<cpu>/t-*
X #
X-
X-.if ${TARGET_ARCH} == "alpha"
X-#	from config/alpha/t-alpha
X-LIB2FUNCS_EXTRA = qrnnd.asm
X-.endif
X-
X .if ${TARGET_ARCH} == "arm"
X #	from config/arm/t-strongarm-elf
X CFLAGS+=	-Dinhibit_libc -fno-inline
X LIB1ASMSRC =	lib1funcs.asm
X-LIB1ASMFUNCS =	_dvmd_tls _bb_init_func
X-OBJS+=	dp-bit.o fp-bit.o
X-# We want fine grained libraries, so use the new code to build the
X-# floating point emulation libraries.
X-XXX fix this: NEED_FP_EMULATION set to "yes" with different rules per platform
X+LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
X+# Not now
X+#LIB1ASMFUNCS =  _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func
X+#LIB1ASMFUNCS+=	_call_via_rX _interwork_call_via_rX \
X+#	_lshrdi3 _ashrdi3 _ashldi3 \
X+#	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
X+#	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
X+#	_fixsfsi _fixunssfsi _floatdidf _floatdisf
X .endif
X 
X .if ${TARGET_ARCH} == "ia64"
X #	from config/ia64/t-ia64
X-LIB1ASMSRC    = lib1funcs.asm
X-LIB1ASMFUNCS  = __divxf3 __divdf3 __divsf3 \
X-        __divdi3 __moddi3 __udivdi3 __umoddi3 \
X-        __divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
X-        __nonlocal_goto __restore_stack_nonlocal __trampoline __compat
X-LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c gthr-gnat.c
X+LIB1ASMSRC   = lib1funcs.asm
X+LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \
X+	__divdi3 __moddi3 __udivdi3 __umoddi3 \
X+	__divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
X+	__nonlocal_goto __restore_stack_nonlocal __trampoline \
X+	_fixtfdi _fixunstfdi _floatditf
X+LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c
X .endif
X 
X .if ${TARGET_ARCH} == "powerpc"
X #	from config/rs6000/t-ppccomm
X-LIB2FUNCS_EXTRA = tramp.asm
X-# This one can't end up in shared libgcc
X+LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c
X LIB2FUNCS_STATIC_EXTRA = eabi.asm
X-# We want fine grained libraries, so use the new code to build the
X-# floating point emulation libraries.
X-OBJS+=	dp-bit.o fp-bit.o
X .endif
X 
X .if ${TARGET_ARCH} == "sparc64"
X #	from config/sparc/t-elf
X-# We want fine grained libraries, so use the new code to build the
X-# floating point emulation libraries.
X-LIB1ASMSRC = lb1spc.asm
X+LIB1ASMSRC =   lb1spc.asm
X LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
X-OBJS+=	dp-bit.o fp-bit.o
X .endif
X 
X-dp-bit.o: config/fp-bit.c
X-	${XCC} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-dp-bit.So: config/fp-bit.c
X-	${XCC} ${PICFLAG} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-dp-bit.po: config/fp-bit.c
X-	${XCC} -p -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-fp-bit.o: config/fp-bit.c
X-	${XCC} -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-fp-bit.So: config/fp-bit.c
X-	${XCC} ${PICFLAG} -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-fp-bit.po: config/fp-bit.c
X-	${XCC} -p -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X #-----------------------------------------------------------------------
X 
X # Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are
X@@ -163,64 +132,194 @@
X .endfor
X .endif
X 
X-ASM_T=		${LIB1ASMFUNCS:S/$/.o/}
X-ASM_P=		${LIB1ASMFUNCS:S/$/.po/}
X-ASM_S=		${LIB1ASMFUNCS:S/$/.So/}
X-
X-SYMS=		${LIB2FUNCS}		\
X-		${LIB2_DIVMOD_FUNCS}
X-.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
X-SYMS+=		${FPBIT_FUNCS} ${DPBIT_FUNCS}
X-.endif
X-SYMS_ST=	${LIB2FUNCS_ST}		\
X-		${LIB2ADD_ST}
X-OBJS+=		${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/}
X-OBJS_T=		${SYMS:S/$/.o/}  ${SYMS_ST:S/$/.o/}
X-OBJS_P=		${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/}
X-OBJS_S=		${SYMS:S/$/.So/}
X-STATICOBJS=	${SYMS_ST:S/$/.o/}
X-SRCS=		${LIB2ADD} ${LIB2ADDEH}
X-
X-COMMONHDRS=	tm.h tconfig.h
X-SRCS+=		${COMMONHDRS}
X-CLEANFILES+=	${COMMONHDRS}
X+COMMONHDRS=	tm.h tconfig.h options.h unwind.h gthr-default.h
X 
X-${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X+#-----------------------------------------------------------------------
X+#
X+# Helpful shortcuts for compiler invocations.
X+#
X+HIDE =  -fvisibility=hidden -DHIDE_EXPORTS
X+CC_T =	${CC} -c ${CFLAGS} ${HIDE} -fPIC
X+CC_P =	${CC} -c ${CFLAGS} ${HIDE} -p -fPIC
X+CC_S =	${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED
X 
X-${OBJS} beforedepend: ${COMMONHDRS}
X+#-----------------------------------------------------------------------
X+#
X+# Functions from libgcc2.c
X+#
X+STD_CFLAGS =
X+DIV_CFLAGS =	-fexceptions -fnon-call-exceptions
X 
X-${OBJS_T}: libgcc2.c
X-	${XCC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+STD_FUNCS =	${LIB2FUNCS}
X+DIV_FUNCS =	${LIB2_DIVMOD_FUNCS}
X 
X-.if !defined(NO_PIC)
X-${OBJS_S}: libgcc2.c
X-	${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X-.endif
X+STD_CFILE =	libgcc2.c
X+DIV_CFILE =	libgcc2.c
X 
X-.if ${MK_PROFILE} != "no"
X-${OBJS_P}: libgcc2.c
X-	${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+OBJ_GRPS =	STD DIV
X+
X+#-----------------------------------------------------------------------
X+#
X+# Floating point emulation functions
X+#
X+.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "powerpc" || \
X+    ${TARGET_ARCH} == "sparc64"
X+
X+FPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DFLOAT
X+DPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES
X+
X+FPBIT_CFILE =	config/fp-bit.c
X+DPBIT_CFILE =	config/fp-bit.c
X+
X+OBJ_GRPS +=	FPBIT DPBIT
X .endif
X 
X+#-----------------------------------------------------------------------
X+#
X+# Generic build rules for object groups defined above
X+#
X+.for T in ${OBJ_GRPS}
X+${T}_OBJS_T =	${${T}_FUNCS:S/$/.o/}
X+${T}_OBJS_P =	${${T}_FUNCS:S/$/.po/}
X+${T}_OBJS_S =	${${T}_FUNCS:S/$/.So/}
X+OBJS +=		${${T}_FUNCS:S/$/.o/}
X+
X+${${T}_OBJS_T}: ${${T}_CFILE} ${COMMONHDRS}
X+	${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+${${T}_OBJS_P}: ${${T}_CFILE} ${COMMONHDRS}
X+	${CC_P} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+${${T}_OBJS_S}: ${${T}_CFILE} ${COMMONHDRS}
X+	${CC_S} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+.endfor
X+
X+#-----------------------------------------------------------------------
X+#
X+# Objects that should be in static library only.
X+#
X+#SYMS_ST =	${LIB2FUNCS_ST}	${LIB2ADD_ST}
X+STAT_OBJS_T = 	${SYMS_ST:S/$/.o/}
X+STAT_OBJS_P = 	${SYMS_ST:S/$/.po/}
X+STATICOBJS  =	${SYMS_ST:S/$/.o/}
X+
X+${STAT_OBJS_T}:	${STD_CFILE} ${COMMONHDRS}
X+	${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+${STAT_OBJS_P}:	${STD_CFILE} ${COMMONHDRS}
X+	${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+
X+#-----------------------------------------------------------------------
X+#
X+# Assembler files.
X+#
X .if defined(LIB1ASMSRC)
X-.for _lib1asmsrc in ${LIB1ASMSRC}
X-${ASM_T}: ${_lib1asmsrc}
X-	${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
X+ASM_T =		${LIB1ASMFUNCS:S/$/.o/}
X+ASM_P =		${LIB1ASMFUNCS:S/$/.po/}
X+ASM_S =		${LIB1ASMFUNCS:S/$/.So/}
X+ASM_V =		${LIB1ASMFUNCS:S/$/.vis/}
X+OBJS +=		${LIB1ASMFUNCS:S/$/.o/}
X+
X+${ASM_T}: ${LIB1ASMSRC} ${.PREFIX}.vis
X+	${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
X+	    -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis}
X+${ASM_P}: ${LIB1ASMSRC} ${.PREFIX}.vis
X+	${CC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
X+	    -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis}
X+${ASM_S}: ${LIB1ASMSRC}
X+	${CC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \
X 	    -o ${.TARGET} ${.ALLSRC:N*.h}
X+${ASM_V}: ${LIB1ASMSRC}
X+	${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
X+	    -o ${.PREFIX}.vo ${.ALLSRC:N*.h}
X+	( nm -pg ${.PREFIX}.vo | \
X+		awk 'NF == 3 && $$2 !~ /^[UN]$$/ { print "\t.hidden ", $$3 }'\
X+	) > ${.TARGET}
X 
X-.if !defined(NO_PIC)
X-${ASM_S}: ${_lib1asmsrc}
X-	${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \
X-	    -o ${.TARGET} ${.ALLSRC:N*.h}
X+CLEANFILES += ${ASM_V} ${ASM_V:R:S/$/.vo/}
X .endif
X 
X+#-----------------------------------------------------------------------
X+#
X+# Exception handling / unwinding support.
X+#
X+EH_OBJS_T = ${LIB2ADDEHSTATIC:R:S/$/.o/}
X+EH_OBJS_P = ${LIB2ADDEHSTATIC:R:S/$/.po/}
X+EH_OBJS_S = ${LIB2ADDEHSHARED:R:S/$/.So/}
X+EH_CFLAGS = -fexceptions -D__GLIBC__=3 -DElfW=__ElfN
X+SOBJS    += ${EH_OBJS_S}
X+
X+.for _src in ${LIB2ADDEHSTATIC}
X+${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS}
X+	${CC_T} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
X+${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS}
X+	${CC_P} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
X+.endfor
X+.for _src in ${LIB2ADDEHSHARED}
X+${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS}
X+	${CC_S} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
X+.endfor
X+
X+
X+#-----------------------------------------------------------------------
X+#
X+# Generated headers
X+#
X+${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X+	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X+
X+CLEANFILES += ${COMMONHDRS}
X+CLEANFILES += cs-*.h option*
X+
X+#-----------------------------------------------------------------------
X+#
X+# Build additional static libgcc_eh[_p].a librarries.
X+#
X+SHLIB_MKMAP      = ${GCCDIR}/mkmap-symver.awk
X+SHLIB_MKMAP_OPTS =
X+SHLIB_MAPFILES   = ${GCCDIR}/libgcc-std.ver
X+VERSION_MAP      = libgcc.map
X+
X+libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS} ${OBJS:R:S/$/.So/}
X+	(  nm -pg ${SOBJS};echo %% ; \
X+	  cat ${SHLIB_MAPFILES} \
X+	    | sed -e '/^[   ]*#/d' \
X+	          -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' \
X+	    | ${CC} ${CFLAGS} -E -xassembler-with-cpp -; \
X+	) | awk -f ${SHLIB_MKMAP} ${SHLIB_MKMAP_OPTS} > ${.TARGET}
X+
X+CLEANFILES +=	libgcc.map
X+
X+#-----------------------------------------------------------------------
X+#
X+# Build additional static libgcc_eh[_p].a librarries.
X+#
X+lib${LIB}_eh.a:	${EH_OBJS_T}
X+	@${ECHO} building static ${LIB}_eh library
X+	@rm -f ${.TARGET}
X+	@${AR} cq ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
X+	${RANLIB} ${.TARGET}
X+
X+all:	lib${LIB}_eh.a
X+
X .if ${MK_PROFILE} != "no"
X-${ASM_P}: ${_lib1asmsrc}
X-	${XCC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
X-	    -o ${.TARGET} ${.ALLSRC:N*.h}
X+lib${LIB}_eh_p.a:	${EH_OBJS_P}
X+	@${ECHO} building profiled ${LIB}_eh library
X+	@rm -f ${.TARGET}
X+	@${AR} cq ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
X+	${RANLIB} ${.TARGET}
X+all:	lib${LIB}_eh_p.a
X .endif
X-.endfor
X+
X+_libinstall: _lib-eh-install
X+
X+_lib-eh-install:
X+	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
X+		${_INSTALLFLAGS} lib${LIB}_eh.a ${DESTDIR}${LIBDIR}
X+.if ${MK_PROFILE} != "no"
X+	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
X+		${_INSTALLFLAGS} lib${LIB}_eh_p.a ${DESTDIR}${LIBDIR}
X .endif
X 
X+CLEANFILES+=	lib${LIB}_eh.a lib${LIB}_eh_p.a ${EH_OBJS_T} ${EH_OBJS_P}
X+
X .include <bsd.lib.mk>
X+
X+.SUFFIXES: .vis .vo
XIndex: gnu/lib/libgcov/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libgcov/Makefile,v
Xretrieving revision 1.4
Xdiff -u -r1.4 Makefile
X--- gnu/lib/libgcov/Makefile	18 Mar 2006 21:37:04 -0000	1.4
X+++ gnu/lib/libgcov/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -5,6 +5,7 @@
X .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
X 
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
X 
X LIB=		gcov
X@@ -12,18 +13,22 @@
X CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
X CFLAGS+=	-D_PTHREADS -DGTHREAD_USE_WEAK
X CFLAGS+=	-I${.CURDIR}/../../usr.bin/cc/cc_tools \
X-		-I${GCCDIR}/config -I${GCCDIR} -I.
X+		-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I.
X #
X # Library members defined in libgcov.c.
X-SYMS=		_gcov _gcov_merge_add _gcov_merge_delta _gcov_merge_single
X+# Defined in libgcov.c, included only in gcov library
X+SYMS = _gcov _gcov_merge_add _gcov_merge_single _gcov_merge_delta \
X+    _gcov_fork _gcov_execl _gcov_execlp _gcov_execle \
X+    _gcov_execv _gcov_execvp _gcov_execve \
X+    _gcov_interval_profiler _gcov_pow2_profiler _gcov_one_value_profiler
X 
X OBJS=		${SYMS:S/$/.o/}
X OBJS_T=		${SYMS:S/$/.o/}
X OBJS_P=		${SYMS:S/$/.po/}
X OBJS_S=		${SYMS:S/$/.So/}
X 
X-COMMONHDRS=	tm.h tconfig.h gcov-iov.h
X-CLEANFILES+=	${COMMONHDRS}
X+COMMONHDRS=	tm.h tconfig.h gcov-iov.h options.h 
X+CLEANFILES+=	${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist
X 
X ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X@@ -39,7 +44,7 @@
X .endif
X 
X .if ${MK_PROFILE} != "no"
X-${OBJS_P}: libgcc2.c
X+${OBJS_P}: libgcov.c
X 	${CC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X .endif
X 
XIndex: gnu/lib/libobjc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libobjc/Makefile,v
Xretrieving revision 1.29
Xdiff -u -r1.29 Makefile
X--- gnu/lib/libobjc/Makefile	16 Mar 2006 15:18:15 -0000	1.29
X+++ gnu/lib/libobjc/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -2,39 +2,44 @@
X 
X OBJCDIR=${.CURDIR}/../../../contrib/libobjc
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X 
X .PATH: ${OBJCDIR}/objc ${OBJCDIR}
X 
X LIB=		objc
X SHLIB_MAJOR=	2
X 
X-SRCS=   archive.c class.c encoding.c gc.c hash.c init.c misc.c \
X-	nil_method.c objects.c sarray.c selector.c sendmsg.c \
X-	thr.c thr-posix.c \
X-	NXConstStr.m Object.m Protocol.m linking.m
X+SRCS=	archive.c class.c encoding.c gc.c hash.c init.c linking.m misc.c \
X+	nil_method.c NXConstStr.m Object.m objects.c Protocol.m sarray.c \
X+	selector.c sendmsg.c thr.c thr-objc.c exception.c hash_compat.c
X 
X INCS=	encoding.h hash.h objc-api.h objc-list.h objc.h runtime.h \
X 	sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h
X INCSDIR=${INCLUDEDIR}/objc
X 
X-OBJCFLAGS= -fgnu-runtime ${CFLAGS}
X CFLAGS+= -DHAVE_GTHR_DEFAULT -DIN_GCC -DIN_TARGET_LIBS
X CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools
X-CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} 
X+CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR}
X CFLAGS+= -I${GCCDIR}/config -I${GCCDIR}
X-CFLAGS+= -frandom-seed=RepeatabilityConsideredGood
X-
X-GENHDRS=	runtime-info.h tconfig.h tm.h
X-CLEANFILES+=	${GENHDRS}
X-SRCS+=		${GENHDRS}
X+CFLAGS+= -I${GCCLIB}/include
X+CFLAGS+= -fexceptions -frandom-seed=RepeatabilityConsideredGood
X+OBJCFLAGS= -fgnu-runtime ${CFLAGS}
X 
X-${OBJS}: ${GENHDRS}
X+GENHDRS= runtime-info.h
X 
X runtime-info.h:
X 	`${CC} --print-prog-name=cc1obj` -print-objc-runtime-info \
X 	    < /dev/null > ${.TARGET}
X 
X-tconfig.h tm.h : ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X+.for H in tconfig.h tm.h config.h options.h gthr-default.h unwind.h
X+$H: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X+GENHDRS+=	$H
X+.endfor
X+
X+CLEANFILES+=	${GENHDRS} cs-* optionlist
X+SRCS+=		${GENHDRS}
X+
X+${OBJS}: ${GENHDRS}
X 
X .include <bsd.lib.mk>
XIndex: gnu/lib/libstdc++/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libstdc++/Makefile,v
Xretrieving revision 1.58
Xdiff -u -r1.58 Makefile
X--- gnu/lib/libstdc++/Makefile	5 Oct 2006 20:55:37 -0000	1.58
X+++ gnu/lib/libstdc++/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,21 +1,23 @@
X # $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.58 2006/10/05 20:55:37 obrien Exp $
X 
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
X SUPDIR=	${SRCDIR}/libsupc++
X 
X .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \
X-       ${SRCDIR}/config/locale/generic ${SRCDIR}/include \
X-       ${SUPDIR} ${GCCDIR}
X+       ${SRCDIR}/config/locale/darwin ${SRCDIR}/config/locale/generic \
X+       ${SRCDIR}/include ${SUPDIR} ${GCCDIR} ${GCCLIB}/libiberty
X 
X LIB=		stdc++
X-SHLIB_MAJOR=	5
X+SHLIB_MAJOR=	6
X 
X CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
X .if ${MACHINE_ARCH} == "arm"
X CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
X .endif
X CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
X+CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR}/include -I.
X CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
X CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
X 		-Wno-deprecated
X@@ -24,15 +26,16 @@
X LDADD=		-lm
X 
X # libstdc++ sources
X-SRCS+= 	allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc debug_list.cc \
X+SRCS+=  bitmap_allocator.cc pool_allocator.cc mt_allocator.cc codecvt.cc \
X+	compatibility.cc complex_io.cc ctype.cc debug.cc debug_list.cc \
X 	functexcept.cc globals_locale.cc globals_io.cc ios.cc ios_failure.cc \
X-	ios_init.cc ios_locale.cc limits.cc debug_list.cc list.cc locale.cc \
X-	locale_init.cc locale_facets.cc localename.cc stdexcept.cc \
X-	strstream.cc tree.cc allocator-inst.cc concept-inst.cc fstream-inst.cc \
X-	ext-inst.cc io-inst.cc istream-inst.cc locale-inst.cc \
X+	ios_init.cc ios_locale.cc limits.cc list.cc locale.cc locale_init.cc \
X+	locale_facets.cc localename.cc stdexcept.cc strstream.cc tree.cc \
X+	allocator-inst.cc concept-inst.cc fstream-inst.cc ext-inst.cc \
X+	ios-inst.cc iostream-inst.cc istream-inst.cc istream.cc locale-inst.cc \
X 	locale-misc-inst.cc misc-inst.cc ostream-inst.cc sstream-inst.cc \
X-	streambuf-inst.cc string-inst.cc valarray-inst.cc wlocale-inst.cc \
X-	wstring-inst.cc 
X+	streambuf-inst.cc streambuf.cc string-inst.cc valarray-inst.cc \
X+	wlocale-inst.cc wstring-inst.cc
X 
X # target sources
X SRCS+=  atomicity.cc codecvt_members.cc collate_members.cc ctype_members.cc \
X@@ -43,11 +46,11 @@
X SRCS+=  basic_file_stdio.cc c_locale.cc
X 
X # C parts of math
X-SRCS+=	signbitf.c signbitl.c stubs.c
X+SRCS+=	stubs.c
X 
X # Embedded copy of libsupc++
X-SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc \
X-	eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc \
X+SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \
X+	eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \
X 	eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \
X 	eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \
X 	new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \
X@@ -79,8 +82,8 @@
X CLEANFILES+=	atomicity.cc
X 
X INCSGROUPS=	BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \
X-		TARGETHDRS THRHDRS DEBUGHDRS
X-CXXINCLUDEDIR=	${INCLUDEDIR}/c++/3.4
X+		TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS
X+CXXINCLUDEDIR=	${INCLUDEDIR}/c++/4.1
X 
X STDHDRS=	std_algorithm.h std_bitset.h std_complex.h std_deque.h \
X 		std_fstream.h std_functional.h std_iomanip.h std_ios.h \
X@@ -109,8 +112,8 @@
X 		stl_iterator_base_types.h stl_list.h stl_map.h stl_multimap.h \
X 		stl_multiset.h stl_numeric.h stl_pair.h stl_queue.h \
X 		stl_raw_storage_iter.h stl_relops.h stl_set.h stl_stack.h \
X-		stl_tempbuf.h stl_threads.h stl_tree.h stl_uninitialized.h \
X-		stl_vector.h streambuf.tcc stringfwd.h type_traits.h \
X+		stl_tempbuf.h stl_tree.h stl_uninitialized.h \
X+		stl_vector.h streambuf.tcc stringfwd.h \
X 		valarray_array.h valarray_array.tcc valarray_before.h \
X 		valarray_after.h vector.tcc
X BITSHDRS:=	${BITSHDRS:S;^;${SRCDIR}/include/bits/;}
X@@ -125,15 +128,27 @@
X BKWHDRS:=	${BKWHDRS:S;^;${SRCDIR}/include/backward/;}
X BKWHDRSDIR=	${CXXINCLUDEDIR}/backward
X 
X-EXTHDRS=	algorithm bitmap_allocator.h debug_allocator.h \
X-		enc_filebuf.h stdio_filebuf.h stdio_sync_filebuf.h functional \
X-		hash_map hash_set iterator malloc_allocator.h memory \
X-		mt_allocator.h new_allocator.h numeric pod_char_traits.h \
X-		pool_allocator.h rb_tree rope ropeimpl.h slist hash_fun.h \
X-		hashtable.h
X+EXTHDRS=	algorithm array_allocator.h bitmap_allocator.h \
X+		codecvt_specializations.h debug_allocator.h functional \
X+		hash_fun.h hash_map hash_set hashtable.h iterator \
X+		malloc_allocator.h memory mt_allocator.h new_allocator.h \
X+		numeric pod_char_traits.h pool_allocator.h rb_tree rope \
X+		rc_string_base.h ropeimpl.h slist stdio_filebuf.h \
X+		stdio_sync_filebuf.h sso_string_base.h typelist.h vstring.h \
X+		vstring.tcc vstring_fwd.h vstring_util.h
X+
X EXTHDRS:=	${EXTHDRS:S;^;${SRCDIR}/include/ext/;}
X EXTHDRSDIR=	${CXXINCLUDEDIR}/ext
X 
X+TR1HDRS=	array bind_iterate.h bind_repeat.h boost_shared_ptr.h \
X+		functional functional_iterate.h hashtable memory mu_iterate.h \
X+		ref_fwd.h ref_wrap_iterate.h repeat.h tuple tuple_iterate.h \
X+		type_traits type_traits_fwd.h unordered_map unordered_set \
X+		utility
X+
X+TR1HDRS:=	${TR1HDRS:S;^;${SRCDIR}/include/tr1/;}
X+TR1HDRSDIR=	${CXXINCLUDEDIR}/tr1
X+
X # This is the common subset of files that all three "C" header models use.
X BASEHDRS=	std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \
X 		std_ciso646.h std_climits.h std_clocale.h std_cmath.h \
X@@ -150,21 +165,22 @@
X BASEXHDRS=	${SRCDIR}/include/c_std/cmath.tcc
X BASEXHDRSDIR=	${CXXINCLUDEDIR}/bits
X 
X-DEBUGHDRS=	bitset debug.h deque formatter.h hash_map hash_map.h \
X-		hash_multimap.h hash_multiset.h hash_set hash_set.h list \
X-		map map.h multimap.h multiset.h safe_base.h safe_iterator.h \
X-		safe_iterator.tcc safe_sequence.h set set.h string vector
X+DEBUGHDRS=	bitset debug.h deque formatter.h functions.h hash_map \
X+		hash_map.h hash_multimap.h hash_multiset.h hash_set hash_set.h \
X+		list macros.h map map.h multimap.h multiset.h safe_base.h \
X+		safe_iterator.h safe_iterator.tcc safe_sequence.h set set.h \
X+		string vector
X DEBUGHDRS:=	${DEBUGHDRS:S;^;${SRCDIR}/include/debug/;}
X DEBUGHDRSDIR=	${CXXINCLUDEDIR}/debug
X 
X-TARGETHDRS=	allocator/new_allocator_base.h \
X+TARGETHDRS=	abi/compatibility.h \
X+		allocator/new_allocator_base.h \
X 		io/basic_file_stdio.h \
X 		io/c_io_stdio.h \
X 		locale/generic/c_locale.h \
X 		locale/generic/c++locale_internal.h \
X 		locale/generic/messages_members.h \
X 		locale/generic/time_members.h \
X-		locale/generic/codecvt_specializations.h \
X 		os/bsd/freebsd/ctype_base.h \
X 		os/bsd/freebsd/ctype_inline.h \
X 		os/bsd/freebsd/ctype_noninline.h \
X@@ -177,7 +193,7 @@
X TARGETHDRSNAME_new_allocator_base.h= c++allocator.h
X TARGETHDRSDIR=	${CXXINCLUDEDIR}/bits
X 
X-MARCHHDRS=	atomic_word.h
X+MARCHHDRS=	atomic_word.h cpu_defines.h cxxabi_tweaks.h
X .for h in ${MARCHHDRS}
X .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/${h})
X TARGETHDRS+=	${SRCDIR}/config/cpu/${MARCHDIR}/${h}
X@@ -186,12 +202,13 @@
X .endif
X .endfor
X 
X-THRHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-default.h
X+THRHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-tpf.h gthr-default.h
X THRHDRSDIR=	${CXXINCLUDEDIR}/bits
X uppercase =	[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
X 
X gthr.h: ${GCCDIR}/gthr.h
X-	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
X+	sed -e '/^#pragma/b' \
X+	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
X 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
X 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
X 	    < ${.ALLSRC} > ${.TARGET}
X@@ -208,6 +225,13 @@
X 	    -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \
X 	    < ${.ALLSRC} > ${.TARGET}
X 
X+gthr-tpf.h: ${GCCDIR}/gthr-posix.h
X+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
X+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
X+	    -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \
X+	    -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \
X+	    < ${.ALLSRC} > ${.TARGET}
X+
X gthr-default.h: ${GCCDIR}/gthr-posix.h
X 	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
X 	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
X@@ -218,6 +242,12 @@
X 
X CLEANFILES+=	${THRHDRS}
X 
X+unwind.h: ${GCCDIR}/unwind-generic.h
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+SRCS+=		unwind.h
X+CLEANFILES+=	unwind.h
X+
X c++config.h: ${.CURDIR}/config.h ${SRCDIR}/include/bits/c++config
X 	cat ${SRCDIR}/include/bits/c++config > ${.TARGET} && \
X 	sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
X@@ -228,4 +258,13 @@
X 	echo "#endif // _CXXCONFIG_" >> ${.TARGET}
X CLEANFILES+=	c++config.h
X 
X+# Symbol versioning.
X+
X+VERSION_MAP=  	libstdc++.map
X+
X+${VERSION_MAP}: ${SRCDIR}/config/linker-map.gnu
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+CLEANFILES+=	${VERSION_MAP}
X+
X .include <bsd.lib.mk>
XIndex: gnu/lib/libstdc++/config.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libstdc++/config.h,v
Xretrieving revision 1.14
Xdiff -u -r1.14 config.h
X--- gnu/lib/libstdc++/config.h	22 Sep 2006 15:08:07 -0000	1.14
X+++ gnu/lib/libstdc++/config.h	5 Apr 2007 05:22:49 -0000
X@@ -1,180 +1,10 @@
X-/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.14 2006/09/22 15:08:07 kan Exp $ */
X+/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.14 2006/09/22 15:08:07 kan Exp$ */
X #ifndef __ISO_C_VISIBLE
X #include <sys/cdefs.h>
X #endif
X 
X /* config.h.  Generated by configure.  */
X /* config.h.in.  Generated from configure.ac by autoheader.  */
X-// acconfig.h symbols and macros for libstdc++ v3 -*- C++ -*-
X-
X-// Defines libstdc++ version.
X-/* #undef PACKAGE */
X-/* #undef VERSION */
X-
X-// Needed for gettext.
X-/* #undef ENABLE_NLS */
X-/* #undef HAVE_CATGETS */
X-/* #undef HAVE_GETTEXT */
X-/* #undef HAVE_STPCPY */
X-
X-// Include I/O support for 'long long' and 'unsigned long long'.
X-#define _GLIBCXX_USE_LONG_LONG 1
X-
X-// Include support for 'long double'.
X-/* #undef _GLIBCXX_USE_LONG_DOUBLE */
X-
X-// Define if C99 math functions (like fpclassify) should be exposed.
X-#define _GLIBCXX_USE_C99_MATH 1
X-
X-// Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
X-#define _GLIBCXX_USE_C99 1
X-
X-// Define if code specialized for wchar_t should be used.
X-#define _GLIBCXX_USE_WCHAR_T 1
X-
X-// Define if using setrlimit to limit memory usage during 'make check'.
X-#define _GLIBCXX_MEM_LIMITS 1
X-
X-// Define to use concept checking code from the boost libraries.
X-/* #undef _GLIBCXX_CONCEPT_CHECKS */
X-
X-// Define to use symbol versioning in the shared library.
X-/* #undef _GLIBCXX_SYMVER */
X-
X-// Define symbol versioning in assember directives. If symbol
X-// versioning is beigng used, and the assembler supports this kind of
X-// thing, then use it.
X-// NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4.
X-#if _GLIBCXX_SYMVER
X-  #define _GLIBCXX_ASM_SYMVER(cur, old, version) \
X-   asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version);
X-#else
X-  #define _GLIBCXX_ASM_SYMVER(cur, old, version)
X-#endif
X-
X-// Define if LFS support is available.
X-/* #undef _GLIBCXX_USE_LFS */
X-
X-// Define if a fully dynamic basic_string is wanted.
X-/* #undef _GLIBCXX_FULLY_DYNAMIC_STRING */
X-
X-// Define if NLS translations are to be used.
X-/* #undef _GLIBCXX_USE_NLS */
X-
X-// Define if gthr-default.h exists (meaning that threading support is enabled).
X-#define HAVE_GTHR_DEFAULT 1
X-
X-// Define if the atan2f function exists.
X-#define HAVE_ATAN2F 1
X-
X-// Define if the atan2l function exists.
X-/* #undef HAVE_ATAN2L */
X-
X-// Define if the tanl function exists.
X-/* #undef HAVE_TANL */
X-
X-// Define if the copysignf function exists.
X-#define HAVE_COPYSIGNF 1
X-
X-// Define if getpagesize exists.
X-#define HAVE_GETPAGESIZE 1
X-
X-// Define if setenv exists.
X-#define HAVE_SETENV 1
X-
X-// Define if sigsetjmp exists.
X-#define HAVE_SIGSETJMP 1
X-
X-// Define if mbstate_t exists in wchar.h.
X-#define HAVE_MBSTATE_T 1
X-
X-// Define if you have the modff function.
X-#define HAVE_MODFF 1
X-
X-// Define if you have the modfl function.
X-/* #undef HAVE_MODFL */
X-
X-// Define if you have the expf function.
X-#define HAVE_EXPF 1
X-
X-// Define if you have the expl function.
X-/* #undef HAVE_EXPL */
X-
X-// Define if you have the hypot function.
X-#define HAVE_HYPOT 1
X-
X-// Define if you have the hypotf function.
X-#define HAVE_HYPOTF 1
X-
X-// Define if you have the hypotl function.
X-/* #undef HAVE_HYPOTL */
X-
X-// Define if the compiler/host combination has __builtin_abs
X-#define HAVE___BUILTIN_ABS 1
X-
X-// Define if the compiler/host combination has __builtin_labs
X-#define HAVE___BUILTIN_LABS 1
X-
X-// Define if the compiler/host combination has __builtin_cos
X-#define HAVE___BUILTIN_COS 1
X-
X-// Define if the compiler/host combination has __builtin_cosf
X-#define HAVE___BUILTIN_COSF 1
X-
X-// Define if the compiler/host combination has __builtin_cosl
X-#define HAVE___BUILTIN_COSL 1
X-
X-// Define if the compiler/host combination has __builtin_fabs
X-#define HAVE___BUILTIN_FABS 1
X-
X-// Define if the compiler/host combination has __builtin_fabsf
X-#define HAVE___BUILTIN_FABSF 1
X-
X-// Define if the compiler/host combination has __builtin_fabsl
X-#define HAVE___BUILTIN_FABSL 1
X-
X-// Define if the compiler/host combination has __builtin_sin
X-#define HAVE___BUILTIN_SIN 1
X-
X-// Define if the compiler/host combination has __builtin_sinf
X-#define HAVE___BUILTIN_SINF 1
X-
X-// Define if the compiler/host combination has __builtin_sinl
X-#define HAVE___BUILTIN_SINL 1
X-
X-// Define if the compiler/host combination has __builtin_sqrt
X-#define HAVE___BUILTIN_SQRT 1
X-
X-// Define if the compiler/host combination has __builtin_sqrtf
X-#define HAVE___BUILTIN_SQRTF 1
X-
X-// Define if the compiler/host combination has __builtin_sqrtl
X-#define HAVE___BUILTIN_SQRTL 1
X-
X-// Define if poll is available in <poll.h>.
X-#define HAVE_POLL 1
X-
X-// Define if S_ISREG (Posix) is available in <sys/stat.h>.
X-#define HAVE_S_ISREG 1
X-
X-// Define if S_IFREG is available in <sys/stat.h>.
X-/* #undef HAVE_S_IFREG */
X-
X-// Define if writev is available in <sys/uio.h>.
X-#define HAVE_WRITEV 1
X-
X-// Define if int64_t is available in <stdint.h>.
X-#define HAVE_INT64_T 1
X-
X-// Define if LC_MESSAGES is available in <locale.h>.
X-#define HAVE_LC_MESSAGES 1
X-
X-// Define if <float.h> exists.
X-#define HAVE_FLOAT_H 1
X-
X-// Define if modf is present in <math.h>
X-/* #undef HAVE_MODF */
X-
X 
X /* Define to 1 if you have the `acosf' function. */
X #define HAVE_ACOSF 1
X@@ -200,15 +30,15 @@
X /* Define to 1 if you have the `atanl' function. */
X /* #undef HAVE_ATANL */
X 
X-/* Define to 1 if you have the `btowc' function. */
X-#define HAVE_BTOWC 1
X-
X /* Define to 1 if you have the `ceilf' function. */
X #define HAVE_CEILF 1
X 
X /* Define to 1 if you have the `ceill' function. */
X #define HAVE_CEILL 1
X 
X+/* Define to 1 if you have the <complex.h> header file. */
X+#define HAVE_COMPLEX_H 1
X+
X /* Define to 1 if you have the `copysign' function. */
X #define HAVE_COPYSIGN 1
X 
X@@ -245,12 +75,6 @@
X /* Define to 1 if you have the `fabsl' function. */
X #define HAVE_FABSL 1
X 
X-/* Define to 1 if you have the `fgetwc' function. */
X-#define HAVE_FGETWC 1
X-
X-/* Define to 1 if you have the `fgetws' function. */
X-#define HAVE_FGETWS 1
X-
X /* Define to 1 if you have the `finite' function. */
X #define HAVE_FINITE 1
X 
X@@ -278,12 +102,6 @@
X /* Define to 1 if you have the `fpclass' function. */
X /* #undef HAVE_FPCLASS */
X 
X-/* Define to 1 if you have the `fputwc' function. */
X-#define HAVE_FPUTWC 1
X-
X-/* Define to 1 if you have the `fputws' function. */
X-#define HAVE_FPUTWS 1
X-
X /* Define to 1 if you have the <fp.h> header file. */
X /* #undef HAVE_FP_H */
X 
X@@ -293,26 +111,15 @@
X /* Define to 1 if you have the `frexpl' function. */
X #define HAVE_FREXPL 1
X 
X-/* Define to 1 if you have the `fwide' function. */
X-#define HAVE_FWIDE 1
X-
X-/* Define to 1 if you have the `fwprintf' function. */
X-#define HAVE_FWPRINTF 1
X-
X-/* Define to 1 if you have the `fwscanf' function. */
X-#define HAVE_FWSCANF 1
X-
X /* Define to 1 if you have the <gconv.h> header file. */
X /* #undef HAVE_GCONV_H */
X 
X /* Define to 1 if you have the `getpagesize' function. */
X #define HAVE_GETPAGESIZE 1
X 
X-/* Define to 1 if you have the `getwc' function. */
X-#define HAVE_GETWC 1
X-
X-/* Define to 1 if you have the `getwchar' function. */
X-#define HAVE_GETWCHAR 1
X+/* Define if gthr-default.h exists (meaning that threading support is
X+   enabled). */
X+#define HAVE_GTHR_DEFAULT 1
X 
X /* Define to 1 if you have the `hypot' function. */
X #define HAVE_HYPOT 1
X@@ -324,17 +131,20 @@
X /* #undef HAVE_HYPOTL */
X 
X /* Define to 1 if you have the `iconv' function. */
X-#define HAVE_ICONV 1
X+/* #undef HAVE_ICONV */
X 
X /* Define to 1 if you have the `iconv_close' function. */
X-#define HAVE_ICONV_CLOSE 1
X+/* #undef HAVE_ICONV_CLOSE */
X 
X /* Define to 1 if you have the `iconv_open' function. */
X-#define HAVE_ICONV_OPEN 1
X+/* #undef HAVE_ICONV_OPEN */
X 
X /* Define to 1 if you have the <ieeefp.h> header file. */
X #define HAVE_IEEEFP_H 1
X 
X+/* Define if int64_t is available in <stdint.h>. */
X+#define HAVE_INT64_T 1
X+
X /* Define to 1 if you have the <inttypes.h> header file. */
X #define HAVE_INTTYPES_H 1
X 
X@@ -356,9 +166,12 @@
X /* Define to 1 if you have the `isnanl' function. */
X /* #undef HAVE_ISNANL */
X 
X-/* Define to 1 if you have the `iswblank' function. */
X+/* Defined if iswblank exists. */
X #define HAVE_ISWBLANK 1
X 
X+/* Define if LC_MESSAGES is available in <locale.h>. */
X+#define HAVE_LC_MESSAGES 1
X+
X /* Define to 1 if you have the `ldexpf' function. */
X #define HAVE_LDEXPF 1
X 
X@@ -407,17 +220,8 @@
X /* Define to 1 if you have the <machine/param.h> header file. */
X #define HAVE_MACHINE_PARAM_H 1
X 
X-/* Define to 1 if you have the `mbrlen' function. */
X-#define HAVE_MBRLEN 1
X-
X-/* Define to 1 if you have the `mbrtowc' function. */
X-#define HAVE_MBRTOWC 1
X-
X-/* Define to 1 if you have the `mbsinit' function. */
X-#define HAVE_MBSINIT 1
X-
X-/* Define to 1 if you have the `mbsrtowcs' function. */
X-#define HAVE_MBSRTOWCS 1
X+/* Define if mbstate_t exists in wchar.h. */
X+#define HAVE_MBSTATE_T 1
X 
X /* Define to 1 if you have the <memory.h> header file. */
X #define HAVE_MEMORY_H 1
X@@ -425,6 +229,9 @@
X /* Define to 1 if you have a working `mmap' system call. */
X #define HAVE_MMAP 1
X 
X+/* Define to 1 if you have the `modf' function. */
X+#define HAVE_MODF 1
X+
X /* Define to 1 if you have the `modff' function. */
X #define HAVE_MODFF 1
X 
X@@ -437,18 +244,15 @@
X /* Define to 1 if you have the `nl_langinfo' function. */
X #define HAVE_NL_LANGINFO 1
X 
X+/* Define if poll is available in <poll.h>. */
X+#define HAVE_POLL 1
X+
X /* Define to 1 if you have the `powf' function. */
X #define HAVE_POWF 1
X 
X /* Define to 1 if you have the `powl' function. */
X /* #undef HAVE_POWL */
X 
X-/* Define to 1 if you have the `putwc' function. */
X-#define HAVE_PUTWC 1
X-
X-/* Define to 1 if you have the `putwchar' function. */
X-#define HAVE_PUTWCHAR 1
X-
X /* Define to 1 if you have the `qfpclass' function. */
X /* #undef HAVE_QFPCLASS */
X 
X@@ -503,18 +307,15 @@
X /* Define to 1 if you have the `strtold' function. */
X #define HAVE_STRTOLD 1
X 
X-/* Define to 1 if you have the `swprintf' function. */
X-#define HAVE_SWPRINTF 1
X-
X-/* Define to 1 if you have the `swscanf' function. */
X-#define HAVE_SWSCANF 1
X-
X /* Define to 1 if you have the <sys/filio.h> header file. */
X #define HAVE_SYS_FILIO_H 1
X 
X /* Define to 1 if you have the <sys/ioctl.h> header file. */
X #define HAVE_SYS_IOCTL_H 1
X 
X+/* Define to 1 if you have the <sys/ipc.h> header file. */
X+#define HAVE_SYS_IPC_H 1
X+
X /* Define to 1 if you have the <sys/isa_defs.h> header file. */
X /* #undef HAVE_SYS_ISA_DEFS_H */
X 
X@@ -527,6 +328,9 @@
X /* Define to 1 if you have the <sys/resource.h> header file. */
X #define HAVE_SYS_RESOURCE_H 1
X 
X+/* Define to 1 if you have the <sys/sem.h> header file. */
X+#define HAVE_SYS_SEM_H 1
X+
X /* Define to 1 if you have the <sys/stat.h> header file. */
X #define HAVE_SYS_STAT_H 1
X 
X@@ -539,6 +343,12 @@
X /* Define to 1 if you have the <sys/uio.h> header file. */
X #define HAVE_SYS_UIO_H 1
X 
X+/* Define if S_IFREG is available in <sys/stat.h>. */
X+/* #undef HAVE_S_IFREG */
X+
X+/* Define if S_IFREG is available in <sys/stat.h>. */
X+#define HAVE_S_ISREG 1
X+
X /* Define to 1 if you have the `tanf' function. */
X #define HAVE_TANF 1
X 
X@@ -551,136 +361,38 @@
X /* Define to 1 if you have the `tanl' function. */
X /* #undef HAVE_TANL */
X 
X-/* Define to 1 if you have the `ungetwc' function. */
X-#define HAVE_UNGETWC 1
X+#if !defined(__sparc64__) && !defined(__arm__)
X+/* Define to 1 if the target supports thread-local storage. */
X+#define HAVE_TLS 1
X+#endif
X 
X /* Define to 1 if you have the <unistd.h> header file. */
X #define HAVE_UNISTD_H 1
X 
X-/* Define to 1 if you have the `vfwprintf' function. */
X-#define HAVE_VFWPRINTF 1
X-
X #if __ISO_C_VISIBLE >= 1999
X-/* Define to 1 if you have the `vfwscanf' function. */
X+/* Defined if vfwscanf exists. */
X #define HAVE_VFWSCANF 1
X-#endif
X-
X-/* Define to 1 if you have the `vswprintf' function. */
X-#define HAVE_VSWPRINTF 1
X 
X-#if __ISO_C_VISIBLE >= 1999
X-/* Define to 1 if you have the `vswscanf' function. */
X+/* Defined if vswscanf exists. */
X #define HAVE_VSWSCANF 1
X-#endif
X 
X-/* Define to 1 if you have the `vwprintf' function. */
X-#define HAVE_VWPRINTF 1
X-
X-#if __ISO_C_VISIBLE >= 1999
X-/* Define to 1 if you have the `vwscanf' function. */
X+/* Defined if vwscanf exists. */
X #define HAVE_VWSCANF 1
X-#endif
X+#endif /* __ISO_C_VISIBLE >= 1999 */
X 
X /* Define to 1 if you have the <wchar.h> header file. */
X #define HAVE_WCHAR_H 1
X 
X-/* Define to 1 if you have the `wcrtomb' function. */
X-#define HAVE_WCRTOMB 1
X-
X-/* Define to 1 if you have the `wcscat' function. */
X-#define HAVE_WCSCAT 1
X-
X-/* Define to 1 if you have the `wcschr' function. */
X-#define HAVE_WCSCHR 1
X-
X-/* Define to 1 if you have the `wcscmp' function. */
X-#define HAVE_WCSCMP 1
X-
X-/* Define to 1 if you have the `wcscoll' function. */
X-#define HAVE_WCSCOLL 1
X-
X-/* Define to 1 if you have the `wcscpy' function. */
X-#define HAVE_WCSCPY 1
X-
X-/* Define to 1 if you have the `wcscspn' function. */
X-#define HAVE_WCSCSPN 1
X-
X-/* Define to 1 if you have the `wcsftime' function. */
X-#define HAVE_WCSFTIME 1
X-
X-/* Define to 1 if you have the `wcslen' function. */
X-#define HAVE_WCSLEN 1
X-
X-/* Define to 1 if you have the `wcsncat' function. */
X-#define HAVE_WCSNCAT 1
X-
X-/* Define to 1 if you have the `wcsncmp' function. */
X-#define HAVE_WCSNCMP 1
X-
X-/* Define to 1 if you have the `wcsncpy' function. */
X-#define HAVE_WCSNCPY 1
X-
X-/* Define to 1 if you have the `wcspbrk' function. */
X-#define HAVE_WCSPBRK 1
X-
X-/* Define to 1 if you have the `wcsrchr' function. */
X-#define HAVE_WCSRCHR 1
X-
X-/* Define to 1 if you have the `wcsrtombs' function. */
X-#define HAVE_WCSRTOMBS 1
X-
X-/* Define to 1 if you have the `wcsspn' function. */
X-#define HAVE_WCSSPN 1
X-
X-/* Define to 1 if you have the `wcsstr' function. */
X-#define HAVE_WCSSTR 1
X-
X-/* Define to 1 if you have the `wcstod' function. */
X-#define HAVE_WCSTOD 1
X-
X #if __ISO_C_VISIBLE >= 1999
X-/* Define to 1 if you have the `wcstof' function. */
X+/* Defined if wcstof exists. */
X #define HAVE_WCSTOF 1
X-#endif
X-
X-/* Define to 1 if you have the `wcstok' function. */
X-#define HAVE_WCSTOK 1
X-
X-/* Define to 1 if you have the `wcstol' function. */
X-#define HAVE_WCSTOL 1
X-
X-/* Define to 1 if you have the `wcstoul' function. */
X-#define HAVE_WCSTOUL 1
X-
X-/* Define to 1 if you have the `wcsxfrm' function. */
X-#define HAVE_WCSXFRM 1
X-
X-/* Define to 1 if you have the `wctob' function. */
X-#define HAVE_WCTOB 1
X+#endif /* __ISO_C_VISIBLE >= 1999 */
X 
X /* Define to 1 if you have the <wctype.h> header file. */
X #define HAVE_WCTYPE_H 1
X 
X-/* Define to 1 if you have the `wmemchr' function. */
X-#define HAVE_WMEMCHR 1
X-
X-/* Define to 1 if you have the `wmemcmp' function. */
X-#define HAVE_WMEMCMP 1
X-
X-/* Define to 1 if you have the `wmemcpy' function. */
X-#define HAVE_WMEMCPY 1
X-
X-/* Define to 1 if you have the `wmemmove' function. */
X-#define HAVE_WMEMMOVE 1
X-
X-/* Define to 1 if you have the `wmemset' function. */
X-#define HAVE_WMEMSET 1
X-
X-/* Define to 1 if you have the `wprintf' function. */
X-#define HAVE_WPRINTF 1
X-
X-/* Define to 1 if you have the `wscanf' function. */
X-#define HAVE_WSCANF 1
X+/* Define if writev is available in <sys/uio.h>. */
X+#define HAVE_WRITEV 1
X 
X /* Define to 1 if you have the `_acosf' function. */
X /* #undef HAVE__ACOSF */
X@@ -817,6 +529,9 @@
X /* Define to 1 if you have the `_logl' function. */
X /* #undef HAVE__LOGL */
X 
X+/* Define to 1 if you have the `_modf' function. */
X+/* #undef HAVE__MODF */
X+
X /* Define to 1 if you have the `_modff' function. */
X /* #undef HAVE__MODFF */
X 
X@@ -871,6 +586,48 @@
X /* Define to 1 if you have the `_tanl' function. */
X /* #undef HAVE__TANL */
X 
X+/* Define if the compiler/host combination has __builtin_abs. */
X+#define HAVE___BUILTIN_ABS 1
X+
X+/* Define if the compiler/host combination has __builtin_cos. */
X+#define HAVE___BUILTIN_COS 1
X+
X+/* Define if the compiler/host combination has __builtin_cosf. */
X+#define HAVE___BUILTIN_COSF 1
X+
X+/* Define if the compiler/host combination has __builtin_cosl. */
X+#define HAVE___BUILTIN_COSL 1
X+
X+/* Define if the compiler/host combination has __builtin_fabs. */
X+#define HAVE___BUILTIN_FABS 1
X+
X+/* Define if the compiler/host combination has __builtin_fabsf. */
X+#define HAVE___BUILTIN_FABSF 1
X+
X+/* Define if the compiler/host combination has __builtin_fabsl. */
X+#define HAVE___BUILTIN_FABSL 1
X+
X+/* Define if the compiler/host combination has __builtin_labs. */
X+#define HAVE___BUILTIN_LABS 1
X+
X+/* Define if the compiler/host combination has __builtin_sin. */
X+#define HAVE___BUILTIN_SIN 1
X+
X+/* Define if the compiler/host combination has __builtin_sinf. */
X+#define HAVE___BUILTIN_SINF 1
X+
X+/* Define if the compiler/host combination has __builtin_sinl. */
X+#define HAVE___BUILTIN_SINL 1
X+
X+/* Define if the compiler/host combination has __builtin_sqrt. */
X+#define HAVE___BUILTIN_SQRT 1
X+
X+/* Define if the compiler/host combination has __builtin_sqrtf. */
X+#define HAVE___BUILTIN_SQRTF 1
X+
X+/* Define if the compiler/host combination has __builtin_sqrtl. */
X+#define HAVE___BUILTIN_SQRTL 1
X+
X /* Define to 1 if you have the `__signbit' function. */
X #define HAVE___SIGNBIT 1
X 
X@@ -880,6 +637,9 @@
X /* Define to 1 if you have the `__signbitl' function. */
X #define HAVE___SIGNBITL 1
X 
X+/* Name of package */
X+/* #undef PACKAGE */
X+
X /* Define to the address where bug reports for this package should be sent. */
X #define PACKAGE_BUGREPORT ""
X 
X@@ -898,59 +658,64 @@
X /* Define to 1 if you have the ANSI C header files. */
X #define STDC_HEADERS 1
X 
X+/* Version number of package */
X+/* #undef VERSION */
X+
X+/* Define to use concept checking code from the boost libraries. */
X+/* #undef _GLIBCXX_CONCEPT_CHECKS */
X+
X+/* Define if a fully dynamic basic_string is wanted. */
X+/* #undef _GLIBCXX_FULLY_DYNAMIC_STRING */
X+
X /* Define to 1 if a full hosted library is built, or 0 if freestanding. */
X #define _GLIBCXX_HOSTED 1
X 
X-/* Define if the compiler is configured for setjmp/longjmp exceptions. */
X-/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */
X-//
X-// Systems that have certain non-standard functions prefixed with an
X-// underscore, we'll handle those here. Must come after config.h.in.
X-//
X-#if defined (HAVE__ISNAN) && ! defined (HAVE_ISNAN)
X-# define HAVE_ISNAN 1
X-# define isnan _isnan
X+#if !defined(__LP64__)
X+/* Define if ptrdiff_t is int. */
X+#define _GLIBCXX_PTRDIFF_T_IS_INT 1
X #endif
X 
X-#if defined (HAVE__ISNANF) && ! defined (HAVE_ISNANF)
X-# define HAVE_ISNANF 1
X-# define isnanf _isnanf
X-#endif
X+/* Define if using setrlimit to set resource limits during "make check" */
X+#define _GLIBCXX_RES_LIMITS 1
X 
X-#if defined (HAVE__ISNANL) && ! defined (HAVE_ISNANL)
X-# define HAVE_ISNANL 1
X-# define isnanl _isnanl
X+/* Define if size_t is unsigned int. */
X+#if !defined(__LP64__)
X+#define _GLIBCXX_SIZE_T_IS_UINT  1
X #endif
X 
X-#if defined (HAVE__ISINF) && ! defined (HAVE_ISINF)
X-# define HAVE_ISINF 1
X-# define isinf _isinf
X-#endif
X+/* Define if the compiler is configured for setjmp/longjmp exceptions. */
X+/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */
X 
X-#if defined (HAVE__ISINFF) && ! defined (HAVE_ISINFF)
X-# define HAVE_ISINFF 1
X-# define isinff _isinff
X-#endif
X+/* Define to use GNU symbol versioning in the shared library. */
X+#define _GLIBCXX_SYMVER 1
X 
X-#if defined (HAVE__ISINFL) && ! defined (HAVE_ISINFL)
X-# define HAVE_ISINFL 1
X-# define isinfl _isinfl
X-#endif
X+/* Define if C99 functions or macros from <wchar.h>, <math.h>, <complex.h>,
X+   <stdio.h>, and <stdlib.h> can be used or exposed. */
X+/* #undef _GLIBCXX_USE_C99 */
X+
X+/* Define if C99 functions in <complex.h> should be used in <complex>. Using
X+   compiler builtins for these functions requires corresponding C99 library
X+   functions to be present. */
X+/* #undef _GLIBCXX_USE_C99_COMPLEX */
X 
X-#if defined (HAVE__COPYSIGN) && ! defined (HAVE_COPYSIGN)
X-# define HAVE_COPYSIGN 1
X-# define copysign _copysign
X-#endif
X+/* Define if C99 functions or macros in <math.h> should be imported in <cmath>
X+   in namespace std. */
X+#define _GLIBCXX_USE_C99_MATH 1
X 
X-#if defined (HAVE__COPYSIGNL) && ! defined (HAVE_COPYSIGNL)
X-# define HAVE_COPYSIGNL 1
X-# define copysignl _copysignl
X-#endif
X+/* Define if iconv and related functions exist and are usable. */
X+#define _GLIBCXX_USE_ICONV 1
X 
X-#if defined (HAVE__COSF) && ! defined (HAVE_COSF)
X-# define HAVE_COSF 1
X-# define cosf _cosf
X-#endif
X+/* Define if LFS support is available. */
X+/* #undef _GLIBCXX_USE_LFS */
X+
X+/* Define if code specialized for long long should be used. */
X+#define _GLIBCXX_USE_LONG_LONG 1
X+
X+/* Define if NLS translations are to be used. */
X+/* #undef _GLIBCXX_USE_NLS */
X+
X+/* Define if code specialized for wchar_t should be used. */
X+#define _GLIBCXX_USE_WCHAR_T 1
X 
X #if defined (HAVE__ACOSF) && ! defined (HAVE_ACOSF)
X # define HAVE_ACOSF 1
X@@ -972,6 +737,16 @@
X # define asinl _asinl
X #endif
X 
X+#if defined (HAVE__ATAN2F) && ! defined (HAVE_ATAN2F)
X+# define HAVE_ATAN2F 1
X+# define atan2f _atan2f
X+#endif
X+
X+#if defined (HAVE__ATAN2L) && ! defined (HAVE_ATAN2L)
X+# define HAVE_ATAN2L 1
X+# define atan2l _atan2l
X+#endif
X+
X #if defined (HAVE__ATANF) && ! defined (HAVE_ATANF)
X # define HAVE_ATANF 1
X # define atanf _atanf
X@@ -984,27 +759,32 @@
X 
X #if defined (HAVE__CEILF) && ! defined (HAVE_CEILF)
X # define HAVE_CEILF 1
X-# define aceil _ceilf
X+# define ceilf _ceilf
X #endif
X 
X #if defined (HAVE__CEILL) && ! defined (HAVE_CEILL)
X # define HAVE_CEILL 1
X-# define aceil _ceill
X+# define ceill _ceill
X #endif
X 
X-#if defined (HAVE__COSHF) && ! defined (HAVE_COSHF)
X-# define HAVE_COSHF 1
X-# define coshf _coshf
X+#if defined (HAVE__COPYSIGN) && ! defined (HAVE_COPYSIGN)
X+# define HAVE_COPYSIGN 1
X+# define copysign _copysign
X #endif
X 
X-#if defined (HAVE__COSL) && ! defined (HAVE_COSL)
X-# define HAVE_COSL 1
X-# define cosl _cosl
X+#if defined (HAVE__COPYSIGNL) && ! defined (HAVE_COPYSIGNL)
X+# define HAVE_COPYSIGNL 1
X+# define copysignl _copysignl
X #endif
X 
X-#if defined (HAVE__LOGF) && ! defined (HAVE_LOGF)
X-# define HAVE_LOGF 1
X-# define logf _logf
X+#if defined (HAVE__COSF) && ! defined (HAVE_COSF)
X+# define HAVE_COSF 1
X+# define cosf _cosf
X+#endif
X+
X+#if defined (HAVE__COSHF) && ! defined (HAVE_COSHF)
X+# define HAVE_COSHF 1
X+# define coshf _coshf
X #endif
X 
X #if defined (HAVE__COSHL) && ! defined (HAVE_COSHL)
X@@ -1012,6 +792,11 @@
X # define coshl _coshl
X #endif
X 
X+#if defined (HAVE__COSL) && ! defined (HAVE_COSL)
X+# define HAVE_COSL 1
X+# define cosl _cosl
X+#endif
X+
X #if defined (HAVE__EXPF) && ! defined (HAVE_EXPF)
X # define HAVE_EXPF 1
X # define expf _expf
X@@ -1032,6 +817,21 @@
X # define fabsl _fabsl
X #endif
X 
X+#if defined (HAVE__FINITE) && ! defined (HAVE_FINITE)
X+# define HAVE_FINITE 1
X+# define finite _finite
X+#endif
X+
X+#if defined (HAVE__FINITEF) && ! defined (HAVE_FINITEF)
X+# define HAVE_FINITEF 1
X+# define finitef _finitef
X+#endif
X+
X+#if defined (HAVE__FINITEL) && ! defined (HAVE_FINITEL)
X+# define HAVE_FINITEL 1
X+# define finitel _finitel
X+#endif
X+
X #if defined (HAVE__FLOORF) && ! defined (HAVE_FLOORF)
X # define HAVE_FLOORF 1
X # define floorf _floorf
X@@ -1052,6 +852,11 @@
X # define fmodl _fmodl
X #endif
X 
X+#if defined (HAVE__FPCLASS) && ! defined (HAVE_FPCLASS)
X+# define HAVE_FPCLASS 1
X+# define fpclass _fpclass
X+#endif
X+
X #if defined (HAVE__FREXPF) && ! defined (HAVE_FREXPF)
X # define HAVE_FREXPF 1
X # define frexpf _frexpf
X@@ -1062,6 +867,51 @@
X # define frexpl _frexpl
X #endif
X 
X+#if defined (HAVE__HYPOT) && ! defined (HAVE_HYPOT)
X+# define HAVE_HYPOT 1
X+# define hypot _hypot
X+#endif
X+
X+#if defined (HAVE__HYPOTF) && ! defined (HAVE_HYPOTF)
X+# define HAVE_HYPOTF 1
X+# define hypotf _hypotf
X+#endif
X+
X+#if defined (HAVE__HYPOTL) && ! defined (HAVE_HYPOTL)
X+# define HAVE_HYPOTL 1
X+# define hypotl _hypotl
X+#endif
X+
X+#if defined (HAVE__ISINF) && ! defined (HAVE_ISINF)
X+# define HAVE_ISINF 1
X+# define isinf _isinf
X+#endif
X+
X+#if defined (HAVE__ISINFF) && ! defined (HAVE_ISINFF)
X+# define HAVE_ISINFF 1
X+# define isinff _isinff
X+#endif
X+
X+#if defined (HAVE__ISINFL) && ! defined (HAVE_ISINFL)
X+# define HAVE_ISINFL 1
X+# define isinfl _isinfl
X+#endif
X+
X+#if defined (HAVE__ISNAN) && ! defined (HAVE_ISNAN)
X+# define HAVE_ISNAN 1
X+# define isnan _isnan
X+#endif
X+
X+#if defined (HAVE__ISNANF) && ! defined (HAVE_ISNANF)
X+# define HAVE_ISNANF 1
X+# define isnanf _isnanf
X+#endif
X+
X+#if defined (HAVE__ISNANL) && ! defined (HAVE_ISNANL)
X+# define HAVE_ISNANL 1
X+# define isnanl _isnanl
X+#endif
X+
X #if defined (HAVE__LDEXPF) && ! defined (HAVE_LDEXPF)
X # define HAVE_LDEXPF 1
X # define ldexpf _ldexpf
X@@ -1077,29 +927,64 @@
X # define log10f _log10f
X #endif
X 
X+#if defined (HAVE__LOG10L) && ! defined (HAVE_LOG10L)
X+# define HAVE_LOG10L 1
X+# define log10l _log10l
X+#endif
X+
X+#if defined (HAVE__LOGF) && ! defined (HAVE_LOGF)
X+# define HAVE_LOGF 1
X+# define logf _logf
X+#endif
X+
X #if defined (HAVE__LOGL) && ! defined (HAVE_LOGL)
X # define HAVE_LOGL 1
X # define logl _logl
X #endif
X 
X+#if defined (HAVE__MODF) && ! defined (HAVE_MODF)
X+# define HAVE_MODF 1
X+# define modf _modf
X+#endif
X+
X+#if defined (HAVE__MODFF) && ! defined (HAVE_MODFF)
X+# define HAVE_MODFF 1
X+# define modff _modff
X+#endif
X+
X+#if defined (HAVE__MODFL) && ! defined (HAVE_MODFL)
X+# define HAVE_MODFL 1
X+# define modfl _modfl
X+#endif
X+
X #if defined (HAVE__POWF) && ! defined (HAVE_POWF)
X # define HAVE_POWF 1
X # define powf _powf
X #endif
X 
X-#if defined (HAVE__LOG10L) && ! defined (HAVE_LOG10L)
X-# define HAVE_LOG10L 1
X-# define log10l _log10l
X+#if defined (HAVE__POWL) && ! defined (HAVE_POWL)
X+# define HAVE_POWL 1
X+# define powl _powl
X #endif
X 
X-#if defined (HAVE__MODF) && ! defined (HAVE_MODF)
X-# define HAVE_MODF 1
X-# define modf _modf
X+#if defined (HAVE__QFPCLASS) && ! defined (HAVE_QFPCLASS)
X+# define HAVE_QFPCLASS 1
X+# define qfpclass _qfpclass
X+#endif
X+
X+#if defined (HAVE__SINCOS) && ! defined (HAVE_SINCOS)
X+# define HAVE_SINCOS 1
X+# define sincos _sincos
X+#endif
X+
X+#if defined (HAVE__SINCOSF) && ! defined (HAVE_SINCOSF)
X+# define HAVE_SINCOSF 1
X+# define sincosf _sincosf
X #endif
X 
X-#if defined (HAVE__MODL) && ! defined (HAVE_MODL)
X-# define HAVE_MODL 1
X-# define modl _modl
X+#if defined (HAVE__SINCOSL) && ! defined (HAVE_SINCOSL)
X+# define HAVE_SINCOSL 1
X+# define sincosl _sincosl
X #endif
X 
X #if defined (HAVE__SINF) && ! defined (HAVE_SINF)
X@@ -1107,16 +992,16 @@
X # define sinf _sinf
X #endif
X 
X-#if defined (HAVE__POWL) && ! defined (HAVE_POWL)
X-# define HAVE_POWL 1
X-# define powl _powl
X-#endif
X-
X #if defined (HAVE__SINHF) && ! defined (HAVE_SINHF)
X # define HAVE_SINHF 1
X # define sinhf _sinhf
X #endif
X 
X+#if defined (HAVE__SINHL) && ! defined (HAVE_SINHL)
X+# define HAVE_SINHL 1
X+# define sinhl _sinhl
X+#endif
X+
X #if defined (HAVE__SINL) && ! defined (HAVE_SINL)
X # define HAVE_SINL 1
X # define sinl _sinl
X@@ -1127,88 +1012,37 @@
X # define sqrtf _sqrtf
X #endif
X 
X-#if defined (HAVE__SINHL) && ! defined (HAVE_SINHL)
X-# define HAVE_SINHL 1
X-# define sinhl _sinhl
X-#endif
X-
X-#if defined (HAVE__TANF) && ! defined (HAVE_TANF)
X-# define HAVE_TANF 1
X-# define tanf _tanf
X-#endif
X-
X #if defined (HAVE__SQRTL) && ! defined (HAVE_SQRTL)
X # define HAVE_SQRTL 1
X # define sqrtl _sqrtl
X #endif
X 
X-#if defined (HAVE__TANHF) && ! defined (HAVE_TANHF)
X-# define HAVE_TANHF 1
X-# define tanhf _tanhf
X-#endif
X-
X-#if defined (HAVE__TANL) && ! defined (HAVE_TANL)
X-# define HAVE_TANF 1
X-# define tanf _tanf
X-#endif
X-
X #if defined (HAVE__STRTOF) && ! defined (HAVE_STRTOF)
X # define HAVE_STRTOF 1
X # define strtof _strtof
X #endif
X 
X-#if defined (HAVE__TANHL) && ! defined (HAVE_TANHL)
X-# define HAVE_TANHL 1
X-# define tanhl _tanhl
X-#endif
X-
X #if defined (HAVE__STRTOLD) && ! defined (HAVE_STRTOLD)
X # define HAVE_STRTOLD 1
X # define strtold _strtold
X #endif
X 
X-#if defined (HAVE__SINCOS) && ! defined (HAVE_SINCOS)
X-# define HAVE_SINCOS 1
X-# define sincos _sincos
X-#endif
X-
X-#if defined (HAVE__SINCOSF) && ! defined (HAVE_SINCOSF)
X-# define HAVE_SINCOSF 1
X-# define sincosf _sincosf
X-#endif
X-
X-#if defined (HAVE__SINCOSL) && ! defined (HAVE_SINCOSL)
X-# define HAVE_SINCOSL 1
X-# define sincosl _sincosl
X-#endif
X-
X-#if defined (HAVE__FINITE) && ! defined (HAVE_FINITE)
X-# define HAVE_FINITE 1
X-# define finite _finite
X-#endif
X-
X-#if defined (HAVE__FINITEF) && ! defined (HAVE_FINITEF)
X-# define HAVE_FINITEF 1
X-# define finitef _finitef
X-#endif
X-
X-#if defined (HAVE__FINITEL) && ! defined (HAVE_FINITEL)
X-# define HAVE_FINITEL 1
X-# define finitel _finitel
X+#if defined (HAVE__TANF) && ! defined (HAVE_TANF)
X+# define HAVE_TANF 1
X+# define tanf _tanf
X #endif
X 
X-#if defined (HAVE__QFINITE) && ! defined (HAVE_QFINITE)
X-# define HAVE_QFINITE 1
X-# define qfinite _qfinite
X+#if defined (HAVE__TANHF) && ! defined (HAVE_TANHF)
X+# define HAVE_TANHF 1
X+# define tanhf _tanhf
X #endif
X 
X-#if defined (HAVE__FPCLASS) && ! defined (HAVE_FPCLASS)
X-# define HAVE_FPCLASS 1
X-# define fpclass _fpclass
X+#if defined (HAVE__TANHL) && ! defined (HAVE_TANHL)
X+# define HAVE_TANHL 1
X+# define tanhl _tanhl
X #endif
X 
X-#if defined (HAVE__QFPCLASS) && ! defined (HAVE_QFPCLASS)
X-# define HAVE_QFPCLASS 1
X-# define qfpclass _qfpclass
X+#if defined (HAVE__TANL) && ! defined (HAVE_TANL)
X+# define HAVE_TANL 1
X+# define tanl _tanl
X #endif
X-
XIndex: gnu/lib/libsupc++/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libsupc++/Makefile,v
Xretrieving revision 1.8
Xdiff -u -r1.8 Makefile
X--- gnu/lib/libsupc++/Makefile	19 Aug 2006 00:52:54 -0000	1.8
X+++ gnu/lib/libsupc++/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,14 +1,15 @@
X # $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.8 2006/08/19 00:52:54 kan Exp $
X 
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X SRCDIR=	${.CURDIR}/../../../contrib/libstdc++/libsupc++
X 
X-.PATH: ${SRCDIR} ${GCCDIR}
X+.PATH: ${SRCDIR} ${GCCLIB}/libiberty 
X 
X # Static only.
X LIB=	supc++
X-SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc \
X-	eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc \
X+SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \
X+	eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \
X 	eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \
X 	eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \
X 	new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \
X@@ -18,12 +19,19 @@
X SRCS+=	cp-demangle.c
X 
X CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
X-CFLAGS+=	-I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++
X+CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR} -I${GCCDIR}
X+CFLAGS+=	-I${.CURDIR}/../libstdc++ -I.
X CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
X CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
X 
X HDRS=	exception new typeinfo cxxabi.h exception_defines.h
X INCS=	${HDRS:S;^;${SRCDIR}/;}
X-INCSDIR=${INCLUDEDIR}/c++/3.4
X+INCSDIR=${INCLUDEDIR}/c++/4.1
X+
X+unwind.h: ${GCCDIR}/unwind-generic.h
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+SRCS+=		unwind.h
X+CLEANFILES+=	unwind.h
X 
X .include <bsd.lib.mk>
XIndex: gnu/usr.bin/cc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/Makefile,v
Xretrieving revision 1.40
Xdiff -u -r1.40 Makefile
X--- gnu/usr.bin/cc/Makefile	21 Mar 2006 08:59:36 -0000	1.40
X+++ gnu/usr.bin/cc/Makefile	4 Apr 2007 15:37:18 -0000
X@@ -5,7 +5,7 @@
X # The order of some of these are rather important.  Some depend on previous
X # subdirs.
X 
X-SUBDIR= cc_tools cc_int cc cc1 include protoize doc
X+SUBDIR= cc_tools libiberty libcpp cc_int cc cc1 include doc #protoize
X 
X .if ${MK_CPP} != "no"
X SUBDIR+= cpp
X@@ -13,19 +13,12 @@
X 
X .if ${MK_CXX} != "no"
X SUBDIR+= cc1plus c++ c++filt
X-#.if ${MK_COLLECT2} != "no"
X-#SUBDIR+= collect2
X-#.endif
X .endif
X 
X .if ${MK_OBJC} != "no"
X SUBDIR+= cc1obj
X .endif
X 
X-.if ${MK_FORTRAN} != "no"
X-SUBDIR+= f77 f771 f77doc
X-.endif
X-
X .if ${MK_GCOV} != "no"
X SUBDIR+= gcov
X .endif
XIndex: gnu/usr.bin/cc/Makefile.fe
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/Makefile.fe,v
Xretrieving revision 1.4
Xdiff -u -r1.4 Makefile.fe
X--- gnu/usr.bin/cc/Makefile.fe	12 Mar 2007 00:28:06 -0000	1.4
X+++ gnu/usr.bin/cc/Makefile.fe	14 Mar 2007 00:56:13 -0000
X@@ -2,14 +2,15 @@
X 
X #	Front-end-only bits
X 
X-GCC_VERSION!=	sed -n /version_string/p ${GCCDIR}/version.c | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'
X+.include "Makefile.ver"
X 
X #
X # These were previously defined in gcc.c.  Just copy previous values from
X # there. We ifdef most of them out for FREEBSD_NATIVE builds anyway.
X # gcc.c won't compile without them though.
X DRIVER_DEFINES = \
X-	-DDEFAULT_TARGET_VERSION=\"$(GCC_VERSION)\" \
X-	-DDEFAULT_TARGET_MACHINE=\"$(GCC_TARGET)\" \
X+	-DDEFAULT_TARGET_VERSION=\"$(BASEVER)\" \
X+	-DDEFAULT_TARGET_MACHINE=\"$(GCC_TARGET)\"  \
X+	-DENABLE_SHARED_LIBGCC
X 
X CFLAGS+= ${DRIVER_DEFINES}
XIndex: gnu/usr.bin/cc/Makefile.inc
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/Makefile.inc,v
Xretrieving revision 1.65
Xdiff -u -r1.65 Makefile.inc
X--- gnu/usr.bin/cc/Makefile.inc	12 Mar 2007 00:28:06 -0000	1.65
X+++ gnu/usr.bin/cc/Makefile.inc	4 Apr 2007 15:38:04 -0000
X@@ -7,15 +7,12 @@
X __CC_MAKEFILE_INC__= ${MFILE}
X 
X GCCDIR=	${.CURDIR}/../../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../../contrib/gcclibs
X 
X .include "Makefile.tgt"
X 
X # Machine description.
X-.if ${TARGET_ARCH} == "arm"
X-MD_FILE=	../cc_tools/arm-diked.md
X-.else
X MD_FILE=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md
X-.endif
X GCC_TARGET=	${TARGET_ARCH}-undermydesk-freebsd
X 
X CFLAGS+=	-DIN_GCC -DHAVE_CONFIG_H
X@@ -44,10 +41,24 @@
X # correctly.
X CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
X 
X+CFLAGS+=	-I${GCCLIB}/include -I${GCCLIB}/libcpp/include
X+
X .if exists(${.OBJDIR}/../cc_int)
X-LIBCC_INT=	${.OBJDIR}/../cc_int/libcc_int.a
X+LIBBACKEND=	${.OBJDIR}/../cc_int/libbackend.a
X+.else
X+LIBBACKEND=	${.CURDIR}/../cc_int/libbackend.a
X+.endif
X+
X+.if exists(${.OBJDIR}/../libiberty)
X+LIBIBERTY=	${.OBJDIR}/../libiberty/libiberty.a
X+.else
X+LIBIBERTY=	${.CURDIR}/../libiberty/libiberty.a
X+.endif
X+
X+.if exists(${.OBJDIR}/../libcpp)
X+LIBCPP=		${.OBJDIR}/../libcpp/libcpp.a
X .else
X-LIBCC_INT=	${.CURDIR}/../cc_int/libcc_int.a
X+LIBCPP=		${.CURDIR}/../libcpp/libcpp.a
X .endif
X 
X .endif # !__CC_MAKEFILE_INC__
XIndex: gnu/usr.bin/cc/Makefile.tgt
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/Makefile.tgt,v
Xretrieving revision 1.10
Xdiff -u -r1.10 Makefile.tgt
X--- gnu/usr.bin/cc/Makefile.tgt	15 Sep 2006 05:21:06 -0000	1.10
X+++ gnu/usr.bin/cc/Makefile.tgt	17 Dec 2006 06:49:27 -0000
X@@ -1,15 +1,9 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.10 2006/09/15 05:21:06 imp Exp $
X+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8 2004/07/28 05:27:19 kan Exp $
X 
X TARGET_ARCH?=	${MACHINE_ARCH}
X 
X-.if ${TARGET_ARCH} == "alpha"
X-GCC_CPU=	alpha
X-.elif ${TARGET_ARCH} == "arm"
X+.if ${TARGET_ARCH} == "arm"
X GCC_CPU=	arm
X-# TARGET_CPU_DEFAULT= TARGET_CPU_xscale
X-.if defined(TARGET_BIG_ENDIAN)
X-CFLAGS+=	-DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
X-.endif
X .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
X GCC_CPU=	i386
X .elif ${TARGET_ARCH} == "ia64"
XIndex: gnu/usr.bin/cc/c++/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/c++/Makefile,v
Xretrieving revision 1.23
Xdiff -u -r1.23 Makefile
X--- gnu/usr.bin/cc/c++/Makefile	21 Dec 2004 08:46:58 -0000	1.23
X+++ gnu/usr.bin/cc/c++/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -11,7 +11,7 @@
X LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
X NO_MAN=
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBBACKEND} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBIBERTY}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/c++filt/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/c++filt/Makefile,v
Xretrieving revision 1.21
Xdiff -u -r1.21 Makefile
X--- gnu/usr.bin/cc/c++filt/Makefile	12 Mar 2007 00:28:06 -0000	1.21
X+++ gnu/usr.bin/cc/c++filt/Makefile	14 Mar 2007 00:58:59 -0000
X@@ -3,7 +3,7 @@
X .include "../Makefile.inc"
X .include "../Makefile.fe"
X 
X-.PATH: ${GCCDIR}
X+.PATH: ${GCCLIB}/libiberty
X 
X PROG=	c++filt
X SRCS=	cp-demangle.c
X@@ -11,7 +11,7 @@
X 
X CFLAGS+= -DSTANDALONE_DEMANGLER -DVERSION=\"$(GCC_VERSION)\"
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBIBERTY}
X+LDADD=	${LIBIBERTY}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc/Makefile,v
Xretrieving revision 1.32
Xdiff -u -r1.32 Makefile
X--- gnu/usr.bin/cc/cc/Makefile	21 Sep 2006 07:52:40 -0000	1.32
X+++ gnu/usr.bin/cc/cc/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,19 +1,20 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.32 2006/09/21 07:52:40 ru Exp $
X+# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.31 2004/12/21 09:59:41 ru Exp $
X 
X .include "../Makefile.inc"
X .include "../Makefile.fe"
X 
X-.PATH: ${GCCDIR} ${GCCDIR}/doc
X+.PATH: ${GCCDIR}
X 
X PROG=	cc
X-MAN=	gcc.1
X+#MAN=	gcc.1
X+NO_MAN=
X SRCS=	gcc.c gccspec.c
X NO_SHARED?=yes
X 
X LINKS=	${BINDIR}/cc ${BINDIR}/gcc
X MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBBACKEND} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBIBERTY}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc1/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc1/Makefile,v
Xretrieving revision 1.34
Xdiff -u -r1.34 Makefile
X--- gnu/usr.bin/cc/cc1/Makefile	21 Dec 2004 09:59:41 -0000	1.34
X+++ gnu/usr.bin/cc/cc1/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -3,31 +3,24 @@
X .include "../Makefile.inc"
X 
X .PATH: ${GCCDIR}
X- 
X+
X PROG=	cc1
X-SRCS=	main.c c-parse+%DIKED.c c-lang.c stub-objc.c
X+SRCS=	main.c c-parser.c c-lang.c
X BINDIR=	/usr/libexec
X NO_MAN=
X NO_SHARED?=yes
X 
X-CFLAGS+= -I.
X-
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X-
X-#-----------------------------------------------------------------------
X-# C parser
X-c-parse+%DIKED.c: c-parse.c
X-	sed -e "s/malloc/xmalloc/g" \
X-	    -e "s/realloc/xrealloc/g" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-c-parse.y: c-parse.in
X-	sed -e "/^@@ifobjc.*/,/^@@end_ifobjc.*/d" \
X-	    -e "/^@@ifc.*/d" -e "/^@@end_ifc.*/d" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-CLEANFILES=	c-parse+%DIKED.c c-parse.c c-parse.y
X-CLEANFILES+=	y.tab.h # we don't use it, but the system YACC rules are naive
X+OBJS+=  ${PROG}-checksum.o
X+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+
X+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
X+${PROG}-dummy:	${DOBJS}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
X+CLEANFILES+=	${PROG}-dummy
X+
X+${PROG}-checksum.c:	${PROG}-dummy
X+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
X+CLEANFILES+=	${PROG}-checksum.c
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc1obj/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc1obj/Makefile,v
Xretrieving revision 1.27
Xdiff -u -r1.27 Makefile
X--- gnu/usr.bin/cc/cc1obj/Makefile	21 Dec 2004 09:59:41 -0000	1.27
X+++ gnu/usr.bin/cc/cc1obj/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -5,31 +5,24 @@
X .PATH: ${GCCDIR}/objc ${GCCDIR}
X 
X PROG=	cc1obj
X-SRCS=	main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c
X+SRCS=	main.c c-parser.c objc-act.c objc-lang.c c-decl.c
X BINDIR=	/usr/libexec
X NO_MAN=
X NO_SHARED?=yes
X 
X CFLAGS+= -I${GCCDIR}/objc -I.
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X-
X-#-----------------------------------------------------------------------
X-# objc parser
X-objc-parse+DIKED.c: objc-parse.c
X-	sed -e "s/malloc/xmalloc/g" \
X-	    -e "s/realloc/xrealloc/g" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-objc-parse.y: c-parse.in
X-	sed -e "/^@@ifc.*/,/^@@end_ifc.*/d" \
X-	    -e "/^@@ifobjc.*/d" -e "/^@@end_ifobjc.*/d" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-CLEANFILES=	objc-parse+DIKED.c objc-parse.c objc-parse.y
X-CLEANFILES+=	y.tab.h # we don't use it, but the system YACC rules are naive
X-
X-#-----------------------------------------------------------------------
X+OBJS+=  ${PROG}-checksum.o
X+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+
X+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
X+${PROG}-dummy:	${DOBJS}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
X+CLEANFILES+=	${PROG}-dummy
X+
X+${PROG}-checksum.c:	${PROG}-dummy
X+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
X+CLEANFILES+=	${PROG}-checksum.c
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc1plus/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc1plus/Makefile,v
Xretrieving revision 1.38
Xdiff -u -r1.38 Makefile
X--- gnu/usr.bin/cc/cc1plus/Makefile	21 Dec 2004 09:59:41 -0000	1.38
X+++ gnu/usr.bin/cc/cc1plus/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -9,7 +9,8 @@
X SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
X 	decl.c decl2.c error.c except.c expr.c dump.c friend.c  init.c lex.c \
X 	mangle.c method.c name-lookup.c parser.c pt.c ptree.c repo.c rtti.c \
X-	search.c semantics.c tree.c typeck.c typeck2.c optimize.c 
X+	search.c semantics.c tree.c typeck.c typeck2.c optimize.c \
X+	cp-objcp-common.c cp-gimplify.c tree-mudflap.c
X 
X BINDIR=	/usr/libexec
X NO_MAN=
X@@ -17,15 +18,24 @@
X 
X CFLAGS+= -I${GCCDIR}/cp -I.
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+OBJS+=	${PROG}-checksum.o
X+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X 
X #-----------------------------------------------------------------------
X # C++ parser
X cfns.h: cfns.gperf
X 	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
X 	    ${.ALLSRC} > ${.TARGET}
X-
X CLEANFILES= cfns.h
X 
X+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
X+${PROG}-dummy:	${DOBJS}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
X+CLEANFILES+=	${PROG}-dummy
X+
X+${PROG}-checksum.c:	${PROG}-dummy
X+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
X+CLEANFILES+=	${PROG}-checksum.c
X+
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc_int/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc_int/Makefile,v
Xretrieving revision 1.50
Xdiff -u -r1.50 Makefile
X--- gnu/usr.bin/cc/cc_int/Makefile	12 Mar 2007 00:28:06 -0000	1.50
X+++ gnu/usr.bin/cc/cc_int/Makefile	4 Apr 2007 15:34:50 -0000
X@@ -1,93 +1,101 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.50 2007/03/12 00:28:06 kan Exp $
X+# $FreeBSD:  $
X 
X .include "../Makefile.inc"
X+.include "../Makefile.ver"
X 
X-.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
X+.PATH: ../cc_tools ${GCCDIR} ${GCCDIR}/config/${GCC_CPU}
X 
X-LIB=		cc_int
X+LIB=	backend
X INTERNALLIB=
X 
X-# Files from libiberty.
X-SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
X-	dyn-string.c fibheap.c getpwd.c getruntime.c hashtab.c hex.c \
X-	lbasename.c make-temp-file.c md5.c obstack.c partition.c pex-unix.c \
X-	physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c
X-
X-# Language-independent files.
X-SRCS+=	alias.c bb-reorder.c bitmap.c builtins.c caller-save.c calls.c \
X-	cfg.c cfganal.c cfgbuild.c cfgcleanup.c cfglayout.c cfgloop.c \
X-	cfgloopanal.c cfgloopmanip.c loop-init.c loop-unswitch.c loop-unroll.c \
X-	cfgrtl.c combine.c conflict.c convert.c coverage.c cse.c cselib.c \
X-	dbxout.c debug.c df.c diagnostic.c dojump.c doloop.c dominance.c \
X-	dwarf2asm.c dwarf2out.c emit-rtl.c except.c explow.c \
X-	expmed.c expr.c final.c flow.c fold-const.c function.c gcse.c \
X-	genrtl.c ggc-common.c global.c graph.c gtype-desc.c \
X-	haifa-sched.c hooks.c ifcvt.c  \
X-	integrate.c intl.c jump.c  langhooks.c lcm.c lists.c local-alloc.c \
X-	loop.c optabs.c options.c opts.c params.c postreload.c predict.c \
X-	print-rtl.c print-tree.c value-prof.c \
X-	profile.c ra.c ra-build.c ra-colorize.c ra-debug.c ra-rewrite.c \
X-	real.c recog.c reg-stack.c regclass.c regmove.c regrename.c \
X-	reload.c reload1.c reorg.c resource.c rtl.c rtlanal.c rtl-error.c \
X-	sbitmap.c sched-deps.c sched-ebb.c sched-rgn.c sched-vis.c sdbout.c \
X-	sibcall.c simplify-rtx.c sreal.c stmt.c stor-layout.c stringpool.c \
X-	targhooks.c timevar.c toplev.c tracer.c tree.c tree-dump.c unroll.c \
X-	varasm.c varray.c version.c vmsdbgout.c xcoffout.c alloc-pool.c \
X-	et-forest.c cfghooks.c bt-load.c pretty-print.c ggc-page.c web.c
X-
X-# Miscellaneous files.
X-SRCS+=	hashtable.c tree-inline.c tree-optimize.c cgraph.c cgraphunit.c
X-
X-# Host hooks.
X-SRCS+=	host-default.c
X-
X-# C and ObjC files.
X-SRCS+=	attribs.c c-errors.c c-lex.c c-pragma.c c-decl.c c-typeck.c \
X-	c-convert.c c-aux-info.c c-common.c c-opts.c c-format.c c-semantics.c \
X-	c-incpath.c cppdefault.c c-ppoutput.c c-cppbuiltin.c prefix.c \
X-	c-objc-common.c c-dump.c c-pch.c
X+EXTRA_OBJS=
X+GGC=		ggc-page.o
X+host_hook_obj=	host-default.o
X+
X+#
X+# Most lists copied verbatim from GCC Makefiles.
X+#
X+OBJS-common = \
X+ tree-chrec.o tree-scalar-evolution.o tree-data-ref.o                      \
X+ tree-cfg.o tree-dfa.o tree-eh.o tree-ssa.o tree-optimize.o tree-gimple.o  \
X+ gimplify.o tree-pretty-print.o tree-into-ssa.o                            \
X+ tree-outof-ssa.o tree-ssa-ccp.o tree-vn.o tree-ssa-uncprop.o              \
X+ tree-ssa-dce.o  tree-ssa-copy.o tree-nrv.o tree-ssa-copyrename.o          \
X+ tree-ssa-pre.o tree-ssa-live.o tree-ssa-operands.o tree-ssa-alias.o       \
X+ tree-ssa-phiopt.o tree-ssa-forwprop.o tree-nested.o tree-ssa-dse.o        \
X+ tree-ssa-dom.o domwalk.o tree-tailcall.o gimple-low.o tree-iterator.o     \
X+ tree-phinodes.o tree-ssanames.o tree-sra.o tree-complex.o                 \
X+ tree-vect-generic.o tree-ssa-loop.o tree-ssa-loop-niter.o                 \
X+ tree-ssa-loop-manip.o tree-ssa-threadupdate.o                             \
X+ tree-vectorizer.o tree-vect-analyze.o tree-vect-transform.o               \
X+ tree-ssa-loop-ivcanon.o tree-ssa-propagate.o tree-ssa-address.o           \
X+ tree-ssa-math-opts.o                                                      \
X+ tree-ssa-loop-ivopts.o tree-if-conv.o tree-ssa-loop-unswitch.o            \
X+ alias.o bb-reorder.o bitmap.o builtins.o caller-save.o calls.o            \
X+ cfg.o cfganal.o cfgbuild.o cfgcleanup.o cfglayout.o cfgloop.o             \
X+ cfgloopanal.o cfgloopmanip.o loop-init.o loop-unswitch.o loop-unroll.o    \
X+ cfgrtl.o combine.o conflict.o convert.o coverage.o cse.o cselib.o         \
X+ dbxout.o ddg.o tree-ssa-loop-ch.o loop-invariant.o tree-ssa-loop-im.o     \
X+ debug.o df.o diagnostic.o dojump.o dominance.o loop-doloop.o              \
X+ dwarf2asm.o dwarf2out.o emit-rtl.o except.o explow.o loop-iv.o            \
X+ expmed.o expr.o final.o flow.o fold-const.o function.o gcse.o             \
X+ genrtl.o ggc-common.o global.o graph.o gtype-desc.o                       \
X+ haifa-sched.o hooks.o ifcvt.o insn-attrtab.o insn-emit.o insn-modes.o     \
X+ insn-extract.o insn-opinit.o insn-output.o insn-peep.o insn-recog.o       \
X+ integrate.o intl.o jump.o  langhooks.o lcm.o lists.o local-alloc.o        \
X+ loop.o mode-switching.o modulo-sched.o optabs.o options.o opts.o          \
X+ params.o postreload.o postreload-gcse.o predict.o                         \
X+ insn-preds.o pointer-set.o                                                \
X+ print-rtl.o print-tree.o profile.o value-prof.o var-tracking.o            \
X+ real.o recog.o reg-stack.o regclass.o regmove.o regrename.o               \
X+ reload.o reload1.o reorg.o resource.o rtl.o rtlanal.o rtl-error.o         \
X+ sbitmap.o sched-deps.o sched-ebb.o sched-rgn.o sched-vis.o sdbout.o       \
X+ simplify-rtx.o sreal.o stmt.o stor-layout.o stringpool.o                  \
X+ targhooks.o timevar.o toplev.o tracer.o tree.o tree-dump.o                \
X+ varasm.o varray.o vec.o version.o vmsdbgout.o xcoffout.o alloc-pool.o     \
X+ et-forest.o cfghooks.o bt-load.o pretty-print.o $(GGC) web.o passes.o     \
X+ tree-profile.o rtlhooks.o cfgexpand.o lambda-mat.o                        \
X+ lambda-trans.o lambda-code.o tree-loop-linear.o tree-ssa-sink.o           \
X+ tree-vrp.o tree-stdarg.o tree-cfgcleanup.o tree-ssa-reassoc.o             \
X+ tree-ssa-structalias.o tree-object-size.o
X+
X+OBJS-archive=	$(EXTRA_OBJS) $(host_hook_obj) tree-inline.o		   \
X+  cgraph.o cgraphunit.o tree-nomudflap.o ipa.o ipa-inline.o		   \
X+  ipa-utils.o ipa-reference.o ipa-pure-const.o ipa-type-escape.o	   \
X+  ipa-prop.o ipa-cp.o
X 
X-# Files shared by cc1plus, cc1 and cc1obj
X-SRCS+=	c-pretty-print.c
X-
X-# Machine-dependent files.
X-SRCS+=	${GCC_CPU}.c
X+OBJS-md=  ${GCC_CPU}.o
X .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-c.c)
X-SRCS+=	${GCC_CPU}-c.c
X+OBJS-md+= ${GCC_CPU}-c.o
X .endif
X 
X-# libcpp files.
X-SRCS+=	cpplib.c cpplex.c cppmacro.c cppexp.c cppfiles.c cpptrad.c \
X-	cpphash.c cpperror.c cppinit.c cppcharset.c \
X-	line-map.c mkdeps.c cpppch.c
X-
X-# insn-* gunk -- headers are built in cc_tools, as they are used by the
X-# "build-tools"
X-.for F in attrtab emit extract opinit output peep recog
X-SRCS+=	insn-$F.c
X-CLEANFILES+= insn-$F.c
X-insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE}
X-	${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} > insn-$F.c \
X-	    ${.MAKEFLAGS:M-s:S;-s;2>/dev/null;}
X-.endfor
X-.for F in modes
X-SRCS+=	insn-$F.c
X-CLEANFILES+= insn-$F.c
X-insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F
X-	${.OBJDIR}/../cc_tools/gen$F > insn-$F.c
X-.endfor
X-
X-CFLAGS+=	-DHAVE_CONFIG_H
X-CFLAGS+=	-DTARGET_NAME=\"${GCC_TARGET}\"
X+# Target specific, C specific object file
X+C_TARGET_OBJS=
X 
X-.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
X-CFLAGS += -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
X-.endif
X+# Language-specific object files for C and Objective C.
X+C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \
X+  c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \
X+  c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
X+  c-objc-common.o c-dump.o c-pch.o c-parser.o $(C_TARGET_OBJS) \
X+  c-gimplify.o tree-mudflap.o c-pretty-print.o
X+
X+# Language-specific object files for C.
X+C_OBJS = c-lang.o stub-objc.o $(C_AND_OBJC_OBJS)
X+
X+# Put objC stub objects in library. objc frontend will override it
X+OBJS-dummy=  stub-objc.o dummy-checksum.o
X+
X+OBJS-all=  ${OBJS-common} ${OBJS-archive} ${OBJS-md} ${C_AND_OBJC_OBJS} \
X+	   ${OBJS-dummy}
X+
X+SRCS+= ${OBJS-all:R:S/$/.c/g}
X+
X+version.o:	version.c
X+	${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \
X+		-DDATESTAMP=\"\ ${DATESTAMP}\" \
X+		-DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC}
X 
X-# c-pch.o needs extra defines. Replicate the rule here rather than
X-# pollute compiler command line for all other files.
X-c-pch.o: c-pch.c
X-	${CC} ${CFLAGS} -DHOST_MACHINE=\"${host}\" \
X-		 -DTARGET_MACHINE=\"${GCC_TARGET}\" -c ${.IMPSRC}
X+toplev.o:	toplev.c
X+	${CC} ${CFLAGS} -DTARGET_NAME=\"${GCC_TARGET}\" -c ${.IMPSRC}
X 
X .include <bsd.lib.mk>
XIndex: gnu/usr.bin/cc/cc_tools/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc_tools/Makefile,v
Xretrieving revision 1.84
Xdiff -u -r1.84 Makefile
X--- gnu/usr.bin/cc/cc_tools/Makefile	18 Sep 2006 17:08:32 -0000	1.84
X+++ gnu/usr.bin/cc/cc_tools/Makefile	5 Apr 2007 01:56:32 -0000
X@@ -1,210 +1,17 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.84 2006/09/18 17:08:32 imp Exp $
X-
X .include <bsd.own.mk>
X 
X-#
X-# This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
X-# is such a !@#!*#% nightmare because of how it reprograms the dependencies,
X-# suffix rules, SRCS, etc.  It's easiest to cheat by using bsd.prog.mk and
X-# SRCS to get dependencies.
X-#
X-
X-#
X-# ../Makefile.inc will put an absolute path to our objdir in CFLAGS.
X-# Prevent mkdep from using it, so that we don't have to give rules for
X-# aliases of generated headers.
X-#
X CFLAGS+=	-I.
X 
X .include "../Makefile.inc"
X 
X-.PATH: ${GCCDIR} ${GCCDIR}/f
X-
X-CFLAGS+=	-DGENERATOR_FILE
X-
X-#
X-#-----------------------------------------------------------------------
X-# Build 'pocket' libiberty exclusively for build tools use.
X-
X-LIBIBERTY_SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
X-	dyn-string.c fibheap.c getpwd.c getruntime.c hashtab.c hex.c \
X-	lbasename.c make-temp-file.c md5.c obstack.c partition.c pex-unix.c \
X-	physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c
X-LIBIBERTY_OBJS=	${LIBIBERTY_SRCS:R:S/$/.o/g}
X-
X-SRCS+=	${LIBIBERTY_SRCS}
X-
X-LIBIBERTY=libiberty.a
X-${LIBIBERTY}: ${LIBIBERTY_OBJS}
X-	@rm -f ${.TARGET}
X-	@${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q`
X-	${RANLIB} ${.TARGET}
X-CLEANFILES+=	${LIBIBERTY}
X-
X-#
X-#-----------------------------------------------------------------------
X-# options
X-OPTION_FILES=${GCCDIR}/f/lang.opt ${GCCDIR}/c.opt ${GCCDIR}/common.opt
X+CFLAGS+=	-g
X+CFLAGS+=	-DGENERATOR_FILE -DAVE_CONFIG_H
X 
X-.ORDER: options.h options.c
X-options.h options.c: opts.sh ${OPTION_FILES}
X-	/bin/sh ${GCCDIR}/opts.sh mv options.c options.h ${OPTION_FILES}
X+# Override LIBIBERTY set by Makefile.inc, We use our own for
X+# build tools.
X+LIBIBERTY=	libiberty.a
X 
X-GENSRCS+=	options.c options.h
X-CLEANFILES+=	options.c options.h
X-
X-#-----------------------------------------------------------------------
X-# insn-* gunk
X-
X-.for F in attr codes config flags constants
X-insn-$F.h: gen$F ${MD_FILE}
X-	./gen$F ${MD_FILE} > insn-$F.h
X-GENSRCS+=	insn-$F.h
X-.endfor
X-
X-.for F in conditions
X-insn-$F.c: gen$F ${MD_FILE}
X-	./gen$F ${MD_FILE} > insn-$F.c
X-GENSRCS+=	insn-$F.c
X-.endfor
X-
X-GENSRCS+=	gen-time-stamp
X-gen-time-stamp: genattr genattrtab genconditions genconstants genemit \
X-		genextract gengtype genopinit genoutput genpeep genrecog
X-	touch ${.TARGET}
X-
X-.for F in attr codes config emit extract flags opinit output peep recog
X-gen$F: gen$F.o rtl.o print-rtl.o bitmap.o gensupport.o  ggc-none.o \
X-	read-rtl.o insn-conditions.o min-insn-modes.o errors.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-
X-GENSRCS+=	gen$F.c
X-CLEANFILES+=	gen$F
X-.endfor
X-
X-#
X-# genattrtab needs more complex build rule
X-#
X-genattrtab : genattrtab.o rtl.o print-rtl.o bitmap.o gensupport.o ggc-none.o \
X-	read-rtl.o insn-conditions.o genautomata.o varray.o min-insn-modes.o \
X-	errors.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
X-
X-GENSRCS+=	genattrtab.c
X-CLEANFILES+=	genattrtab
X-
X-#
X-# genconstants and genconditions cannot depend on insn-conditions.o
X-# they should be liked with dummy-conditions.o stubs instead
X-#
X-.for F in constants conditions
X-gen$F: gen$F.o rtl.o bitmap.o gensupport.o ggc-none.o read-rtl.o dummy-conditions.o min-insn-modes.o errors.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-
X-GENSRCS+=	gen$F.c
X-CLEANFILES+=	gen$F
X-.endfor
X-
X-.for F in modes check genrtl preds
X-gen$F: gen$F.o errors.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-
X-GENSRCS+=	gen$F.c
X-CLEANFILES+=	gen$F
X-.endfor
X-
X-.ORDER: genrtl.c genrtl.h
X-genrtl.c genrtl.h: gengenrtl
X-	./gengenrtl > genrtl.c
X-	./gengenrtl -h > genrtl.h
X-
X-GENSRCS+=	genrtl.c genrtl.h
X-
X-SRCS+=	bitmap.c dummy-conditions.c errors.c genautomata.c gensupport.c \
X-	ggc-none.c print-rtl.c read-rtl.c rtl.c varray.c
X-
X-#-----------------------------------------------------------------------
X-# insn modes stuff.
X-
X-.ORDER: insn-modes.c insn-modes.h
X-insn-modes.h: genmodes
X-	./genmodes -h > insn-modes.h
X-
X-insn-modes.c: genmodes
X-	./genmodes > insn-modes.c
X-
X-min-insn-modes.c: genmodes
X-	./genmodes -m > min-insn-modes.c
X-
X-GENSRCS+= insn-modes.c min-insn-modes.c insn-modes.h
X-
X-#-----------------------------------------------------------------------
X-# Common parser stuff.
X-
X-tree-check.h: gencheck
X-	./gencheck > ${.TARGET}
X-GENSRCS+=	tree-check.h
X-
X-#-----------------------------------------------------------------------
X-# Predicates stuff.
X-
X-tm-preds.h: genpreds
X-	./genpreds > ${.TARGET}
X-GENSRCS+=	tm-preds.h
X-
X-#-----------------------------------------------------------------------
X-# Gengtype
X-
X-gengtype-lex.c : gengtype-lex.l
X-	${LEX} -t  ${.ALLSRC} | \
X-	sed 's/^\(char msg\[\];\)/yyconst \1/' > ${.TARGET}
X-
X-.ORDER: gengtype-yacc.c gengtype-yacc.h
X-gengtype-yacc.c gengtype-yacc.h: gengtype-yacc.y
X-	${YACC} -d -o gengtype-yacc.c ${.ALLSRC}
X-
X-GENSRCS+=	gengtype-yacc+%DIKED.c gengtype-yacc.h gengtype-lex.c
X-CLEANFILES+=	gengtype-yacc.c
X-
X-gengtype-yacc+%DIKED.c: gengtype-yacc.c
X-	cat    ${.ALLSRC} > ${.TARGET}
X-	sed -e "s/xmalloc/malloc/g" \
X-	    -e "s/xrealloc/realloc/g" \
X-	    -e "s/malloc/xmalloc/g" \
X-	    -e "s/realloc/xrealloc/g" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-
X-GENSRCS+=	gengtype.c
X-CLEANFILES+=	gengtype
X-
X-gengtype-lex.o: gengtype-yacc.h
X-
X-.ORDER: gtype-desc.c gtype-desc.h
X-gtype-desc.c gtype-desc.h: gtype-time-stamp
X-	@true
X-
X-GENSRCS+=	gtype-time-stamp
X-gtype-time-stamp: gengtype ${GTFILES}
X-	./gengtype
X-	touch ${.TARGET}
X-
X-GENSRCS+=	gtype-desc.c gtype-desc.h
X-CLEANFILES+=	gt-*.h gtype-*.h
X-
X-#
X-#-----------------------------------------------------------------------
X-# Fortran build tools
X-
X-.if ${MK_FORTRAN} != "no"
X-gen-time-stamp: fini
X-fini: fini.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-SRCS+=		fini.c
X-CLEANFILES+=	fini
X-.endif
X+.PATH:	${GCCDIR} ${GCCLIB}/libiberty
X 
X #-----------------------------------------------------------------------
X # Determine content of variables used by the target/host config files
X@@ -212,8 +19,9 @@
X #
X # The list of headers to go into tm.h
X #
X+TARGET_INC+=	options.h
X .if ${TARGET_ARCH} == "amd64"
X-TARGET_INC=	i386/biarch64.h
X+TARGET_INC+=	i386/biarch64.h
X .endif
X .if ${TARGET_ARCH} != "arm"
X TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
X@@ -222,92 +30,89 @@
X TARGET_INC+=	${GCC_CPU}/unix.h
X TARGET_INC+=	${GCC_CPU}/att.h
X .endif
X-.if ${TARGET_ARCH} != "alpha"
X TARGET_INC+=	dbxelf.h
X TARGET_INC+=	elfos.h
X-.endif
X TARGET_INC+=	freebsd-native.h
X TARGET_INC+=	freebsd-spec.h
X TARGET_INC+=	freebsd.h
X-.if ${TARGET_ARCH} == "alpha"
X-TARGET_INC+=	${GCC_CPU}/elf.h
X-.endif
X .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
X .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h)
X TARGET_INC+=	${GCC_CPU}/sysv4.h
X .endif
X .endif
X-.if ${TARGET_ARCH} == "arm"
X-TARGET_INC+=	${GCC_CPU}/elf.h
X-TARGET_INC+=	${GCC_CPU}/aout.h
X-TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
X-. if defined(TARGET_BIG_ENDIAN)
X-CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
X-. endif
X-.endif
X-.if ${TARGET_ARCH} == "arm"
X-TARGET_INC+=	freebsd-diked.h
X-.else
X-TARGET_INC+=	${GCC_CPU}/freebsd.h
X-.endif
X .if ${TARGET_ARCH} == "amd64"
X TARGET_INC+=	${GCC_CPU}/x86-64.h
X+TARGET_INC+=	${GCC_CPU}/freebsd.h
X TARGET_INC+=	${GCC_CPU}/freebsd64.h
X TARGET_INC+=	freebsd64-fix.h
X-.endif
X-.if ${TARGET_ARCH} == "powepc"
X-TARGET_INC+=	altivec-defs.h
X+.elif ${TARGET_ARCH} == "arm"
X+TARGET_INC+=	${GCC_CPU}/elf.h
X+TARGET_INC+=	${GCC_CPU}/aout.h
X+TARGET_INC+=	${GCC_CPU}/freebsd.h
X+TARGET_INC+=	${GCC_CPU}/arm.h
X+.else
X+TARGET_INC+=	${GCC_CPU}/freebsd.h
X .endif
X TARGET_INC+=	defaults.h
X 
X-#
X-# Use TARGET_INC as a template and build a list of target specific
X-# include files for gengtype to scan
X-#
X-GCONFIG_H=	${.CURDIR}/auto-host.h
X-
X .for H in ${TARGET_INC}
X .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR}
X .if exists($D/$H)
X-GCONFIG_H+=	$D/$H
X+TARGET_INC_FILES+=     $D/$H
X .endif
X .endfor
X .endfor
X 
X #
X-# Define some variables to make blocks copied from Makefile.in happy
X+# gtyp includes.
X #
X srcdir=		${GCCDIR}
X-HASHTAB_H=	${GCCDIR}/hashtab.h
X-SPLAY_TREE_H=	${GCCDIR}/splay-tree.h
X-out_file=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.c
X-GTFILES_SRCDIR=	${GCCDIR}
X+CPPLIB_H=	${GCCLIB}/libcpp/include/line-map.h \
X+		${GCCLIB}/libcpp/include/cpplib.h
X+SYMTAB_H=	${GCCLIB}/libcpp/include/symtab.h
X+CPP_ID_DATA_H=	${CPPLIB_H} ${GCCLIB}/libcpp/include/cpp-id-data.h
X+HASHTAB_H=	${GCCLIB}/include/hashtab.h
X+SPLAY_TREE_H=	${GCCLIB}/include/splay-tree.h
X+out_file=	${srcdir}/config/${GCC_CPU}/${GCC_CPU}.c
X+tm_file_list=	${TARGET_INC_FILES}
X+host_xm_file_list= ${.CURDIR}/auto-host.h ${GCCLIB}/include/ansidecl.h
X+GTFILES_SRCDIR=	${srcdir}
X 
X-#
X # Copied unchanged from gcc/Makefile.in
X-#
X-GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \
X-  $(GCONFIG_H) $(HASHTAB_H) $(SPLAY_TREE_H) \
X-  $(srcdir)/bitmap.h $(srcdir)/coverage.c $(srcdir)/function.h  $(srcdir)/rtl.h \
X-  $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/libfuncs.h $(srcdir)/hashtable.h \
X-  $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h \
X+GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h \
X+  $(CPP_ID_DATA_H) $(host_xm_file_list) \
X+  $(tm_file_list) $(HASHTAB_H) $(SPLAY_TREE_H) $(srcdir)/bitmap.h \
X+  $(srcdir)/coverage.c $(srcdir)/function.h $(srcdir)/rtl.h \
X+  $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/libfuncs.h $(SYMTAB_H) \
X+  $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h $(srcdir)/hwint.h \
X+  $(srcdir)/ipa-reference.h \
X   $(srcdir)/cselib.h $(srcdir)/basic-block.h  $(srcdir)/cgraph.h \
X-  $(srcdir)/c-common.h $(srcdir)/c-tree.h \
X+  $(srcdir)/c-common.h $(srcdir)/c-tree.h $(srcdir)/reload.h \
X   $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
X+  $(srcdir)/ipa-prop.c $(srcdir)/ipa-cp.c $(srcdir)/cgraphunit.c \
X   $(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
X-  $(srcdir)/dojump.c \
X+  $(srcdir)/dojump.c $(srcdir)/tree-profile.c \
X   $(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
X-  $(srcdir)/fold-const.c $(srcdir)/function.c \
X+  $(srcdir)/function.c $(srcdir)/except.h \
X   $(srcdir)/gcse.c $(srcdir)/integrate.c $(srcdir)/lists.c $(srcdir)/optabs.c \
X-  $(srcdir)/profile.c $(srcdir)/ra-build.c $(srcdir)/regclass.c \
X-  $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c $(srcdir)/langhooks.c \
X-  $(srcdir)/sdbout.c $(srcdir)/stmt.c $(srcdir)/stor-layout.c \
X+  $(srcdir)/profile.c $(srcdir)/regclass.c \
X+  $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c \
X+  $(srcdir)/sdbout.c $(srcdir)/stor-layout.c \
X   $(srcdir)/stringpool.c $(srcdir)/tree.c $(srcdir)/varasm.c \
X-  $(out_file)
X+  $(srcdir)/tree-mudflap.c $(srcdir)/tree-flow.h \
X+  $(srcdir)/c-objc-common.c $(srcdir)/c-common.c $(srcdir)/c-parser.c \
X+  $(srcdir)/tree-ssanames.c $(srcdir)/tree-eh.c $(srcdir)/tree-ssa-address.c \
X+  $(srcdir)/tree-phinodes.c $(srcdir)/tree-cfg.c \
X+  $(srcdir)/tree-dfa.c $(srcdir)/tree-ssa-propagate.c \
X+  $(srcdir)/tree-iterator.c $(srcdir)/gimplify.c \
X+  $(srcdir)/tree-chrec.h $(srcdir)/tree-vect-generic.c \
X+  $(srcdir)/tree-ssa-operands.h $(srcdir)/tree-ssa-operands.c \
X+  $(srcdir)/tree-profile.c $(srcdir)/tree-nested.c \
X+  $(srcdir)/ipa-reference.c $(srcdir)/tree-ssa-structalias.h \
X+  $(srcdir)/tree-ssa-structalias.c \
X+  $(srcdir)/targhooks.c $(out_file)
X 
X-#
X-# Build a list of frontend directories to look into
X-#
X+# The list of frontend directories to look into
X GTFILES_LANG_DIR_NAMES=
X 
X .if ${MK_CXX} != "no"
X@@ -318,13 +123,7 @@
X GTFILES_LANG_DIR_NAMES+=	objc
X .endif
X 
X-.if ${MK_FORTRAN} != "no"
X-GTFILES_LANG_DIR_NAMES+=	f
X-.endif
X-
X-#
X-# Build a list of language specific files for gengtype
X-#
X+# The list of language specific files for gengtype
X .for L in ${GTFILES_LANG_DIR_NAMES} c
X .if exists(${GCCDIR}/$L-config-lang.in)
X # Source the language config file
X@@ -339,167 +138,340 @@
X .endfor
X GTFILES+=	${GTFILES_FILES}
X 
X-#-----------------------------------------------------------------------
X-# the host/target compiler config.
X+#
X+# Tree definition files.
X+#
X+TREE_DEF_FILES=
X 
X-COMMONHDRS=	bconfig.h config.h configargs.h gencheck.h multilib.h \
X-		specs.h safe-ctype.h tconfig.h tm.h tm_p.h gcov-iov.h \
X-		gtyp-gen.h
X-GENSRCS+=	${COMMONHDRS}
X+.if ${MK_CXX} != "no"
X+TREE_DEF_FILES+=	cp/cp-tree.def
X+.endif
X 
X-MFILE?=	${.CURDIR}/Makefile
X-${COMMONHDRS}: ${MFILE}
X+.if ${MK_OBJC} != "no"
X+TREE_DEF_FILES+=	objc/objc-tree.def
X+.endif
X 
X-configargs.h:
X-	echo 'static const char configuration_arguments[] ='	> ${.TARGET}
X-	echo '	"FreeBSD/${TARGET_ARCH} system compiler";'	>> ${.TARGET}
X-	echo 'static const char thread_model[] = "posix";'	>> ${.TARGET}
X-	echo 'static const struct {'				>> ${.TARGET}
X-	echo '	const char *name, *value;'			>> ${.TARGET}
X-	echo '} configure_default_options[] = {'		>> ${.TARGET}
X-	echo '	{ "NULL", "NULL" } };'				>> ${.TARGET}
X+#
X+# Option files.
X+#
X+OPT_FILES=	c.opt common.opt
X 
X-tconfig.h:
X-	echo '#ifndef GCC_TCONFIG_H'			> ${.TARGET}
X-	echo '#define GCC_TCONFIG_H'			>> ${.TARGET}
X-	echo '#ifdef IN_GCC'				>> ${.TARGET}
X-	echo '# include "ansidecl.h"'			>> ${.TARGET}
X-	echo '#endif'					>> ${.TARGET}
X-	echo '#define USED_FOR_TARGET'			>> ${.TARGET}
X-	echo '#endif /* GCC_TCONFIG_H */'		>> ${.TARGET}
X+.if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt)
X+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt
X+.endif
X+
X+.if exists(${.CURDIR}/${GCC_CPU}-freebsd.opt)
X+OPT_FILES+=	${.CURDIR}/${GCC_CPU}-freebsd.opt
X+.endif
X 
X+.if ${TARGET_ARCH} == "powerpc"
X+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/sysv4.opt
X+.endif
X+
X+.if ${TARGET_ARCH} == "sparc64"
X+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/long-double-switch.opt
X+.endif
X+
X+.if exists(${.CURDIR}/freebsd.opt)
X+OPT_FILES+=	${.CURDIR}/freebsd.opt
X+.endif
X+
X+#-----------------------------------------------------------------------
X+# Build rules for header files and generator tools
X+
X+# Host config
X+config.h:
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="auto-host.h ansidecl.h" \
X+	DEFINES="" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
X+
X+GENSRCS+=	config.h
X+CLEANFILES+=	cs-config.h
X+
X+# Build config
X bconfig.h:
X-	echo '#ifndef GCC_BCONFIG_H'			> ${.TARGET}
X-	echo '#define GCC_BCONFIG_H'			>> ${.TARGET}
X-	echo '#include "auto-host.h"'			>> ${.TARGET}
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="auto-host.h ansidecl.h" \
X+	DEFINES="" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
X .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
X 	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
X .endif
X-	echo '#ifdef IN_GCC'				>> ${.TARGET}
X-	echo '# include "ansidecl.h"'			>> ${.TARGET}
X-	echo '#endif'					>> ${.TARGET}
X-	echo '#endif /* GCC_BCONFIG_H */'		>> ${.TARGET}
X-
X-gencheck.h:
X-	echo '#include "cp/cp-tree.def"'		> ${.TARGET}
X-	echo '#include "objc/objc-tree.def"'		>> ${.TARGET}
X-
X-multilib.h:
X-	echo 'static const char *const multilib_raw[] = { \
X-	    "aout maout;", "elf !maout;", NULL };'	> ${.TARGET}
X-	echo 'static const char *const multilib_matches_raw[] = { \
X-	    "maout maout;", "melf melf;", NULL };'	>> ${.TARGET}
X-	echo 'static const char *multilib_extra = "";'	>> ${.TARGET}
X-	echo 'static const char *multilib_options = "";'>> ${.TARGET}
X-	echo 'static const char *const multilib_exclusions_raw[] = { \
X-	    NULL };'					>> ${.TARGET}
X 
X-specs.h:
X-	echo '#include "cp/lang-specs.h"'		> ${.TARGET}
X-	echo '#include "f/lang-specs.h"'		>> ${.TARGET}
X-	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
X+GENSRCS+=	bconfig.h
X+CLEANFILES+=	cs-bconfig.h
X 
X-config.h: bconfig.h
X-	echo '#include <bconfig.h>'			> ${.TARGET}
X+# tconfig.h
X+tconfig.h:
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="auto-host.h ansidecl.h" \
X+	DEFINES="USED_FOR_TARGET" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
X+
X+GENSRCS+=	tconfig.h
X+CLEANFILES+=	cs-tconfig.h
X+# Options
X+optionlist: ${OPT_FILES}
X+	awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET}
X+
X+options.h:	optionlist
X+	awk -f ${GCCDIR}/opt-functions.awk \
X+	    -f ${GCCDIR}/opth-gen.awk \
X+		< ${.ALLSRC} > ${.TARGET}
X+
X+options.c:	optionlist
X+	awk -f ${GCCDIR}/opt-functions.awk \
X+	    -f ${GCCDIR}/optc-gen.awk \
X+		-v header_name="config.h system.h coretypes.h tm.h" \
X+		< ${.ALLSRC} > ${.TARGET}
X+GENSRCS+=	optionlist options.h options.c
X 
X+# Target machine config
X tm.h:
X-	echo '#ifndef GCC_TM_H'				> ${.TARGET}
X-	echo '#define GCC_TM_H'				>> ${.TARGET}
X-.if defined(TARGET_CPU_DEFAULT)
X-	echo "#define TARGET_CPU_DEFAULT (${TARGET_CPU_DEFAULT})" >> ${.TARGET}
X-.endif
X-	echo '#ifdef IN_GCC'				>> ${.TARGET}
X-.for H in ${TARGET_INC}
X-	echo '#include "$H"'				>> ${.TARGET}
X-.endfor
X-	echo '#if !defined GENERATOR_FILE && !defined USED_FOR_TARGET' >> ${.TARGET}
X-	echo '# include "insn-constants.h"'		>> ${.TARGET}
X-	echo '# include "insn-flags.h"'			>> ${.TARGET}
X-	echo '#endif'					>> ${.TARGET}
X-	echo '#endif'					>> ${.TARGET}
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="${TARGET_INC}" \
X+	DEFINES="" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
X .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
X 	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
X .endif
X-	echo '#endif /* GCC_TM_H */'			>> ${.TARGET}
X 
X+GENSRCS+=	tm.h
X+CLEANFILES+=	cs-tm.h
X+
X+# Target machine protos/preds.
X tm_p.h:
X-	echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"'	>> ${.TARGET}
X-	echo '#include "tm-preds.h"'				>> ${.TARGET}
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="${GCC_CPU}/${GCC_CPU}-protos.h tm-preds.h" \
X+	DEFINES="" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh tm_p.h
X+
X+GENSRCS+=	tm_p.h
X+CLEANFILES+=	cs-tm_p.h
X+
X+# gencheck
X+gencheck.h:
X+.for F in ${TREE_DEF_FILES}
X+	echo "#include \"$F\""					>> ${.TARGET}
X+.endfor
X 
X-safe-ctype.h:
X-	echo '#include <ctype.h>'				> ${.TARGET}
X-.for Z in TOUPPER TOLOWER ISDIGIT ISXDIGIT ISUPPER ISLOWER ISALPHA ISALNUM \
X-    ISSPACE ISPUNCT ISGRAPH ISBLANK ISPRINT ISCNTRL
X-	echo '#define ${Z}	${Z:L}'				>> ${.TARGET}
X-.endfor
X-	echo "#define ISIDST(x)		\
X-		((x) == '_' || isalpha(x))"			>> ${.TARGET}
X-	echo "#define ISIDNUM(x)	\
X-		(isdigit(x) || ISIDST(x))"			>> ${.TARGET}
X-	echo "#define IS_VSPACE(x)	\
X-		((x) == '\n' || (x) == '\r')"			>> ${.TARGET}
X-	echo "#define IS_NVSPACE(x)	\
X-		(!IS_VSPACE(x) && (isspace(x) || (x) == '\0'))"	>> ${.TARGET}
X-	echo "#define IS_SPACE_OR_NUL(x)	\
X-		(isspace(x) || (x) == '\0')"			>> ${.TARGET}
X+GENSRCS+=	gencheck.h
X 
X-gtyp-gen.h:
X+
X+# Source header for gtyp generator.
X+gtyp-gen.h:	${GTFILES}
X 	echo "/* This file is machine generated.  Do not edit.  */" > ${.TARGET}
X-	echo "static const char *srcdir = "			>> ${.TARGET}
X+	echo "static const char * const srcdir = "		>> ${.TARGET}
X 	echo "\"$(GTFILES_SRCDIR)\";"				>> ${.TARGET}
X-	echo "static const char *lang_files[] = {"		>> ${.TARGET}
X+	echo "static const char * const lang_files[] = {"	>> ${.TARGET}
X .for F in ${GTFILES_FILES}
X 	echo "\"$F\", "						>> ${.TARGET}
X .endfor
X 	echo "NULL};"						>> ${.TARGET}
X-	echo "static const char *langs_for_lang_files[] = {"	>> ${.TARGET}
X+	echo "static const char * const langs_for_lang_files[] = {">> ${.TARGET}
X .for F in ${GTFILES_LANGS}
X 	echo "\"$F\", "						>> ${.TARGET}
X .endfor
X 	echo "NULL};"						>> ${.TARGET}
X-	echo "static const char *all_files[] = {"		>> ${.TARGET}
X+	echo "static const char * const all_files[] = {"	>> ${.TARGET}
X .for F in ${GTFILES}
X 	echo "\"$F\", "						>> ${.TARGET}
X .endfor
X 	echo "NULL};"						>> ${.TARGET}
X-	echo "static const char *lang_dir_names[] = { \"c\", "	>> ${.TARGET}
X-.for F in ${GTFILES_LANG_DIR_NAMES}
X+	echo "static const char * const lang_dir_names[] = {"	>> ${.TARGET}
X+.for F in c ${GTFILES_LANG_DIR_NAMES}
X 	echo "\"$F\", "						>> ${.TARGET}
X .endfor
X 	echo "NULL};"						>> ${.TARGET}
X 
X+GENSRCS+=	gtyp-gen.h
X+
X+# Version header for gcov
X gcov-iov.h:
X-	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET}
X+	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x34303170)" >> ${.TARGET}
X+
X+GENSRCS+=	gcov-iov.h
X+
X+# Multilib config file
X+multilib.h:
X+	echo 'static const char *const multilib_raw[] = { \
X+	    "aout maout;", "elf !maout;", NULL };'	> ${.TARGET}
X+	echo 'static const char *const multilib_matches_raw[] = { \
X+	    "maout maout;", "melf melf;", NULL };'	>> ${.TARGET}
X+	echo 'static const char *multilib_extra = "";'	>> ${.TARGET}
X+	echo 'static const char *multilib_options = "";'>> ${.TARGET}
X+	echo 'static const char *const multilib_exclusions_raw[] = { \
X+	    NULL };'					>> ${.TARGET}
X+
X+GENSRCS+=	multilib.h
X+
X+configargs.h:
X+	echo 'static const char configuration_arguments[] ='	> ${.TARGET}
X+	echo '	"FreeBSD/${TARGET_ARCH} system compiler";'	>> ${.TARGET}
X+	echo 'static const char thread_model[] = "posix";'	>> ${.TARGET}
X+	echo 'static const struct {'				>> ${.TARGET}
X+	echo '	const char *name, *value;'			>> ${.TARGET}
X+	echo '} configure_default_options[] = {'		>> ${.TARGET}
X+	echo '	{ "NULL", "NULL" } };'				>> ${.TARGET}
X+
X+GENSRCS+=	configargs.h
X+
X+# Language spec files
X+specs.h:
X+	echo '#include "cp/lang-specs.h"'		> ${.TARGET}
X+	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
X+
X+GENSRCS+=	specs.h
X+
X+# Linked headers
X+gthr-default.h: ${GCCDIR}/gthr-posix.h
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+GENSRCS+=	gthr-default.h
X+
X+unwind.h: ${GCCDIR}/unwind-generic.h
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+GENSRCS+=	unwind.h
X+
X+#
X+# gtype gunk
X+#
X+gengtype-lex.c:	gengtype-lex.l
X+	flex -ogengtype-lex.c ${.ALLSRC}
X+
X+gengtype-yacc.h: gengtype-yacc.y
X+	yacc -d -o gengtype-yacc.c ${.ALLSRC}
X+
X+gengtype-yacc.c: gengtype-yacc.h
X+
X+gengtype-yacc+%DIKED.c: gengtype-yacc.c
X+	cat    ${.ALLSRC} > ${.TARGET}
X+	sed -e "s/xmalloc/malloc/g" \
X+	    -e "s/xrealloc/realloc/g" \
X+	    -e "s/malloc/xmalloc/g" \
X+	    -e "s/realloc/xrealloc/g" \
X+	    ${.ALLSRC} > ${.TARGET}
X+
X+GENSRCS+= gengtype-lex.c gengtype-yacc.h gengtype-yacc+%DIKED.c
X+CLEANFILES+= gengtype-yacc.c
X+
X+gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o errors.o \
X+	  ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X+
X+gtype-desc.h:	gengtype
X+	./gengtype
X+	touch ${.TARGET}
X+
X+gtype-desc.c:	gtype-desc.h
X+
X+GENSRCS+=	gtype-desc.c gtype-desc.h
X+CLEANFILES+=	gt-*.h gtype-*.h
X+
X+#
X+# Generator tools.
X+#
X+.for F in check checksum genrtl modes
X+gen$F:	gen$F.o errors.o ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X+.endfor
X+
X+.for F in conditions constants preds
X+gen$F:	gen$F.o gensupport.o dummy-conditions.o rtl.o read-rtl.o ggc-none.o \
X+	min-insn-modes.o errors.o ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X+.endfor
X+
X+.for F in attr codes config flags extract emit opinit output peep recog
X+gen$F:	gen$F.o gensupport.o insn-conditions.o rtl.o read-rtl.o ggc-none.o \
X+	min-insn-modes.o errors.o print-rtl.o ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X+.endfor
X+
X+genattrtab:	genattrtab.o genautomata.o gensupport.o insn-conditions.o \
X+	rtl.o read-rtl.o ggc-none.o min-insn-modes.o errors.o print-rtl.o \
X+	varray.o ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
X+
X+#
X+# Generated header files.
X+#
X+.for F in attr codes config constants flags
X+insn-$F.h:	gen$F
X+	./gen$F ${MD_FILE} > ${.TARGET}
X+GENSRCS+=	insn-$F.h
X+.endfor
X+
X+# Header files with irregular names.
X+genrtl.h:	gengenrtl
X+	./gengenrtl -h > ${.TARGET}
X+GENSRCS+=	genrtl.h
X+
X+tm-preds.h:	genpreds
X+	./genpreds -h ${MD_FILE} > ${.TARGET}
X+GENSRCS+=	tm-preds.h
X+
X+tree-check.h:	gencheck
X+	./gencheck > ${.TARGET}
X+GENSRCS+=	tree-check.h
X+
X+insn-modes.h:	genmodes
X+	./genmodes -h > ${.TARGET}
X+GENSRCS+=	insn-modes.h
X+
X+#
X+# Generated source files.
X+#
X+.for F in attrtab conditions extract emit opinit output peep preds recog
X+insn-$F.c:	gen$F
X+	./gen$F ${MD_FILE} > ${.TARGET}
X+GENSRCS+=	insn-$F.c
X+.endfor
X+
X+# Source files with irregular names.
X+insn-modes.c:	genmodes
X+	./genmodes > ${.TARGET}
X+GENSRCS+=	insn-modes.c
X+
X+min-insn-modes.c:	genmodes
X+	./genmodes -m > ${.TARGET}
X+GENSRCS+=	min-insn-modes.c
X+
X+genrtl.c:	gengenrtl
X+	./gengenrtl > ${.TARGET}
X+GENSRCS+=	genrtl.c
X 
X-.if ${TARGET_ARCH} == "arm"
X-freebsd-diked.h: ${GCCDIR}/../../gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff
X-	cp ${GCCDIR}/config/arm/freebsd.h freebsd.h
X-	patch freebsd.h ${.ALLSRC}
X-	mv freebsd.h ${.TARGET}
X-COMMONHDRS+=	freebsd-diked.h
X-CLEANFILES+=    freebsd.h.orig
X-
X-# Make sure freebsd-diked.h is built when tm.h is built for csu's sake
X-tm.h:	freebsd-diked.h
X-
X-${MD_FILE}: ${MFILE}
X-	cp ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md .
X-	ln -sf ${GCCDIR}/config/${GCC_CPU}/fpa.md .
X-	ln -sf ${GCCDIR}/config/${GCC_CPU}/cirrus.md .
X-	ln -sf ${GCCDIR}/config/${GCC_CPU}/iwmmxt.md .
X-	patch ${GCC_CPU}.md ${.CURDIR}/arm.md.diff
X-	mv ${GCC_CPU}.md ${.TARGET}
X-CLEANFILES+=	arm-diked.md ${GCC_CPU}.md.orig fpa.md cirrus.md iwmmxt.md
X-.endif
X #-----------------------------------------------------------------------
X-# General things.
X+# Build tools.
X 
X-SRCS+=		${GENSRCS}
X-CLEANFILES+=	${GENSRCS}
X+GNTOOLS+=	genattr genattrtab gencodes gencheck genchecksum genconditions \
X+		genconfig genconstants genemit genextract genflags gengenrtl \
X+		gengtype genmodes genopinit genoutput genpeep genpreds genrecog
X 
X-all:		${SRCS}
X+all: ${GNTOOLS} ${GENSRCS}
X 
X-.include <bsd.prog.mk>
X+#
X+#-----------------------------------------------------------------------
X+# Build 'pocket' libiberty exclusively for build tools use.
X+
X+LIBIBERTY_SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
X+	dyn-string.c fibheap.c fopen_unlocked.c getpwd.c getruntime.c \
X+	hashtab.c hex.c lbasename.c make-temp-file.c md5.c obstack.c \
X+	partition.c pex-unix.c physmem.c safe-ctype.c splay-tree.c xexit.c \
X+	xmalloc.c xmemdup.c xstrdup.c xstrerror.c
X+LIBIBERTY_OBJS=	${LIBIBERTY_SRCS:R:S/$/.o/g}
X+
X+SRCS+=	${LIBIBERTY_SRCS}
X+
X+${LIBIBERTY_OBJS}: config.h
X+
X+${LIBIBERTY}: ${LIBIBERTY_OBJS}
X+	@rm -f ${.TARGET}
X+	@${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q`
X+	${RANLIB} ${.TARGET}
X+CLEANFILES+=	${LIBIBERTY} ${LIBIBERTY_OBJS}
X 
X #-----------------------------------------------------------------------
X # Fixups.
X@@ -507,47 +479,25 @@
X # Set OBJS the same as bsd.prog.mk would do if we defined PROG.  We can't
X # define PROG because we have multiple programs.
X #
X-OBJS+=		${SRCS:N*.h:R:S/$/.o/g}
X-CLEANFILES+=	${OBJS}
X+SRCS=		dummy-conditions.c errors.c genattr.c genattrtab.c \
X+		genautomata.c gencheck.c genchecksum.c gencodes.c \
X+		genconditions.c genconfig.c genconstants.c genemit.c \
X+		genextract.c genflags.c gengenrtl.c gengtype.c genmodes.c \
X+		genopinit.c genoutput.c genpeep.c genpreds.c genrecog.c \
X+		gensupport.c ggc-none.c print-rtl.c read-rtl.c rtl.c varray.c
X 
X-.if !exists(${DEPENDFILE})
X-# Fudge pre-dependfile dependencies of objects in much the same way as
X-# bsd.prog.mk would do if we defined PROG.
X+SRCS+=		${GENSRCS}
X+
X+OBJS+=		${SRCS:N*.h:R:S/$/.o/g}
X 
X-${OBJS}: ${COMMONHDRS}
X+GENOBJS+=	${GENSRCS:N*.h:R:S/$/.o/g}
X 
X-dummy-conditions.o:
X-gencheck.o:
X-genmodes.o:
X-
X-genpreds.o: insn-modes.h
X-genconstants.o: insn-modes.h genrtl.h
X-gengtype.o: insn-modes.h genrtl.h gtyp-gen.h
X-rtl.o: insn-modes.h gtype-desc.h genrtl.h
X-bitmap.o: insn-modes.h gtype-desc.h genrtl.h
X-ggc-none.o: gtype-desc.h
X-gensupport.o: insn-modes.h genrtl.h
X-varray.o: gtype-desc.h
X-genautomata.o: insn-modes.h genrtl.h
X-genconditions.o: insn-modes.h genrtl.h
X-gencodes.o: insn-modes.h genrtl.h
X-genconfig.o: insn-modes.h genrtl.h
X-print-rtl.o: insn-modes.h genrtl.h tm-preds.h tree-check.h
X-read-rtl.o: insn-modes.h genrtl.h
X-genattr.o: insn-modes.h genrtl.h
X-genemit.o: insn-modes.h genrtl.h
X-genflags.o: insn-modes.h genrtl.h
X-genopinit.o: insn-modes.h genrtl.h
X-genoutput.o: insn-modes.h genrtl.h
X-genpeep.o: insn-modes.h genrtl.h
X-genrecog.o: insn-modes.h genrtl.h
X-genextract.o: genrtl.h insn-config.h
X-genattrtab.o: insn-modes.h gtype-desc.h genrtl.h
X-genrtl.o: insn-modes.h genrtl.h gtype-desc.h
X-
X-insn-conditions.o: insn-constants.h tm-preds.h
X-insn-modes.o: insn-modes.h
X-min-insn-modes.o: insn-modes.h
X-gtype-desc.o: insn-modes.h insn-config.h insn-codes.h tree-check.h
X+CLEANFILES+=	${GENSRCS} ${GENOBJS} ${GNTOOLS}
X 
X+#-----------------------------------------------------------------------
X+# Manual dependencies.
X+.if !exists(${DEPENDFILE})
X+.include  "Makefile.dep"
X .endif
X+
X+.include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc_tools/auto-host.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v
Xretrieving revision 1.19
Xdiff -u -r1.19 auto-host.h
X--- gnu/usr.bin/cc/cc_tools/auto-host.h	22 Jul 2006 14:12:02 -0000	1.19
X+++ gnu/usr.bin/cc/cc_tools/auto-host.h	17 Dec 2006 06:49:27 -0000
X@@ -1,591 +1,1378 @@
X-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.19 2006/07/22 14:12:02 obrien Exp $ */
X-
X-#ifndef __FreeBSD_version
X-#include <sys/param.h>
X-#include <sys/endian.h>
X-#endif
X-
X /* auto-host.h.  Generated by configure.  */
X /* config.in.  Generated from configure.ac by autoheader.  */
X 
X-/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
X-#define BYTEORDER _BYTE_ORDER
X-
X /* Define as the number of bits in a byte, if \`limits.h' doesn't. */
X+#ifndef USED_FOR_TARGET
X /* #undef CHAR_BIT */
X+#endif
X+
X 
X /* Define 0/1 to force the choice for exception handling model. */
X+#ifndef USED_FOR_TARGET
X /* #undef CONFIG_SJLJ_EXCEPTIONS */
X+#endif
X+
X 
X /* Define to enable the use of a default assembler. */
X+#ifndef USED_FOR_TARGET
X /* #undef DEFAULT_ASSEMBLER */
X+#endif
X+
X 
X /* Define to enable the use of a default linker. */
X+#ifndef USED_FOR_TARGET
X /* #undef DEFAULT_LINKER */
X+#endif
X+
X 
X /* Define if you want to use __cxa_atexit, rather than atexit, to register C++
X    destructors for local statics and global objects. This is essential for
X    fully standards-compliant handling of destructors, but requires
X    __cxa_atexit in libc. */
X+#ifndef USED_FOR_TARGET
X #define DEFAULT_USE_CXA_ATEXIT 1
X+#endif
X 
X-/* Define to 1 if translation of program messages to the user's native
X-   language is requested. */
X-/* #undef ENABLE_NLS */
X 
X-#ifdef WANT_COMPILER_INVARIANTS
X-/* #warning WANT_COMPILER_INVARIANTS turned on */
X+/* Define if you want assertions enabled. This is a cheap check. */
X+#ifndef USED_FOR_TARGET
X+#define ENABLE_ASSERT_CHECKING 1
X+#endif
X+
X 
X /* Define if you want more run-time sanity checks. This one gets a grab bag of
X    miscellaneous but relatively cheap checks. */
X-#define ENABLE_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_CHECKING */
X+#endif
X+
X 
X /* Define if you want fold checked that it never destructs its argument. This
X    is quite expensive. */
X-#define ENABLE_FOLD_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_FOLD_CHECKING */
X+#endif
X+
X 
X /* Define if you want the garbage collector to operate in maximally paranoid
X    mode, validating the entire heap and collecting garbage at every
X    opportunity. This is extremely expensive. */
X-#define ENABLE_GC_ALWAYS_COLLECT 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_GC_ALWAYS_COLLECT */
X+#endif
X+
X 
X /* Define if you want the garbage collector to do object poisoning and other
X    memory allocation checks. This is quite expensive. */
X-#define ENABLE_GC_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_GC_CHECKING */
X+#endif
X+
X+
X+/* Define to 1 if translation of program messages to the user's native
X+   language is requested. */
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_NLS */
X+#endif
X+
X 
X /* Define if you want all operations on RTL (the basic data structure of the
X    optimizer and back end) to be checked for dynamic type safety at runtime.
X    This is quite expensive. */
X-#define ENABLE_RTL_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_RTL_CHECKING */
X+#endif
X+
X 
X /* Define if you want RTL flag accesses to be checked against the RTL codes
X    that are supported for each access macro. This is relatively cheap. */
X-#define ENABLE_RTL_FLAG_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_RTL_FLAG_CHECKING */
X+#endif
X+
X+
X+/* Define if you want runtime assertions enabled. This is a cheap check. */
X+#define ENABLE_RUNTIME_CHECKING 1
X 
X /* Define if you want all operations on trees (the basic data structure of the
X    front ends) to be checked for dynamic type safety at runtime. This is
X-   moderately expensive. */
X-#define ENABLE_TREE_CHECKING 1
X+   moderately expensive. The tree browser debugging routines will also be
X+   enabled by this option. */
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_TREE_CHECKING */
X+#endif
X+
X 
X /* Define if you want to run subprograms and generated programs through
X    valgrind (a memory checker). This is extremely expensive. */
X+#ifndef USED_FOR_TARGET
X /* #undef ENABLE_VALGRIND_CHECKING */
X+#endif
X 
X-#endif /* WANT_COMPILER_INVARIANTS */
X 
X-/* Define to 1 if installation paths should be looked up in Windows32
X-   Registry. Ignored on non windows32 hosts. */
X+/* Define to 1 if installation paths should be looked up in the Windows
X+   Registry. Ignored on non-Windows hosts. */
X+#ifndef USED_FOR_TARGET
X /* #undef ENABLE_WIN32_REGISTRY */
X+#endif
X+
X+
X+/* Define to the name of a file containing a list of extra machine modes for
X+   this architecture. */
X+#ifndef USED_FOR_TARGET
X+/* #undef EXTRA_MODES_FILE */
X+#endif
X+
X 
X /* Define to enable detailed memory allocation stats gathering. */
X+#ifndef USED_FOR_TARGET
X /* #undef GATHER_STATISTICS */
X+#endif
X+
X 
X /* Define to the type of elements in the array set by `getgroups'. Usually
X    this is either `int' or `gid_t'. */
X+#ifndef USED_FOR_TARGET
X #define GETGROUPS_T gid_t
X+#endif
X+
X+
X+/* Define if the zone collector is in use */
X+#ifndef USED_FOR_TARGET
X+/* #undef GGC_ZONE */
X+#endif
X+
X 
X /* Define to 1 if you have the `alphasort' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_ALPHASORT 1
X+#endif
X+
X 
X /* Define if your assembler supports dwarf2 .file/.loc directives, and
X    preserves file table indices exactly as given. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_DWARF2_DEBUG_LINE 1
X+#endif
X+
X 
X /* Define if your assembler supports explicit relocations. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_AS_EXPLICIT_RELOCS */
X+#endif
X+
X+
X+/* Define if your assembler supports fprnd. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_AS_FPRND */
X+#endif
X+
X 
X /* Define if your assembler supports the --gdwarf2 option. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_GDWARF2_DEBUG_FLAG 1
X+#endif
X+
X 
X /* Define true if the assembler supports '.long foo@GOTOFF'. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_GOTOFF_IN_DATA 1
X+#endif
X+
X 
X /* Define if your assembler supports the --gstabs option. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_GSTABS_DEBUG_FLAG 1
X+#endif
X+
X 
X /* Define if your assembler supports the Sun syntax for cmov. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_AS_IX86_CMOV_SUN_SYNTAX */
X+#endif
X+
X+
X+/* Define if your assembler supports the lituse_jsrdirect relocation. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_AS_JSRDIRECT_RELOCS */
X+#endif
X+
X 
X /* Define if your assembler supports .sleb128 and .uleb128. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_LEB128 1
X+#endif
X+
X 
X /* Define if your assembler supports ltoffx and ldxmov relocations. */
X-/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_LTOFFX_LDXMOV_RELOCS 1
X+#endif
X+
X 
X /* Define if your assembler supports mfcr field. */
X-/* #undef HAVE_AS_MFCRF */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_MFCRF 1
X+#endif
X+
X 
X /* Define if your assembler supports the -no-mul-bug-abort option. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION */
X+#endif
X+
X 
X /* Define if your assembler supports offsetable %lo(). */
X-/* #undef HAVE_AS_OFFSETABLE_LO10 */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_OFFSETABLE_LO10 1
X+#endif
X+
X+
X+/* Define if your assembler supports popcntb field. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_AS_POPCNTB */
X+#endif
X+
X 
X /* Define if your assembler supports .register. */
X-/* #undef HAVE_AS_REGISTER_PSEUDO_OP */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_REGISTER_PSEUDO_OP 1
X+#endif
X+
X+
X+/* Define if your assembler supports R_PPC_REL16 relocs. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_AS_REL16 */
X+#endif
X+
X 
X /* Define if your assembler supports -relax option. */
X-/* #undef HAVE_AS_RELAX_OPTION */
X+#ifndef USED_FOR_TARGET
X+# ifdef __sparc64__
X+#  define HAVE_AS_RELAX_OPTION 1
X+# endif
X+#endif
X+
X 
X /* Define if your assembler and linker support unaligned PC relative relocs.
X    */
X-/* #undef HAVE_AS_SPARC_UA_PCREL */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_SPARC_UA_PCREL 1
X+#endif
X+
X 
X /* Define if your assembler and linker support unaligned PC relative relocs
X    against hidden symbols. */
X-/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_SPARC_UA_PCREL_HIDDEN 1
X+#endif
X+
X 
X /* Define if your assembler supports thread-local storage. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_TLS 1
X+#endif
X+
X 
X /* Define to 1 if you have the `atoll' function. */
X-#if __FreeBSD_version >= 500027
X+#ifndef USED_FOR_TARGET
X #define HAVE_ATOLL 1
X #endif
X 
X+
X /* Define to 1 if you have the `atoq' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_ATOQ */
X+#endif
X+
X+
X+/* Define to 1 if you have the `clearerr_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_CLEARERR_UNLOCKED 1
X+#endif
X+
X 
X /* Define to 1 if you have the `clock' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_CLOCK 1
X+#endif
X+
X 
X /* Define if <time.h> defines clock_t. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_CLOCK_T 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define 0/1 if your assembler and linker support COMDAT groups. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_COMDAT_GROUP 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'abort', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_ABORT 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'asprintf', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_ASPRINTF 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'atof', otherwise define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_ATOF 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'atol', otherwise define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_ATOL 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'basename', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_BASENAME 0
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'calloc', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_CALLOC 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'clearerr_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_CLEARERR_UNLOCKED 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'clock', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_CLOCK 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'errno', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_ERRNO 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'feof_unlocked', otherwise define
X+   to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FEOF_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'ferror_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FERROR_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fflush_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FFLUSH_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fgetc_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FGETC_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fgets_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FGETS_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fileno_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FILENO_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fprintf_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_FPRINTF_UNLOCKED 0
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'fputc_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FPUTC_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fputs_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_FPUTS_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fread_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FREAD_UNLOCKED 0
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'free', otherwise define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_FREE 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'fwrite_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_FWRITE_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'getchar_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_GETCHAR_UNLOCKED 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'getcwd', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETCWD 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'getc_unlocked', otherwise define
X+   to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_GETC_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'getenv', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETENV 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'getopt', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETOPT 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'getpagesize', otherwise define
X+   to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_GETPAGESIZE 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'getrlimit', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETRLIMIT 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'getrusage', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETRUSAGE 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'getwd', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETWD 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'ldgetname', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_LDGETNAME 0
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'malloc', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_MALLOC 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'putchar_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_PUTCHAR_UNLOCKED 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'putc_unlocked', otherwise define
X+   to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_PUTC_UNLOCKED 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'realloc', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_REALLOC 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'sbrk', otherwise define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_SBRK 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'setrlimit', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_SETRLIMIT 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'snprintf', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_SNPRINTF 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'strsignal', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_STRSIGNAL 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'strstr', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_STRSTR 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'strverscmp', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_STRVERSCMP 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'times', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_TIMES 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'vasprintf', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_VASPRINTF 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'vsnprintf', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_VSNPRINTF 1
X+#endif
X+
X 
X /* Define to 1 if you have the <direct.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_DIRECT_H */
X+#endif
X 
X-/* Define to 1 if you have the `dup2' function. */
X-#define HAVE_DUP2 1
X 
X /* Define to 1 if you have the <fcntl.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_FCNTL_H 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `feof_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_FEOF_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `ferror_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_FERROR_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `fflush_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_FFLUSH_UNLOCKED */
X+#endif
X+
X+
X+/* Define to 1 if you have the `fgetc_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_FGETC_UNLOCKED */
X+#endif
X+
X+
X+/* Define to 1 if you have the `fgets_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_FGETS_UNLOCKED */
X+#endif
X+
X+
X+/* Define to 1 if you have the `fileno_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_FILENO_UNLOCKED 1
X+#endif
X+
X 
X /* Define to 1 if you have the `fork' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_FORK 1
X+#endif
X+
X 
X /* Define to 1 if you have the `fprintf_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_FPRINTF_UNLOCKED */
X+#endif
X+
X 
X /* Define to 1 if you have the `fputc_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_FPUTC_UNLOCKED */
X+#endif
X+
X 
X /* Define to 1 if you have the `fputs_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_FPUTS_UNLOCKED */
X+#endif
X+
X+
X+/* Define to 1 if you have the `fread_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_FREAD_UNLOCKED */
X+#endif
X+
X 
X /* Define to 1 if you have the `fwrite_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_FWRITE_UNLOCKED */
X+#endif
X+
X 
X /* Define if your assembler supports .balign and .p2align. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_BALIGN_AND_P2ALIGN 1
X+#endif
X+
X 
X /* Define if your assembler uses the new HImode fild and fist notation. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_FILDS_FISTS 1
X+#endif
X+
X 
X /* Define if your assembler and linker support .hidden. */
X #define HAVE_GAS_HIDDEN 1
X 
X /* Define if your assembler supports specifying the maximum number of bytes to
X    skip when using the GAS .p2align command. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_MAX_SKIP_P2ALIGN 1
X+#endif
X+
X+
X+/* Define if your assembler supports .nsubspa comdat option. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_GAS_NSUBSPA_COMDAT */
X+#endif
X+
X+
X+/* Define if your assembler and linker support 32-bit section relative relocs
X+   via '.secrel32 label'. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_GAS_PE_SECREL32_RELOC */
X+#endif
X+
X 
X /* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag.
X    */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_SHF_MERGE 1
X+#endif
X+
X 
X /* Define if your assembler supports .subsection and .subsection -1 starts
X    emitting at the beginning of your section. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_SUBSECTION_ORDERING 1
X+#endif
X+
X 
X /* Define if your assembler supports .weak. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_WEAK 1
X+#endif
X+
X+
X+/* Define if your assembler supports .weakref. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_GAS_WEAKREF */
X+#endif
X+
X+
X+/* Define to 1 if you have the `getchar_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_GETCHAR_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `getc_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_GETC_UNLOCKED 1
X+#endif
X+
X 
X /* Define to 1 if you have the `getrlimit' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GETRLIMIT 1
X+#endif
X+
X 
X /* Define to 1 if you have the `getrusage' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GETRUSAGE 1
X+#endif
X+
X 
X /* Define to 1 if you have the `gettimeofday' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GETTIMEOFDAY 1
X+#endif
X+
X 
X /* Define if you have the iconv() function. */
X-/* #undef HAVE_ICONV */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_ICONV 1
X+#endif
X+
X 
X /* Define to 1 if you have the <iconv.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_ICONV_H */
X+#endif
X+
X 
X /* Define .init_array/.fini_array sections are available and working. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_INITFINI_ARRAY */
X+#endif
X+
X 
X /* Define if you have a working <inttypes.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_INTTYPES_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `kill' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_KILL 1
X+#endif
X+
X+
X+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_LANGINFO_CODESET 1
X+#endif
X+
X 
X /* Define to 1 if you have the <langinfo.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LANGINFO_H 1
X+#endif
X+
X 
X /* Define if your <locale.h> file defines LC_MESSAGES. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LC_MESSAGES 1
X+#endif
X+
X 
X /* Define to 1 if you have the <ldfcn.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_LDFCN_H */
X+#endif
X+
X 
X /* Define if your linker supports --as-needed and --no-as-needed options. */
X-/* #undef HAVE_LD_AS_NEEDED */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_LD_AS_NEEDED 1
X+#endif
X+
X+
X+/* Define if your linker supports --demangle option. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_LD_DEMANGLE */
X+#endif
X+
X 
X /* Define if your linker supports --eh-frame-hdr option. */
X #define HAVE_LD_EH_FRAME_HDR 1
X 
X+/* Define if your PowerPC64 linker only needs function descriptor syms. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_LD_NO_DOT_SYMS */
X+#endif
X+
X+
X /* Define if your linker supports -pie option. */
X-/* #undef HAVE_LD_PIE */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_LD_PIE 1
X+#endif
X+
X 
X /* Define if your linker links a mix of read-only and read-write sections into
X    a read-write section. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LD_RO_RW_SECTION_MIXING 1
X+#endif
X+
X+
X+/* Define if your linker supports -Bstatic/-Bdynamic option. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_LD_STATIC_DYNAMIC 1
X+#endif
X+
X+
X+/* Define if your linker supports --sysroot. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_LD_SYSROOT */
X+#endif
X+
X 
X /* Define to 1 if you have the <limits.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LIMITS_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <locale.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LOCALE_H 1
X+#endif
X 
X-/* Define if your compiler supports the \`long long' type. */
X+
X+/* Define to 1 if the system has the type `long long'. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LONG_LONG 1
X+#endif
X+
X 
X /* Define to 1 if you have the <malloc.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_MALLOC_H */
X+#endif
X+
X 
X /* Define to 1 if you have the `mbstowcs' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MBSTOWCS 1
X+#endif
X+
X 
X /* Define if valgrind's memcheck.h header is installed. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_MEMCHECK_H */
X+#endif
X+
X 
X /* Define to 1 if you have the <memory.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MEMORY_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `mincore' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MINCORE 1
X+#endif
X+
X 
X /* Define to 1 if you have the `mmap' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MMAP 1
X+#endif
X+
X 
X /* Define if mmap with MAP_ANON(YMOUS) works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MMAP_ANON 1
X+#endif
X+
X 
X /* Define if mmap of /dev/zero works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MMAP_DEV_ZERO 1
X+#endif
X+
X 
X /* Define if read-only mmap of a plain file works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MMAP_FILE 1
X+#endif
X+
X 
X /* Define to 1 if you have the `nl_langinfo' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_NL_LANGINFO 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `putchar_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_PUTCHAR_UNLOCKED 1
X+#endif
X 
X-/* Define if printf supports "%p". */
X-#define HAVE_PRINTF_PTR 1
X 
X /* Define to 1 if you have the `putc_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_PUTC_UNLOCKED 1
X+#endif
X+
X 
X /* Define to 1 if you have the `scandir' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SCANDIR 1
X+#endif
X+
X 
X /* Define to 1 if you have the `setlocale' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SETLOCALE 1
X+#endif
X+
X 
X /* Define to 1 if you have the `setrlimit' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SETRLIMIT 1
X-
X-/* Define if you have a working <stdbool.h> header file. */
X-#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \
X-    __FreeBSD_version >= 500014
X-#define HAVE_STDBOOL_H 1
X #endif
X 
X+
X /* Define to 1 if you have the <stddef.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STDDEF_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <stdint.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STDINT_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <stdlib.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STDLIB_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <strings.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STRINGS_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <string.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STRING_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `strsignal' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STRSIGNAL 1
X+#endif
X+
X 
X /* Define if <sys/times.h> defines struct tms. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STRUCT_TMS 1
X+#endif
X+
X 
X /* Define to 1 if you have the `sysconf' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYSCONF 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/file.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_FILE_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/mman.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_MMAN_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/param.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_PARAM_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/resource.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_RESOURCE_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/stat.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_STAT_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/times.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_TIMES_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/time.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_TIME_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/types.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_TYPES_H 1
X+#endif
X+
X 
X /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_WAIT_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `times' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_TIMES 1
X+#endif
X+
X 
X /* Define to 1 if you have the <time.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_TIME_H 1
X+#endif
X 
X-/* Define if <sys/types.h> defines \`uchar'. */
X-/* #undef HAVE_UCHAR */
X 
X /* Define to 1 if you have the <unistd.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_UNISTD_H 1
X+#endif
X+
X 
X /* Define if valgrind's valgrind/memcheck.h header is installed. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_VALGRIND_MEMCHECK_H */
X+#endif
X+
X 
X /* Define to 1 if you have the `vfork' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_VFORK 1
X+#endif
X+
X 
X /* Define to 1 if you have the <vfork.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_VFORK_H */
X+#endif
X+
X 
X /* Define to 1 if you have the <wchar.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WCHAR_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `wcswidth' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WCSWIDTH 1
X+#endif
X+
X 
X /* Define to 1 if `fork' works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WORKING_FORK 1
X+#endif
X+
X 
X /* Define this macro if mbstowcs does not crash when its first argument is
X    NULL. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WORKING_MBSTOWCS 1
X+#endif
X+
X 
X /* Define to 1 if `vfork' works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WORKING_VFORK 1
X+#endif
X 
X-/* Define if the \`_Bool' type is built-in. */
X-#define HAVE__BOOL 1
X 
X-/* Define if your compiler supports the \`__int64' type. */
X+/* Define to 1 if the system has the type `__int64'. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE___INT64 */
X-
X-/* Define if the host machine stores words of multi-word integers in
X-   big-endian order. */
X-#if _QUAD_HIGHWORD == 0
X-#define HOST_WORDS_BIG_ENDIAN 1 
X #endif
X 
X+
X /* Define as const if the declaration of iconv() needs const. */
X-/* #undef ICONV_CONST */
X+#ifndef USED_FOR_TARGET
X+#define ICONV_CONST const
X+#endif
X+
X 
X /* Define if host mkdir takes a single argument. */
X+#ifndef USED_FOR_TARGET
X /* #undef MKDIR_TAKES_ONE_ARG */
X+#endif
X+
X 
X /* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */
X+#ifndef USED_FOR_TARGET
X #define NEED_64BIT_HOST_WIDE_INT 1
X+#endif
X+
X 
X /* Define to 1 if your C compiler doesn't accept -c and -o together. */
X+#ifndef USED_FOR_TARGET
X /* #undef NO_MINUS_C_MINUS_O */
X+#endif
X+
X 
X /* Define to the address where bug reports for this package should be sent. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_BUGREPORT ""
X+#endif
X+
X 
X /* Define to the full name of this package. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_NAME ""
X+#endif
X+
X 
X /* Define to the full name and version of this package. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_STRING ""
X+#endif
X+
X 
X /* Define to the one symbol short name of this package. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_TARNAME ""
X+#endif
X+
X 
X /* Define to the version of this package. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_VERSION ""
X+#endif
X+
X 
X /* Define to PREFIX/include if cpp should also search that directory. */
X+#ifndef USED_FOR_TARGET
X /* #undef PREFIX_INCLUDE_DIR */
X+#endif
X 
X-/* The number of bytes in type int */
X+
X+/* The size of a `int', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X #define SIZEOF_INT 4
X+#endif
X 
X-#if defined(__i386__) || defined(__powerpc__) || defined(__arm__)
X-/* The number of bytes in type long */
X-# define SIZEOF_LONG SIZEOF_INT
X-#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
X-# define SIZEOF_LONG SIZEOF_LONG_LONG
X-#else
X-# error "I don't know what arch this is."
X+
X+/* The size of a `long', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X+#define SIZEOF_LONG 4
X #endif
X 
X-/* The number of bytes in type long long */
X+
X+/* The size of a `long long', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X #define SIZEOF_LONG_LONG 8
X+#endif
X+
X 
X-/* The number of bytes in type short */
X+/* The size of a `short', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X #define SIZEOF_SHORT 2
X+#endif
X+
X+
X+/* The size of a `void *', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X+#define SIZEOF_VOID_P 4
X+#endif
X 
X-/* The number of bytes in type void * */
X-#define SIZEOF_VOID_P SIZEOF_LONG
X 
X-/* The number of bytes in type __int64 */
X+/* The size of a `__int64', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X /* #undef SIZEOF___INT64 */
X+#endif
X+
X 
X /* Define to 1 if you have the ANSI C header files. */
X+#ifndef USED_FOR_TARGET
X #define STDC_HEADERS 1
X+#endif
X+
X 
X /* Define if you can safely include both <string.h> and <strings.h>. */
X+#ifndef USED_FOR_TARGET
X #define STRING_WITH_STRINGS 1
X+#endif
X+
X+
X+/* Define if your target C library provides stack protector support */
X+#ifndef USED_FOR_TARGET
X+/* #undef TARGET_LIBC_PROVIDES_SSP */
X+#endif
X+
X 
X /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
X+#ifndef USED_FOR_TARGET
X #define TIME_WITH_SYS_TIME 1
X+#endif
X+
X 
X /* Define if your assembler mis-optimizes .eh_frame data. */
X+#ifndef USED_FOR_TARGET
X /* #undef USE_AS_TRADITIONAL_FORMAT */
X+#endif
X+
X+
X+/* Define to 1 if the 'long long' (or '__int64') is wider than 'long' but
X+   still efficiently supported by the host hardware. */
X+#ifndef USED_FOR_TARGET
X+/* #undef USE_LONG_LONG_FOR_WIDEST_FAST_INT */
X+#endif
X 
X-/* Define if gcc should use -lunwind. */
X-/* #undef USE_LIBUNWIND_EXCEPTIONS */
X 
X-/* Define to be the last portion of registry key on windows hosts. */
X+/* Define if location_t is fileline integer cookie. */
X+#ifndef USED_FOR_TARGET
X+/* #undef USE_MAPPED_LOCATION */
X+#endif
X+
X+
X+/* Define to be the last component of the Windows registry key under which to
X+   look for installation paths. The full key used will be
X+   HKEY_LOCAL_MACHINE/SOFTWARE/Free Software Foundation/{WIN32_REGISTRY_KEY}.
X+   The default is the GCC version number. */
X+#ifndef USED_FOR_TARGET
X /* #undef WIN32_REGISTRY_KEY */
X+#endif
X 
X-/* whether byteorder is bigendian */
X+
X+/* Define to 1 if your processor stores words with the most significant byte
X+   first (like Motorola and SPARC, unlike Intel and VAX). */
X+#ifndef USED_FOR_TARGET
X /* #undef WORDS_BIGENDIAN */
X+#endif
X+
X 
X /* Always define this when using the GNU C Library */
X+#ifndef USED_FOR_TARGET
X /* #undef _GNU_SOURCE */
X+#endif
X+
X 
X /* Define to `int' if <sys/types.h> doesn't define. */
X+#ifndef USED_FOR_TARGET
X /* #undef gid_t */
X+#endif
X+
X 
X-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
X-   if it is not supported. */
X+/* Define to `__inline__' or `__inline' if that's what the C compiler
X+   calls it, or to nothing if 'inline' is not supported under any name.  */
X+#ifndef __cplusplus
X /* #undef inline */
X+#endif
X 
X /* Define to `int' if <sys/types.h> does not define. */
X+#ifndef USED_FOR_TARGET
X /* #undef pid_t */
X+#endif
X+
X 
X /* Define to \`long' if <sys/resource.h> doesn't define. */
X+#ifndef USED_FOR_TARGET
X /* #undef rlim_t */
X+#endif
X+
X 
X /* Define to `int' if <sys/types.h> does not define. */
X+#ifndef USED_FOR_TARGET
X /* #undef ssize_t */
X+#endif
X+
X 
X /* Define to `int' if <sys/types.h> doesn't define. */
X+#ifndef USED_FOR_TARGET
X /* #undef uid_t */
X+#endif
X+
X 
X /* Define as `fork' if `vfork' does not work. */
X+#ifndef USED_FOR_TARGET
X /* #undef vfork */
X+#endif
X+
X+/* Override SIZEOF_?? using proper values. */
X+#include <size-host.h>
XIndex: gnu/usr.bin/cc/cc_tools/freebsd-native.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v
Xretrieving revision 1.27
Xdiff -u -r1.27 freebsd-native.h
X--- gnu/usr.bin/cc/cc_tools/freebsd-native.h	21 Sep 2006 03:27:07 -0000	1.27
X+++ gnu/usr.bin/cc/cc_tools/freebsd-native.h	4 Apr 2007 17:32:01 -0000
X@@ -1,4 +1,4 @@
X-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.27 2006/09/21 03:27:07 kan Exp $ */
X+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.26 2005/10/30 19:04:47 obrien Exp $ */
X 
X /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD
X    source tree so it can be configured appropriately without using
X@@ -8,15 +8,19 @@
X 
X /* Fake out gcc/config/freebsd<version>.h.  */
X #define	FBSD_MAJOR	7
X-#define	FBSD_CC_VER	700002		/* form like __FreeBSD_version */
X+#define	FBSD_CC_VER	700003		/* form like __FreeBSD_version */
X 
X #undef SYSTEM_INCLUDE_DIR		/* We don't need one for now. */
X #undef TOOL_INCLUDE_DIR			/* We don't need one for now. */
X #undef LOCAL_INCLUDE_DIR		/* We don't wish to support one. */
X 
X /* Look for the include files in the system-defined places.  */
X+#define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/4.1"
X+#define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/4.1/backward"
X+#if XXXKAN
X #define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/3.4"
X #define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/3.4/backward"
X+#endif
X #define GCC_INCLUDE_DIR			PREFIX"/include"
X #ifdef CROSS_COMPILE
X #define CROSS_INCLUDE_DIR		PREFIX"/include"
X@@ -28,9 +32,9 @@
X    /usr/libexec directory.
X 
X    ``cc --print-search-dirs'' gives:
X-   install: STANDARD_EXEC_PREFIX/(null)
X-   programs: /usr/libexec/<OBJFORMAT>/:STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX
X-   libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX
X+   install: STANDARD_EXEC_PREFIX/
X+   programs: STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX
X+   libraries: STANDARD_STARTFILE_PREFIX
X */
X #undef	STANDARD_BINDIR_PREFIX		/* We don't need one for now. */
X #define	STANDARD_EXEC_PREFIX		PREFIX"/libexec/"
X@@ -46,20 +50,24 @@
X #define STANDARD_STARTFILE_PREFIX	PREFIX"/lib/"
X #define STARTFILE_PREFIX_SPEC		PREFIX"/lib/"
X 
X-/* For the native system compiler, we actually build libgcc in a profiled
X-   version.  So we should use it with -pg.  */
X+#if 0
X #define LIBGCC_SPEC		"%{shared: -lgcc_pic} \
X     %{!shared: %{!pg: -lgcc} %{pg: -lgcc_p}}"
X+#endif
X #define LIBSTDCXX_PROFILE	"-lstdc++_p"
X #define MATH_LIBRARY_PROFILE	"-lm_p"
X #define FORTRAN_LIBRARY_PROFILE	"-lg2c_p"
X 
X+#if 1
X+#define LIBGCC_SPEC		"-lgcc"
X+/* For the native system compiler, we actually build libgcc in a profiled
X+   version.  So we should use it with -pg.  */
X+#define LIBGCC_STATIC_LIB_SPEC	  "%{pg: -lgcc_p;:-lgcc}"
X+#define LIBGCC_EH_STATIC_LIB_SPEC "%{pg: -lgcc_eh_p;:-lgcc_eh}"
X+#else
X+#define LIBGCC_STATIC_LIB_SPEC "-lgcc"
X+#define LIBGCC_EH_STATIC_LIB_SPEC "-lgcc_eh"
X+#endif
X+
X /* FreeBSD is 4.4BSD derived */
X #define bsd4_4
X-
X-/* And now they want to replace ctype.h.... grr... [stupid, IMHO] */
X-#define xxxISDIGIT	isdigit
X-#define xxxISGRAPH	isgraph
X-#define xxxISLOWER	islower
X-#define xxxISSPACE	isspace
X-#define xxxTOUPPER	toupper
XIndex: gnu/usr.bin/cc/cpp/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cpp/Makefile,v
Xretrieving revision 1.26
Xdiff -u -r1.26 Makefile
X--- gnu/usr.bin/cc/cpp/Makefile	21 Sep 2006 07:52:41 -0000	1.26
X+++ gnu/usr.bin/cc/cpp/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,14 +1,20 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.26 2006/09/21 07:52:41 ru Exp $
X+# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.24 2004/02/05 22:44:21 ru Exp $
X 
X .include "../Makefile.inc"
X .include "../Makefile.fe"
X 
X-.PATH: ${GCCDIR} ${GCCDIR}/doc
X+.PATH: ${GCCDIR}
X 
X PROG=	cpp
X SRCS=	gcc.c cppspec.c
X+NO_MAN=
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBBACKEND} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBIBERTY}
X+
X+CLEANFILES= cpp.1
X+
X+cpp.1: cccp.1
X+	cat ${.ALLSRC} > ${.TARGET}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/doc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/doc/Makefile,v
Xretrieving revision 1.13
Xdiff -u -r1.13 Makefile
X--- gnu/usr.bin/cc/doc/Makefile	28 Jul 2004 05:27:20 -0000	1.13
X+++ gnu/usr.bin/cc/doc/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,6 +1,7 @@
X # $FreeBSD: src/gnu/usr.bin/cc/doc/Makefile,v 1.13 2004/07/28 05:27:20 kan Exp $
X 
X .include "../Makefile.inc"
X+.include "../Makefile.ver"
X 
X .PATH: ${GCCDIR}/doc
X 
X@@ -16,17 +17,28 @@
X     invoke.texi extend.texi md.texi objc.texi gcov.texi trouble.texi \
X     bugreport.texi service.texi contribute.texi compat.texi \
X     include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
X-    contrib.texi cppenv.texi cppopts.texi
X+    contrib.texi cppenv.texi cppopts.texi gcc-vers.texi
X 
X gccint.info: gccint.texi include/gcc-common.texi contribute.texi \
X     makefile.texi configterms.texi portability.texi interface.texi \
X     passes.texi c-tree.texi rtl.texi md.texi tm.texi hostconfig.texi \
X     fragments.texi configfiles.texi collect2.texi headerdirs.texi \
X     include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
X-    contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi
X+    contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi \
X+    gcc-vers.texi
X 
X cpp.info: cpp.texi include/fdl.texi cppenv.texi cppopts.texi
X 
X MAKEINFOFLAGS+= -I ${GCCDIR}/doc -I ${GCCDIR}/doc/include
X 
X+gcc-vers.texi:
X+	(echo "@set version-GCC $(BASEVER)"; \
X+	if [ "$(DEVPHASE)" = "experimental" ]; then \
X+		echo "@set DEVELOPMENT"; \
X+	else \
X+		echo "@clear DEVELOPMENT"; \
X+	fi) > ${.TARGET}
X+
X+CLEANFILES+=    gcc-vers.texi
X+
X .include <bsd.info.mk>
XIndex: gnu/usr.bin/cc/gcov/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/gcov/Makefile,v
Xretrieving revision 1.4
Xdiff -u -r1.4 Makefile
X--- gnu/usr.bin/cc/gcov/Makefile	28 Jul 2004 05:27:20 -0000	1.4
X+++ gnu/usr.bin/cc/gcov/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,13 +1,20 @@
X # $FreeBSD: src/gnu/usr.bin/cc/gcov/Makefile,v 1.4 2004/07/28 05:27:20 kan Exp $
X 
X .include "../Makefile.inc"
X+.include "../Makefile.ver"
X 
X .PATH: ${GCCDIR} ${GCCDIR}/doc
X 
X PROG=	gcov
X-SRCS=	gcov.c version.c
X+SRCS=	gcov.c version.c errors.c
X+NO_MAN=
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBIBERTY}
X+LDADD=	${LIBIBERTY}
X+
X+version.o:	version.c
X+	${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \
X+		-DDATESTAMP=\"\ ${DATESTAMP}\" \
X+		-DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/include/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/include/Makefile,v
Xretrieving revision 1.8
Xdiff -u -r1.8 Makefile
X--- gnu/usr.bin/cc/include/Makefile	21 Dec 2004 08:46:50 -0000	1.8
X+++ gnu/usr.bin/cc/include/Makefile	24 Jan 2007 05:56:49 -0000
X@@ -5,7 +5,7 @@
X .PATH: ${GCCDIR}/config/${GCC_CPU}
X 
X .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
X-INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h
X+INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h mm_malloc.h
X .elif ${TARGET_ARCH} == "ia64"
X INCS=	ia64intrin.h
X .elif ${TARGET_ARCH} == "arm"
X@@ -14,7 +14,10 @@
X INCS=	ppc-asm.h altivec.h spe.h
X .endif
X 
X-NO_OBJ=
X+mm_malloc.h: pmm_malloc.h
X+	@rm -rf ${.TARGET}
X+	@cp ${.ALLSRC} ${.TARGET}
X+CLEANFILES+=	mm_malloc.h
X 
X .include <bsd.init.mk>
X .include <bsd.incs.mk>
XIndex: gnu/usr.bin/gdb/kgdb/kgdb.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/gdb/kgdb/kgdb.h,v
Xretrieving revision 1.4
Xdiff -u -r1.4 kgdb.h
X--- gnu/usr.bin/gdb/kgdb/kgdb.h	1 Mar 2007 13:55:15 -0000	1.4
X+++ gnu/usr.bin/gdb/kgdb/kgdb.h	3 Mar 2007 17:06:29 -0000
X@@ -32,7 +32,6 @@
X struct thread_info;
X 
X extern kvm_t *kvm;
X-extern int verbose;
X 
X struct kthr {
X 	struct kthr	*next;
XIndex: include/nsswitch.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/include/nsswitch.h,v
Xretrieving revision 1.4
Xdiff -u -r1.4 nsswitch.h
X--- include/nsswitch.h	28 Apr 2006 12:03:34 -0000	1.4
X+++ include/nsswitch.h	17 Dec 2006 06:49:27 -0000
X@@ -208,7 +208,7 @@
X typedef struct _ns_dbt {
X 	const char	*name;		/* name of database */
X 	ns_src		*srclist;	/* list of sources */
X-	int		 srclistsize;	/* size of srclist */
X+	unsigned int	 srclistsize;	/* size of srclist */
X } ns_dbt;
X 
X /*
XIndex: lib/libc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/Makefile,v
Xretrieving revision 1.69
Xdiff -u -r1.69 Makefile
X--- lib/libc/Makefile	4 Mar 2007 12:25:03 -0000	1.69
X+++ lib/libc/Makefile	2 Apr 2007 15:14:43 -0000
X@@ -20,6 +20,11 @@
X INSTALL_PIC_ARCHIVE=
X PRECIOUSLIB=
X 
X+#
X+# Only link with static libgcc.a (no libgcc_eh.a).
X+#
X+LDFLAGS+= -v -nodefaultlibs -Wl,-Bstatic,-lgcc,-Bdynamic
X+
X # Define (empty) variables so that make doesn't give substitution
X # errors if the included makefiles don't change these:
X MDSRCS=
XIndex: lib/libc/arm/softfloat/softfloat.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/arm/softfloat/softfloat.h,v
Xretrieving revision 1.1
Xdiff -u -r1.1 softfloat.h
X--- lib/libc/arm/softfloat/softfloat.h	14 May 2004 12:04:30 -0000	1.1
X+++ lib/libc/arm/softfloat/softfloat.h	5 Apr 2007 02:54:17 -0000
X@@ -71,7 +71,9 @@
X Software IEC/IEEE floating-point underflow tininess-detection mode.
X -------------------------------------------------------------------------------
X */
X+#ifndef SOFTFLOAT_FOR_GCC
X extern int float_detect_tininess;
X+#endif
X enum {
X     float_tininess_after_rounding  = 0,
X     float_tininess_before_rounding = 1
XIndex: lib/libc/gen/arc4random.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/gen/arc4random.c,v
Xretrieving revision 1.11
Xdiff -u -r1.11 arc4random.c
X--- lib/libc/gen/arc4random.c	4 Oct 2006 01:17:23 -0000	1.11
X+++ lib/libc/gen/arc4random.c	17 Dec 2006 06:49:27 -0000
X@@ -118,7 +118,7 @@
X 	/* fd < 0?  Ah, what the heck. We'll just take whatever was on the
X 	 * stack... */
X 
X-	arc4_addrandom(as, (void *) &rdat, sizeof(rdat));
X+	arc4_addrandom(as, (u_char *) &rdat, sizeof(rdat));
X 
X 	/*
X 	 * Throw away the first N bytes of output, as suggested in the
XIndex: lib/libc/gmon/mcount.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/gmon/mcount.c,v
Xretrieving revision 1.22
Xdiff -u -r1.22 mcount.c
X--- lib/libc/gmon/mcount.c	9 Jan 2007 00:27:58 -0000	1.22
X+++ lib/libc/gmon/mcount.c	24 Jan 2007 01:52:56 -0000
X@@ -89,7 +89,8 @@
X #ifdef _KERNEL
X 	MCOUNT_ENTER(s);
X #else
X-	if (!atomic_cmpset_acq_int(&p->state, GMON_PROF_ON, GMON_PROF_BUSY))
X+	if (!atomic_cmpset_acq_int((u_int *)&p->state, GMON_PROF_ON,
X+	    GMON_PROF_BUSY))
X 		return;
X #endif
X 	frompci = frompc - p->lowpc;
X@@ -258,11 +259,11 @@
X #ifdef _KERNEL
X 	MCOUNT_EXIT(s);
X #else
X-	atomic_store_rel_int(&p->state, GMON_PROF_ON);
X+	atomic_store_rel_int((u_int *)&p->state, GMON_PROF_ON);
X #endif
X 	return;
X overflow:
X-	atomic_store_rel_int(&p->state, GMON_PROF_ERROR);
X+	atomic_store_rel_int((u_int *)&p->state, GMON_PROF_ERROR);
X #ifdef _KERNEL
X 	MCOUNT_EXIT(s);
X #endif
XIndex: lib/libc/locale/collate.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/locale/collate.c,v
Xretrieving revision 1.35
Xdiff -u -r1.35 collate.c
X--- lib/libc/locale/collate.c	27 Feb 2005 20:31:13 -0000	1.35
X+++ lib/libc/locale/collate.c	17 Dec 2006 06:49:27 -0000
X@@ -47,7 +47,7 @@
X int __collate_load_error = 1;
X int __collate_substitute_nontrivial;
X 
X-u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
X+char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
X struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
X struct __collate_st_chain_pri *__collate_chain_pri_table;
X 
X@@ -200,12 +200,12 @@
X 	return (_LDP_LOADED);
X }
X 
X-u_char *
X-__collate_substitute(const u_char *s)
X+char *
X+__collate_substitute(const char *s)
X {
X 	int dest_len, len, nlen;
X 	int delta = strlen(s);
X-	u_char *dest_str = NULL;
X+	char *dest_str = NULL;
X 
X 	if (s == NULL || *s == '\0')
X 		return (__collate_strdup(""));
X@@ -215,20 +215,21 @@
X 		__collate_err(EX_OSERR, __func__);
X 	len = 0;
X 	while (*s) {
X-		nlen = len + strlen(__collate_substitute_table[*s]);
X+		nlen = len + strlen(__collate_substitute_table[(u_char)*s]);
X 		if (dest_len <= nlen) {
X 			dest_str = reallocf(dest_str, dest_len = nlen + delta);
X 			if (dest_str == NULL)
X 				__collate_err(EX_OSERR, __func__);
X 		}
X-		(void)strcpy(dest_str + len, __collate_substitute_table[*s++]);
X+		(void)strcpy(dest_str + len,
X+		    __collate_substitute_table[(u_char)*s++]);
X 		len = nlen;
X 	}
X 	return (dest_str);
X }
X 
X void
X-__collate_lookup(const u_char *t, int *len, int *prim, int *sec)
X+__collate_lookup(const char *t, int *len, int *prim, int *sec)
X {
X 	struct __collate_st_chain_pri *p2;
X 
X@@ -243,14 +244,14 @@
X 			return;
X 		}
X 	}
X-	*prim = __collate_char_pri_table[*t].prim;
X-	*sec = __collate_char_pri_table[*t].sec;
X+	*prim = __collate_char_pri_table[(u_char)*t].prim;
X+	*sec = __collate_char_pri_table[(u_char)*t].sec;
X }
X 
X-u_char *
X-__collate_strdup(u_char *s)
X+char *
X+__collate_strdup(char *s)
X {
X-	u_char *t = strdup(s);
X+	char *t = strdup(s);
X 
X 	if (t == NULL)
X 		__collate_err(EX_OSERR, __func__);
XIndex: lib/libc/locale/collate.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/locale/collate.h,v
Xretrieving revision 1.15
Xdiff -u -r1.15 collate.h
X--- lib/libc/locale/collate.h	27 Feb 2005 20:31:13 -0000	1.15
X+++ lib/libc/locale/collate.h	17 Dec 2006 06:49:27 -0000
X@@ -43,23 +43,23 @@
X 	int prim, sec;
X };
X struct __collate_st_chain_pri {
X-	u_char str[STR_LEN];
X+	char str[STR_LEN];
X 	int prim, sec;
X };
X 
X extern int __collate_load_error;
X extern int __collate_substitute_nontrivial;
X #define __collate_substitute_table (*__collate_substitute_table_ptr)
X-extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
X+extern char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
X #define __collate_char_pri_table (*__collate_char_pri_table_ptr)
X extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
X extern struct __collate_st_chain_pri *__collate_chain_pri_table;
X 
X __BEGIN_DECLS
X-u_char	*__collate_strdup(u_char *);
X-u_char	*__collate_substitute(const u_char *);
X+char	*__collate_strdup(char *);
X+char	*__collate_substitute(const char *);
X int	__collate_load_tables(const char *);
X-void	__collate_lookup(const u_char *, int *, int *, int *);
X+void	__collate_lookup(const char *, int *, int *, int *);
X int	__collate_range_cmp(int, int);
X #ifdef COLLATE_DEBUG
X void	__collate_print_tables(void);
XIndex: lib/libc/resolv/Symbol.map
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/resolv/Symbol.map,v
Xretrieving revision 1.5
Xdiff -u -r1.5 Symbol.map
X--- lib/libc/resolv/Symbol.map	21 May 2006 11:29:26 -0000	1.5
X+++ lib/libc/resolv/Symbol.map	17 Dec 2006 06:49:27 -0000
X@@ -52,6 +52,7 @@
X 	sym_ntop;
X 	dn_count_labels;
X 	p_secstodate;
X+	__r_code_syms;
X 	__res_init;
X 	__res_randomid;
X 	__h_errno;
XIndex: lib/libc/resolv/res_debug.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/resolv/res_debug.c,v
Xretrieving revision 1.3
Xdiff -u -r1.3 res_debug.c
X--- lib/libc/resolv/res_debug.c	9 Jan 2007 00:28:04 -0000	1.3
X+++ lib/libc/resolv/res_debug.c	24 Jan 2007 01:53:05 -0000
X@@ -468,7 +468,7 @@
X /*
X  * Names of DNS rcodes.
X  */
X-static const struct res_sym __p_rcode_syms[] = {
X+const struct res_sym __p_rcode_syms[] = {
X 	{ns_r_noerror,	"NOERROR",		"no error"},
X 	{ns_r_formerr,	"FORMERR",		"format error"},
X 	{ns_r_servfail,	"SERVFAIL",		"server failed"},
XIndex: lib/libc/rpc/clnt_dg.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/rpc/clnt_dg.c,v
Xretrieving revision 1.19
Xdiff -u -r1.19 clnt_dg.c
X--- lib/libc/rpc/clnt_dg.c	4 Mar 2007 12:25:03 -0000	1.19
X+++ lib/libc/rpc/clnt_dg.c	14 Mar 2007 01:08:49 -0000
X@@ -389,7 +389,7 @@
X 	xid++;
X 	*(u_int32_t *)(void *)(cu->cu_outbuf) = htonl(xid);
X 
X-	if ((! XDR_PUTINT32(xdrs, &proc)) ||
X+	if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
X 	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
X 	    (! (*xargs)(xdrs, argsp))) {
X 		cu->cu_error.re_status = RPC_CANTENCODEARGS;
XIndex: lib/libc/rpc/clnt_raw.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/rpc/clnt_raw.c,v
Xretrieving revision 1.20
Xdiff -u -r1.20 clnt_raw.c
X--- lib/libc/rpc/clnt_raw.c	27 Feb 2006 22:10:58 -0000	1.20
X+++ lib/libc/rpc/clnt_raw.c	17 Dec 2006 06:49:27 -0000
X@@ -172,7 +172,7 @@
X 	XDR_SETPOS(xdrs, 0);
X 	clp->u.mashl_rpcmsg.rm_xid ++ ;
X 	if ((! XDR_PUTBYTES(xdrs, clp->u.mashl_callmsg, clp->mcnt)) ||
X-	    (! XDR_PUTINT32(xdrs, &proc)) ||
X+	    (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
X 	    (! AUTH_MARSHALL(h->cl_auth, xdrs)) ||
X 	    (! (*xargs)(xdrs, argsp))) {
X 		return (RPC_CANTENCODEARGS);
XIndex: lib/libc/rpc/clnt_vc.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/rpc/clnt_vc.c,v
Xretrieving revision 1.20
Xdiff -u -r1.20 clnt_vc.c
X--- lib/libc/rpc/clnt_vc.c	9 Sep 2006 22:18:57 -0000	1.20
X+++ lib/libc/rpc/clnt_vc.c	17 Dec 2006 06:49:27 -0000
X@@ -361,7 +361,7 @@
X 	x_id = ntohl(--(*msg_x_id));
X 
X 	if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) ||
X-	    (! XDR_PUTINT32(xdrs, &proc)) ||
X+	    (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
X 	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
X 	    (! (*xdr_args)(xdrs, args_ptr))) {
X 		if (ct->ct_error.re_status == RPC_SUCCESS)
XIndex: lib/libc/rpc/des_crypt.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/rpc/des_crypt.c,v
Xretrieving revision 1.8
Xdiff -u -r1.8 des_crypt.c
X--- lib/libc/rpc/des_crypt.c	16 Oct 2004 06:11:34 -0000	1.8
X+++ lib/libc/rpc/des_crypt.c	17 Dec 2006 06:49:27 -0000
X@@ -82,7 +82,7 @@
X 	struct desparams dp;
X 
X #ifdef BROKEN_DES
X-	dp.UDES.UDES_buf = buf;
X+	dp.UDES.UDES_buf = (u_char *)buf;
X 	dp.des_mode = ECB;
X #else
X 	dp.des_mode = CBC;
X@@ -107,7 +107,7 @@
X 	struct desparams dp;
X 
X #ifdef BROKEN_DES
X-	dp.UDES.UDES_buf = buf;
X+	dp.UDES.UDES_buf = (u_char *)buf;
X 	dp.des_mode = CBC;
X #else
X 	dp.des_mode = ECB;
XIndex: lib/libc/stdio/fgetwc.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/stdio/fgetwc.c,v
Xretrieving revision 1.12
Xdiff -u -r1.12 fgetwc.c
X--- lib/libc/stdio/fgetwc.c	20 Jul 2004 08:27:27 -0000	1.12
X+++ lib/libc/stdio/fgetwc.c	17 Dec 2006 06:49:27 -0000
X@@ -71,7 +71,8 @@
X 		return (wc);
X 	}
X 	do {
X-		nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate);
X+		nconv = __mbrtowc(&wc, (const char *)fp->_p, fp->_r,
X+		    &fp->_extra->mbstate);
X 		if (nconv == (size_t)-1)
X 			break;
X 		else if (nconv == (size_t)-2)
XIndex: lib/libc/stdio/fgetws.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/stdio/fgetws.c,v
Xretrieving revision 1.6
Xdiff -u -r1.6 fgetws.c
X--- lib/libc/stdio/fgetws.c	3 Oct 2004 15:48:32 -0000	1.6
X+++ lib/libc/stdio/fgetws.c	17 Dec 2006 06:49:27 -0000
X@@ -58,7 +58,7 @@
X 		goto error;
X 	wsp = ws;
X 	do {
X-		src = fp->_p;
X+		src = (const char *)fp->_p;
X 		nl = memchr(fp->_p, '\n', fp->_r);
X 		nconv = __mbsnrtowcs(wsp, &src,
X 		    nl != NULL ? (nl - fp->_p + 1) : fp->_r,
XIndex: lib/libc/stdio/mktemp.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/stdio/mktemp.c,v
Xretrieving revision 1.29
Xdiff -u -r1.29 mktemp.c
X--- lib/libc/stdio/mktemp.c	9 Jan 2007 00:28:07 -0000	1.29
X+++ lib/libc/stdio/mktemp.c	24 Jan 2007 01:53:11 -0000
X@@ -169,7 +169,7 @@
X 		for (trv = start;;) {
X 			if (*trv == '\0' || trv == suffp)
X 				return (0);
X-			pad = strchr(padchar, *trv);
X+			pad = strchr((const char *)padchar, *trv);
X 			if (pad == NULL || *++pad == '\0')
X 				*trv++ = padchar[0];
X 			else {
XIndex: lib/libc/stdio/vswprintf.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/stdio/vswprintf.c,v
Xretrieving revision 1.6
Xdiff -u -r1.6 vswprintf.c
X--- lib/libc/stdio/vswprintf.c	21 Feb 2005 19:41:44 -0000	1.6
X+++ lib/libc/stdio/vswprintf.c	17 Dec 2006 06:49:27 -0000
X@@ -74,7 +74,7 @@
X 		return (-1);
X 	}
X 	*f._p = '\0';
X-	mbp = f._bf._base;
X+	mbp = (char *)f._bf._base;
X 	/*
X 	 * XXX Undo the conversion from wide characters to multibyte that
X 	 * fputwc() did in __vfwprintf().
XIndex: lib/libpmc/pmclog.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libpmc/pmclog.c,v
Xretrieving revision 1.4
Xdiff -u -r1.4 pmclog.c
X--- lib/libpmc/pmclog.c	26 Mar 2006 12:20:53 -0000	1.4
X+++ lib/libpmc/pmclog.c	17 Dec 2006 06:49:27 -0000
X@@ -88,7 +88,7 @@
X 	int			ps_fd;		/* active fd or -1 */
X 	char			*ps_buffer;	/* scratch buffer if fd != -1 */
X 	char			*ps_data;	/* current parse pointer */
X-	size_t			ps_len;		/* length of buffered data */
X+	ssize_t			ps_len;		/* length of buffered data */
X };
X 
X #define	PMCLOG_HEADER_FROM_SAVED_STATE(PS)				\
XIndex: lib/libpthread/sys/lock.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libpthread/sys/lock.h,v
Xretrieving revision 1.7
Xdiff -u -r1.7 lock.h
X--- lib/libpthread/sys/lock.h	4 Nov 2003 20:01:38 -0000	1.7
X+++ lib/libpthread/sys/lock.h	17 Dec 2006 06:49:27 -0000
X@@ -53,8 +53,8 @@
X struct lockreq {
X 	struct lockuser	*lr_watcher;	/* only used for priority locks */
X 	struct lockuser	*lr_owner;	/* only used for priority locks */
X-	volatile int	lr_locked;	/* lock granted = 0, busy otherwise */
X-	volatile int	lr_active;	/* non-zero if the lock is last lock for thread */
X+	volatile u_int	lr_locked;	/* lock granted = 0, busy otherwise */
X+	volatile u_int	lr_active;	/* non-zero if the lock is last lock for thread */
X };
X 
X struct lockuser {
XIndex: lib/libpthread/thread/thr_private.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libpthread/thread/thr_private.h,v
Xretrieving revision 1.128
Xdiff -u -r1.128 thr_private.h
X--- lib/libpthread/thread/thr_private.h	12 Jan 2007 07:26:18 -0000	1.128
X+++ lib/libpthread/thread/thr_private.h	24 Jan 2007 01:53:39 -0000
X@@ -1104,7 +1104,7 @@
X /* Garbage collector lock. */
X SCLASS struct lock	_gc_lock;
X SCLASS int		_gc_check		SCLASS_PRESET(0);
X-SCLASS int		_gc_count		SCLASS_PRESET(0);
X+SCLASS u_int		_gc_count		SCLASS_PRESET(0);
X 
X SCLASS struct lock	_mutex_static_lock;
X SCLASS struct lock	_rwlock_static_lock;
XIndex: lib/libthread_db/arch/amd64/libpthread_md.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libthread_db/arch/amd64/libpthread_md.c,v
Xretrieving revision 1.3
Xdiff -u -r1.3 libpthread_md.c
X--- lib/libthread_db/arch/amd64/libpthread_md.c	1 Aug 2004 02:08:39 -0000	1.3
X+++ lib/libthread_db/arch/amd64/libpthread_md.c	17 Dec 2006 06:49:27 -0000
X@@ -29,6 +29,7 @@
X __FBSDID("$FreeBSD: src/lib/libthread_db/arch/amd64/libpthread_md.c,v 1.3 2004/08/01 02:08:39 davidxu Exp $");
X 
X #include <sys/procfs.h>
X+#include <string.h>
X #include <ucontext.h>
X 
X void
XIndex: sbin/fsdb/fsdb.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/fsdb/fsdb.c,v
Xretrieving revision 1.35
Xdiff -u -r1.35 fsdb.c
X--- sbin/fsdb/fsdb.c	31 Oct 2006 22:07:29 -0000	1.35
X+++ sbin/fsdb/fsdb.c	17 Dec 2006 06:49:27 -0000
X@@ -523,8 +523,10 @@
X 	    }
X 	    /* Look through direct data blocks. */
X 	    if (is_ufs2 ?
X-		find_blks64(curinode->dp2.di_db, NDADDR, wantedblk64) :
X-		find_blks32(curinode->dp1.di_db, NDADDR, wantedblk32))
X+		find_blks64((uint64_t *)curinode->dp2.di_db, NDADDR,
X+		    wantedblk64) :
X+		find_blks32((uint32_t *)curinode->dp1.di_db, NDADDR,
X+		    wantedblk32))
X 		goto end;
X 	    for (i = 0; i < NIADDR; i++) {
X 		/*
XIndex: sbin/gpt/label.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/gpt/label.c,v
Xretrieving revision 1.3
Xdiff -u -r1.3 label.c
X--- sbin/gpt/label.c	4 Oct 2006 18:20:25 -0000	1.3
X+++ sbin/gpt/label.c	17 Dec 2006 06:49:27 -0000
X@@ -162,7 +162,7 @@
X 		fclose(f);
X 	name[len] = '\0';
X 	/* Only keep the first line, excluding the newline character. */
X-	p = strchr(name, '\n');
X+	p = strchr((const char *)name, '\n');
X 	if (p != NULL)
X 		*p = '\0';
X }
X@@ -203,7 +203,7 @@
X 		case 'l':
X 			if (name != NULL)
X 				usage_label();
X-			name = strdup(optarg);
X+			name = (uint8_t *)strdup(optarg);
X 			break;
X 		case 's':
X 			if (size > 0)
XIndex: sbin/gpt/migrate.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/gpt/migrate.c,v
Xretrieving revision 1.16
Xdiff -u -r1.16 migrate.c
X--- sbin/gpt/migrate.c	1 Sep 2005 02:42:52 -0000	1.16
X+++ sbin/gpt/migrate.c	17 Dec 2006 06:49:27 -0000
X@@ -100,21 +100,22 @@
X 		case FS_SWAP: {
X 			uuid_t swap = GPT_ENT_TYPE_FREEBSD_SWAP;
X 			le_uuid_enc(&ent->ent_type, &swap);
X-			utf8_to_utf16("FreeBSD swap partition",
X+			utf8_to_utf16((const uint8_t *)"FreeBSD swap partition",
X 			    ent->ent_name, 36);
X 			break;
X 		}
X 		case FS_BSDFFS: {
X 			uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS;
X 			le_uuid_enc(&ent->ent_type, &ufs);
X-			utf8_to_utf16("FreeBSD UFS partition",
X+			utf8_to_utf16((const uint8_t *)"FreeBSD UFS partition",
X 			    ent->ent_name, 36);
X 			break;
X 		}
X 		case FS_VINUM: {
X 			uuid_t vinum = GPT_ENT_TYPE_FREEBSD_VINUM;
X 			le_uuid_enc(&ent->ent_type, &vinum);
X-			utf8_to_utf16("FreeBSD vinum partition",
X+			utf8_to_utf16(
X+			    (const uint8_t *)"FreeBSD vinum partition",
X 			    ent->ent_name, 36);
X 			break;
X 		}
X@@ -255,7 +256,8 @@
X 				le_uuid_enc(&ent->ent_type, &freebsd);
X 				ent->ent_lba_start = htole64((uint64_t)start);
X 				ent->ent_lba_end = htole64(start + size - 1LL);
X-				utf8_to_utf16("FreeBSD disklabel partition",
X+				utf8_to_utf16((const uint8_t *)
X+				    "FreeBSD disklabel partition",
X 				    ent->ent_name, 36);
X 				ent++;
X 			} else
X@@ -267,7 +269,7 @@
X 			le_uuid_enc(&ent->ent_type, &efi_slice);
X 			ent->ent_lba_start = htole64((uint64_t)start);
X 			ent->ent_lba_end = htole64(start + size - 1LL);
X-			utf8_to_utf16("EFI system partition",
X+			utf8_to_utf16((const uint8_t *)"EFI system partition",
X 			    ent->ent_name, 36);
X 			ent++;
X 			break;
XIndex: sbin/growfs/growfs.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/growfs/growfs.c,v
Xretrieving revision 1.25
Xdiff -u -r1.25 growfs.c
X--- sbin/growfs/growfs.c	17 Jul 2006 20:48:36 -0000	1.25
X+++ sbin/growfs/growfs.c	17 Dec 2006 06:49:27 -0000
X@@ -156,7 +156,7 @@
X static void	updrefs(int, ino_t, struct gfs_bpp *, int, int, unsigned int);
X static void	indirchk(ufs_lbn_t, ufs_lbn_t, ufs2_daddr_t, ufs_lbn_t,
X 		    struct gfs_bpp *, int, int, unsigned int);
X-static void	get_dev_size(int, int *);
X+static void	get_dev_size(int, u_int32_t *);
X 
X /* ************************************************************ growfs ***** */
X /*
X@@ -1924,7 +1924,7 @@
X  * e.g. from vinum volumes.
X  */
X static void
X-get_dev_size(int fd, int *size)
X+get_dev_size(int fd, u_int32_t *size)
X {
X    int sectorsize;
X    off_t mediasize;
X@@ -1977,7 +1977,7 @@
X 	struct disklabel	*lp;
X 	struct partition	*pp;
X 	int	i,fsi,fso;
X-    u_int32_t p_size;
X+	u_int32_t p_size;
X 	char	reply[5];
X #ifdef FSMAXSNAP
X 	int	j;
XIndex: sbin/newfs/mkfs.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/newfs/mkfs.c,v
Xretrieving revision 1.92
Xdiff -u -r1.92 mkfs.c
X--- sbin/newfs/mkfs.c	31 Oct 2006 21:52:27 -0000	1.92
X+++ sbin/newfs/mkfs.c	4 Apr 2007 03:42:57 -0000
X@@ -134,7 +134,7 @@
X 	if (Uflag)
X 		sblock.fs_flags |= FS_DOSOFTDEP;
X 	if (Lflag)
X-		strlcpy(sblock.fs_volname, volumelabel, MAXVOLLEN);
X+		strlcpy((char *)sblock.fs_volname, volumelabel, MAXVOLLEN);
X 	if (Jflag)
X 		sblock.fs_flags |= FS_GJOURNAL;
X 	if (lflag)
XIndex: sbin/newfs/newfs.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/newfs/newfs.c,v
Xretrieving revision 1.82
Xdiff -u -r1.82 newfs.c
X--- sbin/newfs/newfs.c	2 Mar 2007 20:07:59 -0000	1.82
X+++ sbin/newfs/newfs.c	4 Apr 2007 03:41:02 -0000
X@@ -134,7 +134,7 @@
X int	maxbpg;			/* maximum blocks per file in a cyl group */
X int	avgfilesize = AVFILESIZ;/* expected average file size */
X int	avgfilesperdir = AFPDIR;/* expected number of files per directory */
X-u_char	*volumelabel = NULL;	/* volume label for filesystem */
X+char	*volumelabel = NULL;	/* volume label for filesystem */
X struct uufsd disk;		/* libufs disk structure */
X 
X static char	device[MAXPATHLEN];
XIndex: sbin/newfs/newfs.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/newfs/newfs.h,v
Xretrieving revision 1.18
Xdiff -u -r1.18 newfs.h
X--- sbin/newfs/newfs.h	31 Oct 2006 21:52:27 -0000	1.18
X+++ sbin/newfs/newfs.h	4 Apr 2007 03:41:23 -0000
X@@ -66,7 +66,7 @@
X extern int	maxbpg;		/* maximum blocks per file in a cyl group */
X extern int	avgfilesize;	/* expected average file size */
X extern int	avgfilesperdir;	/* expected number of files per directory */
X-extern u_char	*volumelabel;	/* volume label for filesystem */
X+extern char	*volumelabel;	/* volume label for filesystem */
X extern struct uufsd disk;	/* libufs disk structure */
X 
X void mkfs (struct partition *, char *);
XIndex: share/mk/bsd.sys.mk
X===================================================================
XRCS file: /usr/download/ncvs2/src/share/mk/bsd.sys.mk,v
Xretrieving revision 1.39
Xdiff -u -r1.39 bsd.sys.mk
X--- share/mk/bsd.sys.mk	4 Nov 2006 04:39:05 -0000	1.39
X+++ share/mk/bsd.sys.mk	3 Apr 2007 23:22:45 -0000
X@@ -8,6 +8,9 @@
X 
X # for GCC:  http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
X 
X+#XXXKAN: Enable when tree is in better shape
X+NO_WERROR	=	yes
X+
X .if !defined(NO_WARNS) && ${CC} != "icc"
X . if defined(CSTD)
X .  if ${CSTD} == "k&r"
X@@ -51,6 +54,8 @@
X # XXX always get it right.
X CWARNFLAGS	+=	-Wno-uninitialized
X .  endif
X+#XXXKAN: Remove before commit
X+#CWARNFLAGS	+=	-Wno-pointer-sign
X . endif
X 
X . if defined(FORMAT_AUDIT)
XIndex: sys/amd64/include/md_var.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/amd64/include/md_var.h,v
Xretrieving revision 1.80
Xdiff -u -r1.80 md_var.h
X--- sys/amd64/include/md_var.h	18 Jan 2007 05:46:32 -0000	1.80
X+++ sys/amd64/include/md_var.h	24 Jan 2007 01:54:49 -0000
X@@ -57,7 +57,9 @@
X extern	uint64_t *vm_page_dump;
X extern	int	vm_page_dump_size;
X 
X+#ifdef _SYS_PCPU_H_
X extern	struct pcpu __pcpu[];
X+#endif
X 
X typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
X struct	thread;
XIndex: sys/amd64/include/smp.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/amd64/include/smp.h,v
Xretrieving revision 1.89
Xdiff -u -r1.89 smp.h
X--- sys/amd64/include/smp.h	6 Mar 2007 17:16:46 -0000	1.89
X+++ sys/amd64/include/smp.h	14 Mar 2007 01:09:38 -0000
X@@ -23,6 +23,7 @@
X #include <machine/frame.h>
X #include <machine/intr_machdep.h>
X #include <machine/apicvar.h>
X+#include <machine/pcb.h>
X 
X /* global symbols in mpboot.S */
X extern char			mptramp_start[];
XIndex: sys/boot/i386/boot2/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/boot/i386/boot2/Makefile,v
Xretrieving revision 1.59
Xdiff -u -r1.59 Makefile
X--- sys/boot/i386/boot2/Makefile	15 Jul 2005 12:22:14 -0000	1.59
X+++ sys/boot/i386/boot2/Makefile	17 Dec 2006 06:49:28 -0000
X@@ -20,7 +20,7 @@
X #BOOT2_UFS?=	UFS2_ONLY
X #BOOT2_UFS?=	UFS1_ONLY
X 
X-CFLAGS=	-Os \
X+CFLAGS=	-Os -march=i386 \
X 	-fno-guess-branch-probability \
X 	-fomit-frame-pointer \
X 	-fno-unit-at-a-time \
X@@ -36,7 +36,8 @@
X 	-I${.CURDIR}/../btx/lib -I. \
X 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
X 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
X-	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings
X+	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
X+	-Winline --param max-inline-insns-single=100
X 
X LDFLAGS=-static -N --gc-sections
X 
XIndex: sys/boot/i386/boot2/boot2.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/boot/i386/boot2/boot2.c,v
Xretrieving revision 1.83
Xdiff -u -r1.83 boot2.c
X--- sys/boot/i386/boot2/boot2.c	2 Nov 2006 17:28:38 -0000	1.83
X+++ sys/boot/i386/boot2/boot2.c	17 Dec 2006 06:49:28 -0000
X@@ -157,8 +157,8 @@
X     const char *s = src;
X     char *d = dst;
X 
X-    while (len--)
X-        *d++ = *s++;
X+    while (--len >= 0)
X+        d[len] = s[len];
X }
X 
X static inline int
X@@ -563,7 +563,6 @@
X printf(const char *fmt,...)
X {
X     va_list ap;
X-    char buf[10];
X     char *s;
X     unsigned u;
X     int c;
X@@ -582,12 +581,9 @@
X 		continue;
X 	    case 'u':
X 		u = va_arg(ap, unsigned);
X-		s = buf;
X 		do
X-		    *s++ = '0' + u % 10U;
X+		    putchar('0' + u % 10U);
X 		while (u /= 10U);
X-		while (--s >= buf)
X-		    putchar(*s);
X 		continue;
X 	    }
X 	}
XIndex: sys/boot/pc98/boot2/boot.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/boot/pc98/boot2/boot.c,v
Xretrieving revision 1.16
Xdiff -u -r1.16 boot.c
X--- sys/boot/pc98/boot2/boot.c	2 Nov 2006 17:28:38 -0000	1.16
X+++ sys/boot/pc98/boot2/boot.c	5 Apr 2007 18:41:37 -0000
X@@ -70,7 +70,7 @@
X static char kernel_config_namebuf[NAMEBUF_LEN + sizeof "config"];
X static char linebuf[NAMEBUF_LEN];
X static char namebuf[NAMEBUF_LEN];
X-static struct bootinfo bootinfo;
X+struct bootinfo bootinfo;
X int loadflags;
X 
X static void getbootdev(char *ptr, int *howto);
XIndex: sys/cam/cam.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/cam.c,v
Xretrieving revision 1.10
Xdiff -u -r1.10 cam.c
X--- sys/cam/cam.c	18 Apr 2006 21:53:39 -0000	1.10
X+++ sys/cam/cam.c	17 Dec 2006 06:49:28 -0000
X@@ -104,7 +104,7 @@
X #endif
X 
X void
X-cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen)
X+cam_strvis(char *dst, const char *src, int srclen, int dstlen)
X {
X 
X 	/* Trim leading/trailing spaces, nulls. */
X@@ -115,16 +115,17 @@
X 		srclen--;
X 
X 	while (srclen > 0 && dstlen > 1) {
X-		u_int8_t *cur_pos = dst;
X+		char *cur_pos = dst;
X+		u_int8_t ch = *src;
X 
X-		if (*src < 0x20 || *src >= 0x80) {
X+		if (*src < 0x20 || ch >= 0x80) {
X 			/* SCSI-II Specifies that these should never occur. */
X 			/* non-printable character */
X 			if (dstlen > 4) {
X 				*cur_pos++ = '\\';
X-				*cur_pos++ = ((*src & 0300) >> 6) + '0';
X-				*cur_pos++ = ((*src & 0070) >> 3) + '0';
X-				*cur_pos++ = ((*src & 0007) >> 0) + '0';
X+				*cur_pos++ = ((ch & 0300) >> 6) + '0';
X+				*cur_pos++ = ((ch & 0070) >> 3) + '0';
X+				*cur_pos++ = ((ch & 0007) >> 0) + '0';
X 			} else {
X 				*cur_pos++ = '?';
X 			}
X@@ -147,7 +148,7 @@
X  * wildcard '?' matches a single non-space character.
X  */
X int
X-cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len)
X+cam_strmatch(const char *str, const char *pattern, int str_len)
X {
X 
X 	while (*pattern != '\0'&& str_len > 0) {  
XIndex: sys/cam/cam.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/cam.h,v
Xretrieving revision 1.11
Xdiff -u -r1.11 cam.h
X--- sys/cam/cam.h	5 Jan 2005 22:34:34 -0000	1.11
X+++ sys/cam/cam.h	17 Dec 2006 06:49:28 -0000
X@@ -199,9 +199,9 @@
X caddr_t	cam_quirkmatch(caddr_t target, caddr_t quirk_table, int num_entries,
X 		       int entry_size, cam_quirkmatch_t *comp_func);
X 
X-void	cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen);
X+void	cam_strvis(char *dst, const char *src, int srclen, int dstlen);
X 
X-int	cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len);
X+int	cam_strmatch(const char *str, const char *pattern, int str_len);
X const struct cam_status_entry*
X 	cam_fetch_status_entry(cam_status status);
X #ifdef _KERNEL
XIndex: sys/cam/cam_periph.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/cam_periph.c,v
Xretrieving revision 1.64
Xdiff -u -r1.64 cam_periph.c
X--- sys/cam/cam_periph.c	5 Dec 2006 07:45:27 -0000	1.64
X+++ sys/cam/cam_periph.c	17 Dec 2006 06:49:28 -0000
X@@ -648,7 +648,7 @@
X 		mapinfo->bp[i]->b_saveaddr = mapinfo->bp[i]->b_data;
X 
X 		/* put our pointer in the data slot */
X-		mapinfo->bp[i]->b_data = *data_ptrs[i];
X+		mapinfo->bp[i]->b_data = (caddr_t)*data_ptrs[i];
X 
X 		/* set the transfer length, we know it's < DFLTPHYS */
X 		mapinfo->bp[i]->b_bufsize = lengths[i];
X@@ -676,7 +676,7 @@
X 		}
X 
X 		/* set our pointer to the new mapped area */
X-		*data_ptrs[i] = mapinfo->bp[i]->b_data;
X+		*data_ptrs[i] = (u_int8_t *)mapinfo->bp[i]->b_data;
X 
X 		mapinfo->num_bufs_used++;
X 	}
X@@ -1556,6 +1556,7 @@
X 	frozen = (status & CAM_DEV_QFRZN) != 0;
X 	status &= CAM_STATUS_MASK;
X 	openings = relsim_flags = 0;
X+	timeout = 0;
X 
X 	switch (status) {
X 	case CAM_REQ_CMP:
XIndex: sys/cam/scsi/scsi_cd.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/scsi/scsi_cd.c,v
Xretrieving revision 1.97
Xdiff -u -r1.97 scsi_cd.c
X--- sys/cam/scsi/scsi_cd.c	5 Dec 2006 07:45:27 -0000	1.97
X+++ sys/cam/scsi/scsi_cd.c	17 Dec 2006 06:49:28 -0000
X@@ -1522,7 +1522,7 @@
X 					/* lba */ bp->bio_offset /
X 					  softc->params.blksize,
X 					bp->bio_bcount / softc->params.blksize,
X-					/* data_ptr */ bp->bio_data,
X+					/* data_ptr */ (u_int8_t *)bp->bio_data,
X 					/* dxfer_len */ bp->bio_bcount,
X 					/* sense_len */ SSD_FULL_SIZE,
X 					/* timeout */ 30000);
XIndex: sys/cam/scsi/scsi_da.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/scsi/scsi_da.c,v
Xretrieving revision 1.203
Xdiff -u -r1.203 scsi_da.c
X--- sys/cam/scsi/scsi_da.c	21 Feb 2007 07:45:01 -0000	1.203
X+++ sys/cam/scsi/scsi_da.c	3 Mar 2007 17:07:47 -0000
X@@ -45,7 +45,9 @@
X #include <sys/malloc.h>
X #include <sys/cons.h>
X 
X+#ifdef _KERNEL
X #include <machine/md_var.h>
X+#endif /* _KERNEL */
X 
X #include <vm/vm.h>
X #include <vm/pmap.h>
X@@ -1285,7 +1287,7 @@
X 						/*lba*/bp->bio_pblkno,
X 						/*block_count*/bp->bio_bcount /
X 						softc->params.secsize,
X-						/*data_ptr*/ bp->bio_data,
X+						/*data_ptr*/ (u_int8_t *)bp->bio_data,
X 						/*dxfer_len*/ bp->bio_bcount,
X 						/*sense_len*/SSD_FULL_SIZE,
X 						/*timeout*/da_default_timeout*1000);
XIndex: sys/conf/kern.mk
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/conf/kern.mk,v
Xretrieving revision 1.50
Xdiff -u -r1.50 kern.mk
X--- sys/conf/kern.mk	26 Nov 2006 23:16:46 -0000	1.50
X+++ sys/conf/kern.mk	17 Dec 2006 06:49:28 -0000
X@@ -12,7 +12,7 @@
X .else
X CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
X 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
X-		${_wundef} -fformat-extensions
X+		${_wundef} -Wno-pointer-sign -fformat-extensions
X .if !defined(NO_UNDEF)
X _wundef=	-Wundef
X .endif
XIndex: sys/conf/kern.pre.mk
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/conf/kern.pre.mk,v
Xretrieving revision 1.81
Xdiff -u -r1.81 kern.pre.mk
X--- sys/conf/kern.pre.mk	26 Oct 2006 15:16:43 -0000	1.81
X+++ sys/conf/kern.pre.mk	17 Dec 2006 06:49:28 -0000
X@@ -53,7 +53,7 @@
X NOSTDINC= -nostdinc
X .endif
X 
X-INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S
X+INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
X 
X # This hack lets us use the OpenBSD altq code without spamming a new
X # include path into contrib'ed source files.
X@@ -87,7 +87,7 @@
X CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
X CFLAGS+= --param inline-unit-growth=100
X CFLAGS+= --param large-function-growth=1000
X-WERROR?= -Werror
X+#WERROR?= -Werror
X .endif
X 
X # XXX LOCORE means "don't declare C stuff" not "for locore.s".
XIndex: sys/conf/kmod.mk
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/conf/kmod.mk,v
Xretrieving revision 1.217
Xdiff -u -r1.217 kmod.mk
X--- sys/conf/kmod.mk	21 Mar 2007 03:42:49 -0000	1.217
X+++ sys/conf/kmod.mk	31 Mar 2007 16:34:41 -0000
X@@ -79,7 +79,7 @@
X . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
X CFLAGS+=	-fno-strict-aliasing
X . endif
X-WERROR?=	-Werror
X+#WERROR?=	-Werror
X .endif
X CFLAGS+=	${WERROR}
X CFLAGS+=	-D_KERNEL
X@@ -93,7 +93,7 @@
X NOSTDINC=	-nostdinc
X .endif
X CFLAGS+=	${C_DIALECT}
X-CFLAGS:=	${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*}
X+CFLAGS:=	${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
X .if defined(KERNBUILDDIR)
X CFLAGS+=	-DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
X .endif
XIndex: sys/contrib/dev/acpica/exprep.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/contrib/dev/acpica/exprep.c,v
Xretrieving revision 1.1.1.25
Xdiff -u -r1.1.1.25 exprep.c
X--- sys/contrib/dev/acpica/exprep.c	22 Mar 2007 17:23:42 -0000	1.1.1.25
X+++ sys/contrib/dev/acpica/exprep.c	31 Mar 2007 16:34:42 -0000
X@@ -364,6 +364,7 @@
X         ACPI_ERROR ((AE_INFO,
X             "Unknown field access type %X",
X             Access));
X+    	*ReturnByteAlignment = 1;
X         return_UINT32 (0);
X     }
X 
XIndex: sys/dev/an/if_an.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/dev/an/if_an.c,v
Xretrieving revision 1.80
Xdiff -u -r1.80 if_an.c
X--- sys/dev/an/if_an.c	6 Nov 2006 13:41:50 -0000	1.80
X+++ sys/dev/an/if_an.c	17 Dec 2006 06:49:28 -0000
X@@ -1478,7 +1478,6 @@
X 	struct an_card_rid_desc an_rid_desc;
X 	struct an_command	cmd;
X 	struct an_reply		reply;
X-	char			*buf;
X 	u_int16_t		*ptr;
X 	u_int8_t		*ptr2;
X 	int			i, len;
X@@ -1554,8 +1553,6 @@
X 			return(EIO);
X 		}
X 
X-		ptr = (u_int16_t *)buf;
X-
X 		if (reply.an_status & AN_CMD_QUAL_MASK) {
X 			printf("an%d: failed to write RID 2 %x %x %x %x %x, %d\n", 
X 			    sc->an_unit, ltv->an_type, 
XIndex: sys/dev/usb/ufoma.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/dev/usb/ufoma.c,v
Xretrieving revision 1.2
Xdiff -u -r1.2 ufoma.c
X--- sys/dev/usb/ufoma.c	7 Sep 2006 00:06:41 -0000	1.2
X+++ sys/dev/usb/ufoma.c	17 Dec 2006 06:49:28 -0000
X@@ -256,8 +256,6 @@
X };
X 
X 
X-static devclass_t ucom_devclass;
X-
X DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0);
X MODULE_DEPEND(ufoma, usb, 1, 1, 1);
X MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
XIndex: sys/i386/include/smp.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/i386/include/smp.h,v
Xretrieving revision 1.88
Xdiff -u -r1.88 smp.h
X--- sys/i386/include/smp.h	6 Mar 2007 17:16:47 -0000	1.88
X+++ sys/i386/include/smp.h	14 Mar 2007 01:10:15 -0000
X@@ -23,6 +23,7 @@
X #include <machine/frame.h>
X #include <machine/intr_machdep.h>
X #include <machine/apicvar.h>
X+#include <machine/pcb.h>
X 
X /* global data in mpboot.s */
X extern int			bootMP_size;
XIndex: sys/kern/kern_linker.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/kern/kern_linker.c,v
Xretrieving revision 1.147
Xdiff -u -r1.147 kern_linker.c
X--- sys/kern/kern_linker.c	4 Mar 2007 22:36:46 -0000	1.147
X+++ sys/kern/kern_linker.c	14 Mar 2007 01:10:18 -0000
X@@ -795,7 +795,7 @@
X }
X 
X int
X-linker_ddb_search_symbol(caddr_t value, c_linker_sym_t *sym, long *diffp)
X+linker_ddb_search_symbol(caddr_t value, c_linker_sym_t *sym, u_long *diffp)
X {
X 	linker_file_t lf;
X 	c_linker_sym_t best, es;
XIndex: sys/sparc64/include/smp.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/sparc64/include/smp.h,v
Xretrieving revision 1.19
Xdiff -u -r1.19 smp.h
X--- sys/sparc64/include/smp.h	3 Nov 2005 21:08:20 -0000	1.19
X+++ sys/sparc64/include/smp.h	17 Dec 2006 06:49:28 -0000
X@@ -37,6 +37,7 @@
X 
X #include <machine/intr_machdep.h>
X #include <machine/tte.h>
X+#include <machine/pcb.h>
X 
X #define	IDR_BUSY	(1<<0)
X #define	IDR_NACK	(1<<1)
XIndex: sys/sys/linker.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/sys/linker.h,v
Xretrieving revision 1.46
Xdiff -u -r1.46 linker.h
X--- sys/sys/linker.h	20 Jun 2006 20:59:55 -0000	1.46
X+++ sys/sys/linker.h	17 Dec 2006 06:49:28 -0000
X@@ -153,7 +153,7 @@
X  */
X int linker_ddb_lookup(const char *_symstr, c_linker_sym_t *_sym);
X int linker_ddb_search_symbol(caddr_t _value, c_linker_sym_t *_sym,
X-			     long *_diffp);
X+			     u_long *_diffp);
X int linker_ddb_symbol_values(c_linker_sym_t _sym, linker_symval_t *_symval);
X 
X 
END-of-src.diff
echo x - gnu/usr.bin/cc/Makefile.ver
sed 's/^X//' >gnu/usr.bin/cc/Makefile.ver << 'END-of-gnu/usr.bin/cc/Makefile.ver'
XBASEVER!=	cat ${GCCDIR}/BASE-VER
XDATESTAMP!=	cat ${GCCDIR}/DATESTAMP
XDEVPHASE!=	cat ${GCCDIR}/DEV-PHASE
END-of-gnu/usr.bin/cc/Makefile.ver
echo x - gnu/usr.bin/cc/cc_tools/Makefile.dep
sed 's/^X//' >gnu/usr.bin/cc/cc_tools/Makefile.dep << 'END-of-gnu/usr.bin/cc/cc_tools/Makefile.dep'
Xerrors.o: bconfig.h auto-host.h 
X  
Xgenattr.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenattrtab.o: bconfig.h \
X  auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  gtype-desc.h
X  
Xgenautomata.o: bconfig.h \
X  auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgencheck.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  gencheck.h
X  
Xgenchecksum.o: bconfig.h \
X  auto-host.h
X  
Xgencodes.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenconditions.o: bconfig.h \
X  auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenconfig.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenconstants.o: bconfig.h \
X  auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenemit.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenextract.o: bconfig.h \
X  auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  insn-config.h 
X
Xgenflags.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgengenrtl.o: bconfig.h auto-host.h \
X  
Xgengtype.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  gtyp-gen.h
X  
Xgenmddeps.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenmodes.o: bconfig.h auto-host.h \
X  
Xgenopinit.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenoutput.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenpeep.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenpreds.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgenrecog.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xgensupport.o: bconfig.h \
X  auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xggc-none.o: bconfig.h auto-host.h \
X  gtype-desc.h
X
Xprint-rtl.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xread-rtl.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xrtl.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  gtype-desc.h 
X
Xvarray.o: bconfig.h auto-host.h \
X  tm.h options.h \
X  gtype-desc.h
X  
Xoptions.o: options.c config.h auto-host.h \
X  tm.h options.h \
X  
Xinsn-modes.o: insn-modes.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h
X  
Xmin-insn-modes.o: min-insn-modes.c bconfig.h auto-host.h \
X  insn-modes.h 
X
Xgenrtl.o: genrtl.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  gtype-desc.h
X
Xgengtype-lex.o: gengtype-lex.c \
X  bconfig.h auto-host.h \
X  gengtype-yacc.h 
X
Xgengtype-yacc+%DIKED.o: gengtype-yacc+%DIKED.c \
X  bconfig.h \
X  auto-host.h \
X  tm.h options.h \
X  
Xgtype-desc.o: gtype-desc.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  tree-check.h \
X  insn-config.h \
X  options.h \
X  insn-config.h \
X  insn-codes.h \
X  gtype-desc.h
X  
Xinsn-conditions.o: insn-conditions.c bconfig.h auto-host.h \
X  insn-constants.h \
X  tm.h options.h \
X  insn-modes.h \
X  tm_p.h \
X  tm-preds.h \
X  options.h
X  
Xinsn-preds.o: insn-preds.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  tree-check.h \
X  tm_p.h \
X  tm-preds.h \
X  insn-config.h \
X  options.h
X  
Xinsn-attrtab.o: insn-attrtab.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  tm_p.h \
X  tm-preds.h \
X  insn-config.h \
X  insn-attr.h \
X  options.h
X  
Xinsn-emit.o: insn-emit.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  tm_p.h \
X  tm-preds.h \
X  options.h \
X  tree-check.h \
X  insn-config.h \
X  insn-codes.h \
X  insn-config.h \
X  gtype-desc.h
X  
Xinsn-extract.o: insn-extract.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  insn-config.h
X  
Xinsn-opinit.o: insn-opinit.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  options.h insn-config.h \
X  tree-check.h \
X  insn-config.h \
X  insn-codes.h
X  
Xinsn-output.o: insn-output.c config.h auto-host.h \
X  tm.h options.h \
X  options.h \
X  gtype-desc.h \
X  insn-modes.h \
X  tree-check.h \
X  insn-config.h \
X  insn-codes.h tm_p.h \
X  tm-preds.h \
X  insn-config.h \
X  insn-attr.h \
X  tm.h
X
Xinsn-peep.o: insn-peep.c config.h auto-host.h \
X  tm.h options.h \
X  insn-config.h \
X  insn-modes.h \
X  tm_p.h \
X  tm-preds.h
X  
Xinsn-recog.o: insn-recog.c config.h auto-host.h \
X  tm.h options.h \
X  insn-modes.h \
X  tm_p.h \
X  tm-preds.h \
X  insn-config.h \
X  options.h
END-of-gnu/usr.bin/cc/cc_tools/Makefile.dep
echo x - gnu/usr.bin/cc/cc_tools/freebsd.opt
sed 's/^X//' >gnu/usr.bin/cc/cc_tools/freebsd.opt << 'END-of-gnu/usr.bin/cc/cc_tools/freebsd.opt'
X
Xfformat-extensions
XCommon Report Var(flag_format_extensions) Init(0)
XAllow FreeBSD kernel-specific printf format specifiers.
X
END-of-gnu/usr.bin/cc/cc_tools/freebsd.opt
echo x - gnu/usr.bin/cc/cc_tools/i386-freebsd.opt
sed 's/^X//' >gnu/usr.bin/cc/cc_tools/i386-freebsd.opt << 'END-of-gnu/usr.bin/cc/cc_tools/i386-freebsd.opt'
X
Xmno-align-long-strings
XTarget RejectNegative Report Mask(NO_ALIGN_LONG_STRINGS)
XDo not align long strings specially
X
Xmalign-long-strings
XTarget RejectNegative Report InverseMask(NO_ALIGN_LONG_STRINGS, ALIGN_LONG_STRINGS) Undocumented
X
Xmprofiler-epilogue
XTarget Report Mask(PROFILER_EPILOGUE)
XFunction profiler epilogue
X
END-of-gnu/usr.bin/cc/cc_tools/i386-freebsd.opt
echo x - gnu/usr.bin/cc/cc_tools/size-host.h
sed 's/^X//' >gnu/usr.bin/cc/cc_tools/size-host.h << 'END-of-gnu/usr.bin/cc/cc_tools/size-host.h'
X#ifdef	SIZEOF_INT
X# undef	SIZEOF_INT
X#endif
X
X#ifdef	SIZEOF_SHORT
X# undef	SIZEOF_SHORT
X#endif
X
X#ifdef	SIZEOF_LONG
X# undef	SIZEOF_LONG
X#endif
X
X#ifdef	SIZEOF_VOID_P
X# undef	SIZEOF_VOID_P
X#endif
X
X#ifdef	SIZEOF_LONG_LONG
X# undef	SIZEOF_LONG_LONG
X#endif
X
X#ifdef  HOST_WIDE_INT
X# undef	HOST_WIDE_INT
X#endif
X
X#define SIZEOF_INT		4
X#define SIZEOF_SHORT		2
X#define	SIZEOF_LONG_LONG	8
X
X#if __LP64__
X#define	SIZEOF_LONG		8
X#define	SIZEOF_VOID_P		8
X#define	HOST_WIDE_INT		long
X#else
X#define	SIZEOF_LONG		4
X#define	SIZEOF_VOID_P		4
X#define	HOST_WIDE_INT		long long
X#endif
X
X#ifdef WORDS_BIGENDIAN
X#undef WORDS_BIGENDIAN
X#endif
X
X#if defined(__sparc64__) || defined(__ARMEB__)
X#define WORDS_BIGENDIAN		1
X#endif
END-of-gnu/usr.bin/cc/cc_tools/size-host.h
echo c - gnu/usr.bin/cc/libcpp
mkdir -p gnu/usr.bin/cc/libcpp > /dev/null 2>&1
echo x - gnu/usr.bin/cc/libcpp/Makefile
sed 's/^X//' >gnu/usr.bin/cc/libcpp/Makefile << 'END-of-gnu/usr.bin/cc/libcpp/Makefile'
X# $FreeBSD:  $
X
X# Use our headers in preference to ones from ../cc_tools.
XCFLAGS+=	-I${.CURDIR} -I.
X
X.include "../Makefile.inc"
X
X.PATH: ${GCCLIB}/libcpp
X
XLIB=	cpp
XSRCS=	localedir.h
XSRCS+=	charset.c directives.c errors.c expr.c files.c \
X	identifiers.c init.c lex.c line-map.c macro.c mkdeps.c \
X	pch.c symtab.c traditional.c
XINTERNALLIB=
XWARNS?=	1
X
Xlocaledir.h:	Makefile
X	echo	'#define LOCALEDIR "/usr/share/locale"' > localedir.h
XSRCS+=		localedir.h
XCLEANFILES+=	localedir.h
X
X.include <bsd.lib.mk>
END-of-gnu/usr.bin/cc/libcpp/Makefile
echo x - gnu/usr.bin/cc/libcpp/config.h
sed 's/^X//' >gnu/usr.bin/cc/libcpp/config.h << 'END-of-gnu/usr.bin/cc/libcpp/config.h'
X/* config.h.  Generated by configure.  */
X/* config.in.  Generated from configure.ac by autoheader.  */
X
X/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
X   systems. This function is required for `alloca.c' support on those systems.
X   */
X/* #undef CRAY_STACKSEG_END */
X
X/* Define to 1 if using `alloca.c'. */
X/* #undef C_ALLOCA */
X
X/* Define if you want more run-time sanity checks. */
X/* #undef ENABLE_CHECKING */
X
X/* Define to 1 if translation of program messages to the user's native
X   language is requested. */
X/* #undef ENABLE_NLS */
X
X/* Define to 1 if you have `alloca', as a function or macro. */
X#define HAVE_ALLOCA 1
X
X/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
X   */
X/* #undef HAVE_ALLOCA_H */
X
X/* Define to 1 if you have the `clearerr_unlocked' function. */
X#define HAVE_CLEARERR_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `abort', and to 0 if you don't.
X   */
X#define HAVE_DECL_ABORT 1
X
X/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
X   don't. */
X#define HAVE_DECL_ASPRINTF 1
X
X/* Define to 1 if you have the declaration of `basename', and to 0 if you
X   don't. */
X#define HAVE_DECL_BASENAME 0
X
X/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_CLEARERR_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `errno', and to 0 if you don't.
X   */
X#define HAVE_DECL_ERRNO 0
X
X/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
X   don't. */
X#define HAVE_DECL_FEOF_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FERROR_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FFLUSH_UNLOCKED 0
X
X/* Define to 1 if you have the declaration of `fgetc_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FGETC_UNLOCKED 0
X
X/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FGETS_UNLOCKED 0
X
X/* Define to 1 if you have the declaration of `fileno_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FILENO_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `fprintf_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FPRINTF_UNLOCKED 0
X
X/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FPUTC_UNLOCKED 0
X
X/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FPUTS_UNLOCKED 0
X
X/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FREAD_UNLOCKED 0
X
X/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_FWRITE_UNLOCKED 0
X
X/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_GETCHAR_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
X   don't. */
X#define HAVE_DECL_GETC_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't.
X   */
X#define HAVE_DECL_GETOPT 1
X
X/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
X   you don't. */
X#define HAVE_DECL_PUTCHAR_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
X   don't. */
X#define HAVE_DECL_PUTC_UNLOCKED 1
X
X/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
X   don't. */
X#define HAVE_DECL_VASPRINTF 1
X
X/* Define to 1 if you have the <fcntl.h> header file. */
X#define HAVE_FCNTL_H 1
X
X/* Define to 1 if you have the `feof_unlocked' function. */
X#define HAVE_FEOF_UNLOCKED 1
X
X/* Define to 1 if you have the `ferror_unlocked' function. */
X#define HAVE_FERROR_UNLOCKED 1
X
X/* Define to 1 if you have the `fflush_unlocked' function. */
X/* #undef HAVE_FFLUSH_UNLOCKED */
X
X/* Define to 1 if you have the `fgetc_unlocked' function. */
X/* #undef HAVE_FGETC_UNLOCKED */
X
X/* Define to 1 if you have the `fgets_unlocked' function. */
X/* #undef HAVE_FGETS_UNLOCKED */
X
X/* Define to 1 if you have the `fileno_unlocked' function. */
X#define HAVE_FILENO_UNLOCKED 1
X
X/* Define to 1 if you have the `fprintf_unlocked' function. */
X/* #undef HAVE_FPRINTF_UNLOCKED */
X
X/* Define to 1 if you have the `fputc_unlocked' function. */
X/* #undef HAVE_FPUTC_UNLOCKED */
X
X/* Define to 1 if you have the `fputs_unlocked' function. */
X/* #undef HAVE_FPUTS_UNLOCKED */
X
X/* Define to 1 if you have the `fread_unlocked' function. */
X/* #undef HAVE_FREAD_UNLOCKED */
X
X/* Define to 1 if you have the `fwrite_unlocked' function. */
X/* #undef HAVE_FWRITE_UNLOCKED */
X
X/* Define to 1 if you have the `getchar_unlocked' function. */
X#define HAVE_GETCHAR_UNLOCKED 1
X
X/* Define to 1 if you have the `getc_unlocked' function. */
X#define HAVE_GETC_UNLOCKED 1
X
X/* Define if you have the iconv() function. */
X#if XXXKAN
X#define HAVE_ICONV 1
X#endif
X
X/* Define to 1 if you have the <iconv.h> header file. */
X/* #undef HAVE_ICONV_H */
X
X/* Define to 1 if you have the <inttypes.h> header file. */
X#define HAVE_INTTYPES_H 1
X
X/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
X#define HAVE_LANGINFO_CODESET 1
X
X/* Define to 1 if you have the <limits.h> header file. */
X#define HAVE_LIMITS_H 1
X
X/* Define to 1 if you have the <locale.h> header file. */
X#define HAVE_LOCALE_H 1
X
X/* Define to 1 if you have the <memory.h> header file. */
X#define HAVE_MEMORY_H 1
X
X/* Define to 1 if libc includes obstacks. */
X/* #undef HAVE_OBSTACK */
X
X/* Define to 1 if you have the `putchar_unlocked' function. */
X#define HAVE_PUTCHAR_UNLOCKED 1
X
X/* Define to 1 if you have the `putc_unlocked' function. */
X#define HAVE_PUTC_UNLOCKED 1
X
X/* Define to 1 if you have the <stddef.h> header file. */
X#define HAVE_STDDEF_H 1
X
X/* Define to 1 if you have the <stdint.h> header file. */
X#define HAVE_STDINT_H 1
X
X/* Define to 1 if you have the <stdlib.h> header file. */
X#define HAVE_STDLIB_H 1
X
X/* Define to 1 if you have the <strings.h> header file. */
X#define HAVE_STRINGS_H 1
X
X/* Define to 1 if you have the <string.h> header file. */
X#define HAVE_STRING_H 1
X
X/* Define to 1 if you have the <sys/file.h> header file. */
X#define HAVE_SYS_FILE_H 1
X
X/* Define to 1 if you have the <sys/stat.h> header file. */
X#define HAVE_SYS_STAT_H 1
X
X/* Define to 1 if you have the <sys/types.h> header file. */
X#define HAVE_SYS_TYPES_H 1
X
X/* Define if <sys/types.h> defines \`uchar'. */
X/* #undef HAVE_UCHAR */
X
X/* Define to 1 if you have the <unistd.h> header file. */
X#define HAVE_UNISTD_H 1
X
X/* Define to the widest efficient host integer type at least as wide as the
X   target's size_t type. */
X#define HOST_WIDE_INT long
X
X#if XXXKAN
X/* Define as const if the declaration of iconv() needs const. */
X#define ICONV_CONST const
X#endif
X
X/* Define to the name of this package. */
X#define PACKAGE "cpplib"
X
X/* Define to the address where bug reports for this package should be sent. */
X#define PACKAGE_BUGREPORT "gcc-bugs@gcc.gnu.org"
X
X/* Define to the full name of this package. */
X#define PACKAGE_NAME "cpplib"
X
X/* Define to the full name and version of this package. */
X#define PACKAGE_STRING "cpplib  "
X
X/* Define to the one symbol short name of this package. */
X#define PACKAGE_TARNAME "cpplib"
X
X/* Define to the version of this package. */
X#define PACKAGE_VERSION " "
X
X/* The size of a `int', as computed by sizeof. */
X#define SIZEOF_INT 4
X
X/* The size of a `long', as computed by sizeof. */
X#define SIZEOF_LONG 4
X
X/* If using the C implementation of alloca, define if you know the
X   direction of stack growth for your system; otherwise it will be
X   automatically deduced at run-time.
X	STACK_DIRECTION > 0 => grows toward higher addresses
X	STACK_DIRECTION < 0 => grows toward lower addresses
X	STACK_DIRECTION = 0 => direction of growth unknown */
X/* #undef STACK_DIRECTION */
X
X/* Define to 1 if you have the ANSI C header files. */
X#define STDC_HEADERS 1
X
X/* Define if you can safely include both <string.h> and <strings.h>. */
X#define STRING_WITH_STRINGS 1
X
X/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
X#define TIME_WITH_SYS_TIME 1
X
X/* Define to 1 if your <sys/time.h> declares `struct tm'. */
X/* #undef TM_IN_SYS_TIME */
X
X/* Define to empty if `const' does not conform to ANSI C. */
X/* #undef const */
X
X/* Define to `__inline__' or `__inline' if that's what the C compiler
X   calls it, or to nothing if 'inline' is not supported under any name.  */
X#ifndef __cplusplus
X/* #undef inline */
X#endif
X
X/* Define to `long' if <sys/types.h> does not define. */
X/* #undef off_t */
X
X/* Define to `unsigned' if <sys/types.h> does not define. */
X/* #undef size_t */
X
Xtypedef unsigned char uchar;
X
X#include <size-host.h>
END-of-gnu/usr.bin/cc/libcpp/config.h
echo c - gnu/usr.bin/cc/libiberty
mkdir -p gnu/usr.bin/cc/libiberty > /dev/null 2>&1
echo x - gnu/usr.bin/cc/libiberty/Makefile
sed 's/^X//' >gnu/usr.bin/cc/libiberty/Makefile << 'END-of-gnu/usr.bin/cc/libiberty/Makefile'
X# $FreeBSD:  $
X
X#
X# Make sure we will pick up our config.h file first, not the one from
X# cc_tools.
X#
XCFLAGS+=	-I${.CURDIR}
X
X.include "../Makefile.inc"
X
X.PATH: ${GCCLIB}/libiberty
X
XLIB=	iberty
XSRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
X	dyn-string.c fibheap.c fopen_unlocked.c getpwd.c getruntime.c \
X	hashtab.c hex.c lbasename.c make-temp-file.c md5.c obstack.c \
X	partition.c pex-unix.c physmem.c safe-ctype.c splay-tree.c xexit.c \
X	xmalloc.c xmemdup.c xstrdup.c xstrerror.c make-relative-prefix.c \
X	pexecute.c pex-common.c pex-one.c lrealpath.c strverscmp.c \
X	regex.c
XINTERNALLIB=
XWARNS?=	1
X
XCFLAGS+=	-UPREFIX
X
X.include <bsd.lib.mk>
END-of-gnu/usr.bin/cc/libiberty/Makefile
echo x - gnu/usr.bin/cc/libiberty/config.h
sed 's/^X//' >gnu/usr.bin/cc/libiberty/config.h << 'END-of-gnu/usr.bin/cc/libiberty/config.h'
X/* config.h.  Generated by configure.  */
X/* config.in.  Generated from configure.ac by autoheader.  */
X
X/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
X   This function is required for alloca.c support on those systems. */
X/* #undef CRAY_STACKSEG_END */
X
X/* Define to 1 if you have the <alloca.h> header file. */
X/* #undef HAVE_ALLOCA_H */
X
X/* Define to 1 if you have the `asprintf' function. */
X#define HAVE_ASPRINTF 1
X
X/* Define to 1 if you have the `atexit' function. */
X#define HAVE_ATEXIT 1
X
X/* Define to 1 if you have the `basename' function. */
X#define HAVE_BASENAME 1
X
X/* Define to 1 if you have the `bcmp' function. */
X#define HAVE_BCMP 1
X
X/* Define to 1 if you have the `bcopy' function. */
X#define HAVE_BCOPY 1
X
X/* Define to 1 if you have the `bsearch' function. */
X#define HAVE_BSEARCH 1
X
X/* Define to 1 if you have the `bzero' function. */
X#define HAVE_BZERO 1
X
X/* Define to 1 if you have the `calloc' function. */
X#define HAVE_CALLOC 1
X
X/* Define to 1 if you have the `canonicalize_file_name' function. */
X/* #undef HAVE_CANONICALIZE_FILE_NAME */
X
X/* Define to 1 if you have the `clock' function. */
X#define HAVE_CLOCK 1
X
X/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
X   don't. */
X#define HAVE_DECL_ASPRINTF 1
X
X/* Define to 1 if you have the declaration of `basename', and to 0 if you
X   don't. */
X#define HAVE_DECL_BASENAME 0
X
X/* Define to 1 if you have the declaration of `calloc', and to 0 if you don't.
X   */
X#define HAVE_DECL_CALLOC 1
X
X/* Define to 1 if you have the declaration of `ffs', and to 0 if you don't. */
X#define HAVE_DECL_FFS 1
X
X/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
X   */
X#define HAVE_DECL_GETENV 1
X
X/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't.
X   */
X#define HAVE_DECL_GETOPT 1
X
X/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't.
X   */
X#define HAVE_DECL_MALLOC 1
X
X/* Define to 1 if you have the declaration of `realloc', and to 0 if you
X   don't. */
X#define HAVE_DECL_REALLOC 1
X
X/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't.
X   */
X#define HAVE_DECL_SBRK 1
X
X/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
X   don't. */
X#define HAVE_DECL_SNPRINTF 1
X
X/* Define to 1 if you have the declaration of `strverscmp', and to 0 if you
X   don't. */
X#define HAVE_DECL_STRVERSCMP 0
X
X/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
X   don't. */
X#define HAVE_DECL_VASPRINTF 1
X
X/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
X   don't. */
X#define HAVE_DECL_VSNPRINTF 1
X
X/* Define to 1 if you have the <fcntl.h> header file. */
X#define HAVE_FCNTL_H 1
X
X/* Define to 1 if you have the `ffs' function. */
X#define HAVE_FFS 1
X
X/* Define to 1 if you have the `fork' function. */
X#define HAVE_FORK 1
X
X/* Define to 1 if you have the `getcwd' function. */
X#define HAVE_GETCWD 1
X
X/* Define to 1 if you have the `getpagesize' function. */
X#define HAVE_GETPAGESIZE 1
X
X/* Define to 1 if you have the `getrusage' function. */
X#define HAVE_GETRUSAGE 1
X
X/* Define to 1 if you have the `getsysinfo' function. */
X/* #undef HAVE_GETSYSINFO */
X
X/* Define to 1 if you have the `gettimeofday' function. */
X#define HAVE_GETTIMEOFDAY 1
X
X/* Define to 1 if you have the `index' function. */
X#define HAVE_INDEX 1
X
X/* Define to 1 if you have the `insque' function. */
X#define HAVE_INSQUE 1
X
X/* Define to 1 if you have the <inttypes.h> header file. */
X#define HAVE_INTTYPES_H 1
X
X/* Define to 1 if you have the <limits.h> header file. */
X#define HAVE_LIMITS_H 1
X
X/* Define to 1 if you have the <machine/hal_sysinfo.h> header file. */
X/* #undef HAVE_MACHINE_HAL_SYSINFO_H */
X
X/* Define to 1 if you have the <malloc.h> header file. */
X/* #undef HAVE_MALLOC_H */
X
X/* Define to 1 if you have the `memchr' function. */
X#define HAVE_MEMCHR 1
X
X/* Define to 1 if you have the `memcmp' function. */
X#define HAVE_MEMCMP 1
X
X/* Define to 1 if you have the `memcpy' function. */
X#define HAVE_MEMCPY 1
X
X/* Define to 1 if you have the `memmove' function. */
X#define HAVE_MEMMOVE 1
X
X/* Define to 1 if you have the <memory.h> header file. */
X#define HAVE_MEMORY_H 1
X
X/* Define to 1 if you have the `mempcpy' function. */
X/* #undef HAVE_MEMPCPY */
X
X/* Define to 1 if you have the `memset' function. */
X#define HAVE_MEMSET 1
X
X/* Define to 1 if you have the `mkstemps' function. */
X#define HAVE_MKSTEMPS 1
X
X/* Define to 1 if you have a working `mmap' system call. */
X#define HAVE_MMAP 1
X
X/* Define to 1 if you have the `on_exit' function. */
X/* #undef HAVE_ON_EXIT */
X
X/* Define to 1 if you have the `psignal' function. */
X#define HAVE_PSIGNAL 1
X
X/* Define to 1 if you have the `pstat_getdynamic' function. */
X/* #undef HAVE_PSTAT_GETDYNAMIC */
X
X/* Define to 1 if you have the `pstat_getstatic' function. */
X/* #undef HAVE_PSTAT_GETSTATIC */
X
X/* Define to 1 if you have the `putenv' function. */
X#define HAVE_PUTENV 1
X
X/* Define to 1 if you have the `random' function. */
X#define HAVE_RANDOM 1
X
X/* Define to 1 if you have the `realpath' function. */
X#define HAVE_REALPATH 1
X
X/* Define to 1 if you have the `rename' function. */
X#define HAVE_RENAME 1
X
X/* Define to 1 if you have the `rindex' function. */
X#define HAVE_RINDEX 1
X
X/* Define to 1 if you have the `sbrk' function. */
X#define HAVE_SBRK 1
X
X/* Define to 1 if you have the `setenv' function. */
X#define HAVE_SETENV 1
X
X/* Define to 1 if you have the `sigsetmask' function. */
X#define HAVE_SIGSETMASK 1
X
X/* Define to 1 if you have the `snprintf' function. */
X#define HAVE_SNPRINTF 1
X
X/* Define to 1 if you have the <stdint.h> header file. */
X#define HAVE_STDINT_H 1
X
X/* Define to 1 if you have the <stdio_ext.h> header file. */
X/* #undef HAVE_STDIO_EXT_H */
X
X/* Define to 1 if you have the <stdlib.h> header file. */
X#define HAVE_STDLIB_H 1
X
X/* Define to 1 if you have the `stpcpy' function. */
X#define HAVE_STPCPY 1
X
X/* Define to 1 if you have the `stpncpy' function. */
X/* #undef HAVE_STPNCPY */
X
X/* Define to 1 if you have the `strcasecmp' function. */
X#define HAVE_STRCASECMP 1
X
X/* Define to 1 if you have the `strchr' function. */
X#define HAVE_STRCHR 1
X
X/* Define to 1 if you have the `strdup' function. */
X#define HAVE_STRDUP 1
X
X/* Define to 1 if you have the `strerror' function. */
X#define HAVE_STRERROR 1
X
X/* Define to 1 if you have the <strings.h> header file. */
X#define HAVE_STRINGS_H 1
X
X/* Define to 1 if you have the <string.h> header file. */
X#define HAVE_STRING_H 1
X
X/* Define to 1 if you have the `strncasecmp' function. */
X#define HAVE_STRNCASECMP 1
X
X/* Define to 1 if you have the `strndup' function. */
X/* #undef HAVE_STRNDUP */
X
X/* Define to 1 if you have the `strrchr' function. */
X#define HAVE_STRRCHR 1
X
X/* Define to 1 if you have the `strsignal' function. */
X#define HAVE_STRSIGNAL 1
X
X/* Define to 1 if you have the `strstr' function. */
X#define HAVE_STRSTR 1
X
X/* Define to 1 if you have the `strtod' function. */
X#define HAVE_STRTOD 1
X
X/* Define to 1 if you have the `strtol' function. */
X#define HAVE_STRTOL 1
X
X/* Define to 1 if you have the `strtoul' function. */
X#define HAVE_STRTOUL 1
X
X/* Define to 1 if you have the `strverscmp' function. */
X/* #undef HAVE_STRVERSCMP */
X
X/* Define to 1 if you have the `sysconf' function. */
X#define HAVE_SYSCONF 1
X
X/* Define to 1 if you have the `sysctl' function. */
X#define HAVE_SYSCTL 1
X
X/* Define to 1 if you have the `sysmp' function. */
X/* #undef HAVE_SYSMP */
X
X/* Define if you have the sys_errlist variable. */
X#define HAVE_SYS_ERRLIST 1
X
X/* Define to 1 if you have the <sys/file.h> header file. */
X#define HAVE_SYS_FILE_H 1
X
X/* Define to 1 if you have the <sys/mman.h> header file. */
X#define HAVE_SYS_MMAN_H 1
X
X/* Define if you have the sys_nerr variable. */
X#define HAVE_SYS_NERR 1
X
X/* Define to 1 if you have the <sys/param.h> header file. */
X#define HAVE_SYS_PARAM_H 1
X
X/* Define to 1 if you have the <sys/pstat.h> header file. */
X/* #undef HAVE_SYS_PSTAT_H */
X
X/* Define to 1 if you have the <sys/resource.h> header file. */
X#define HAVE_SYS_RESOURCE_H 1
X
X/* Define if you have the sys_siglist variable. */
X#define HAVE_SYS_SIGLIST 1
X
X/* Define to 1 if you have the <sys/stat.h> header file. */
X#define HAVE_SYS_STAT_H 1
X
X/* Define to 1 if you have the <sys/sysctl.h> header file. */
X#define HAVE_SYS_SYSCTL_H 1
X
X/* Define to 1 if you have the <sys/sysinfo.h> header file. */
X/* #undef HAVE_SYS_SYSINFO_H */
X
X/* Define to 1 if you have the <sys/sysmp.h> header file. */
X/* #undef HAVE_SYS_SYSMP_H */
X
X/* Define to 1 if you have the <sys/systemcfg.h> header file. */
X/* #undef HAVE_SYS_SYSTEMCFG_H */
X
X/* Define to 1 if you have the <sys/table.h> header file. */
X/* #undef HAVE_SYS_TABLE_H */
X
X/* Define to 1 if you have the <sys/time.h> header file. */
X#define HAVE_SYS_TIME_H 1
X
X/* Define to 1 if you have the <sys/types.h> header file. */
X#define HAVE_SYS_TYPES_H 1
X
X/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
X#define HAVE_SYS_WAIT_H 1
X
X/* Define to 1 if you have the `table' function. */
X/* #undef HAVE_TABLE */
X
X/* Define to 1 if you have the `times' function. */
X#define HAVE_TIMES 1
X
X/* Define to 1 if you have the <time.h> header file. */
X#define HAVE_TIME_H 1
X
X/* Define to 1 if you have the `tmpnam' function. */
X#define HAVE_TMPNAM 1
X
X/* Define if you have the \`uintptr_t' type. */
X#define HAVE_UINTPTR_T 1
X
X/* Define to 1 if you have the <unistd.h> header file. */
X#define HAVE_UNISTD_H 1
X
X/* Define to 1 if you have the `vasprintf' function. */
X#define HAVE_VASPRINTF 1
X
X/* Define to 1 if you have the `vfork' function. */
X#define HAVE_VFORK 1
X
X/* Define to 1 if you have the <vfork.h> header file. */
X/* #undef HAVE_VFORK_H */
X
X/* Define to 1 if you have the `vfprintf' function. */
X#define HAVE_VFPRINTF 1
X
X/* Define to 1 if you have the `vprintf' function. */
X#define HAVE_VPRINTF 1
X
X/* Define to 1 if you have the `vsnprintf' function. */
X#define HAVE_VSNPRINTF 1
X
X/* Define to 1 if you have the `vsprintf' function. */
X#define HAVE_VSPRINTF 1
X
X/* Define to 1 if you have the `wait3' function. */
X#define HAVE_WAIT3 1
X
X/* Define to 1 if you have the `wait4' function. */
X#define HAVE_WAIT4 1
X
X/* Define to 1 if you have the `waitpid' function. */
X#define HAVE_WAITPID 1
X
X/* Define to 1 if `fork' works. */
X#define HAVE_WORKING_FORK 1
X
X/* Define to 1 if `vfork' works. */
X#define HAVE_WORKING_VFORK 1
X
X/* Define to 1 if you have the `_doprnt' function. */
X/* #undef HAVE__DOPRNT */
X
X/* Define if you have the _system_configuration variable. */
X/* #undef HAVE__SYSTEM_CONFIGURATION */
X
X/* Define to 1 if you have the `__fsetlocking' function. */
X/* #undef HAVE___FSETLOCKING */
X
X/* Define if canonicalize_file_name is not declared in system header files. */
X#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1
X
X/* Define if errno must be declared even when <errno.h> is included. */
X/* #undef NEED_DECLARATION_ERRNO */
X
X/* Define to 1 if your C compiler doesn't accept -c and -o together. */
X/* #undef NO_MINUS_C_MINUS_O */
X
X/* Define to the address where bug reports for this package should be sent. */
X#define PACKAGE_BUGREPORT ""
X
X/* Define to the full name of this package. */
X#define PACKAGE_NAME ""
X
X/* Define to the full name and version of this package. */
X#define PACKAGE_STRING ""
X
X/* Define to the one symbol short name of this package. */
X#define PACKAGE_TARNAME ""
X
X/* Define to the version of this package. */
X#define PACKAGE_VERSION ""
X
X/* The size of a `int', as computed by sizeof. */
X#define SIZEOF_INT 4
X
X/* Define if you know the direction of stack growth for your system; otherwise
X   it will be automatically deduced at run-time. STACK_DIRECTION > 0 => grows
X   toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses
X   STACK_DIRECTION = 0 => direction of growth unknown */
X#define STACK_DIRECTION -1
X
X/* Define to 1 if you have the ANSI C header files. */
X#define STDC_HEADERS 1
X
X/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
X#define TIME_WITH_SYS_TIME 1
X
X/* Define to an unsigned 64-bit type available in the compiler. */
X#define UNSIGNED_64BIT_TYPE uint64_t
X
X/* Define to 1 if your processor stores words with the most significant byte
X   first (like Motorola and SPARC, unlike Intel and VAX). */
X/* #undef WORDS_BIGENDIAN */
X
X/* Define to empty if `const' does not conform to ANSI C. */
X/* #undef const */
X
X/* Define to `__inline__' or `__inline' if that's what the C compiler
X   calls it, or to nothing if 'inline' is not supported under any name.  */
X#ifndef __cplusplus
X/* #undef inline */
X#endif
X
X/* Define to `int' if <sys/types.h> does not define. */
X/* #undef pid_t */
X
X/* Define to `unsigned long' if <sys/types.h> does not define. */
X/* #undef uintptr_t */
X
X/* Define as `fork' if `vfork' does not work. */
X/* #undef vfork */
X
X#include <size-host.h>
END-of-gnu/usr.bin/cc/libiberty/config.h
echo x - src.diff
sed 's/^X//' >src.diff << 'END-of-src.diff'
XIndex: Makefile.inc1
X===================================================================
XRCS file: /usr/download/ncvs2/src/Makefile.inc1,v
Xretrieving revision 1.570
Xdiff -u -r1.570 Makefile.inc1
X--- Makefile.inc1	9 Mar 2007 12:11:56 -0000	1.570
X+++ Makefile.inc1	2 Apr 2007 14:55:09 -0000
X@@ -988,21 +988,31 @@
X #
X libraries:
X 	cd ${.CURDIR}; \
X+	    ${MAKE} -f Makefile.inc1 _prereq_libs; \
X 	    ${MAKE} -f Makefile.inc1 _startup_libs; \
X 	    ${MAKE} -f Makefile.inc1 _prebuild_libs; \
X 	    ${MAKE} -f Makefile.inc1 _generic_libs;
X 
X+#
X+# static libgcc.a prerequisite for shared libc
X+#
X+_prereq_libs= gnu/lib/libgcc
X+
X # These dependencies are not automatically generated:
X #
X-# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all
X-# shared libraries for ELF.
X+# gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before
X+# all shared libraries for ELF.
X #
X-_startup_libs=	gnu/lib/csu gnu/lib/libgcc
X+_startup_libs=	gnu/lib/csu
X .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
X _startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
X .else
X _startup_libs+=	lib/csu/${MACHINE_ARCH}
X .endif
X+_startup_libs+=	gnu/lib/libgcc
X+_startup_libs+=	lib/libc
X+
X+gnu/lib/libgcc__L: lib/libc__L
X 
X _prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
X 		${_kerberos5_lib_libroken} \
X@@ -1058,6 +1068,18 @@
X lib/libradius__L: lib/libmd__L
X .endif
X 
X+.for _lib in ${_prereq_libs}
X+${_lib}__PL: .PHONY
X+.if exists(${.CURDIR}/${_lib})
X+	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
X+		cd ${.CURDIR}/${_lib}; \
X+		${MAKE} DIRPRFX=${_lib}/ obj; \
X+		${MAKE} DIRPRFX=${_lib}/ depend; \
X+		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
X+		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
X+.endif
X+.endfor
X+
X .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
X ${_lib}__L: .PHONY
X .if exists(${.CURDIR}/${_lib})
X@@ -1081,6 +1103,7 @@
X 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
X 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
X 
X+_prereq_libs:  ${_prereq_libs:S/$/__PL/}
X _startup_libs: ${_startup_libs:S/$/__L/}
X _prebuild_libs: ${_prebuild_libs:S/$/__L/}
X _generic_libs: ${_generic_libs:S/$/__L/}
XIndex: bin/df/df.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/bin/df/df.c,v
Xretrieving revision 1.67
Xdiff -u -r1.67 df.c
X--- bin/df/df.c	8 Mar 2007 06:10:17 -0000	1.67
X+++ bin/df/df.c	14 Mar 2007 01:06:38 -0000
X@@ -384,7 +384,7 @@
X static void
X prtstat(struct statfs *sfsp, struct maxwidths *mwp)
X {
X-	static u_long blocksize;
X+	static long blocksize;
X 	static int headerlen, timesthrough = 0;
X 	static const char *header;
X 	int64_t used, availblks, inodes;
X@@ -461,7 +461,7 @@
X static void
X update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp)
X {
X-	static u_long blocksize = 0;
X+	static long blocksize = 0;
X 	int dummy;
X 
X 	if (blocksize == 0)
XIndex: bin/ed/cbc.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/bin/ed/cbc.c,v
Xretrieving revision 1.20
Xdiff -u -r1.20 cbc.c
X--- bin/ed/cbc.c	6 Apr 2004 20:06:47 -0000	1.20
X+++ bin/ed/cbc.c	17 Dec 2006 06:49:26 -0000
X@@ -175,7 +175,7 @@
X 		/*
X 		 * copy it, nul-padded, into the key area
X 		 */
X-		expand_des_key(msgbuf, p);
X+		expand_des_key((char *)msgbuf, p);
X 		MEMZERO(p, _PASSWORD_LEN);
X 		set_des_key(&msgbuf);
X 		MEMZERO(msgbuf, sizeof msgbuf);
XIndex: contrib/amd/hlfsd/homedir.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/amd/hlfsd/homedir.c,v
Xretrieving revision 1.7
Xdiff -u -r1.7 homedir.c
X--- contrib/amd/hlfsd/homedir.c	6 Jul 2004 13:16:46 -0000	1.7
X+++ contrib/amd/hlfsd/homedir.c	17 Dec 2006 06:49:26 -0000
X@@ -68,7 +68,7 @@
X static uid2home_t *pwtab;
X static void delay(uid2home_t *, int);
X static void table_add(int, const char *, const char *);
X-static char mboxfile[MAXPATHLEN];
X+char mboxfile[MAXPATHLEN];
X static char *root_home;		/* root's home directory */
X 
X /* GLOBAL FUNCTIONS */
XIndex: contrib/binutils/gas/config/tc-i386.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/binutils/gas/config/tc-i386.c,v
Xretrieving revision 1.16
Xdiff -u -r1.16 tc-i386.c
X--- contrib/binutils/gas/config/tc-i386.c	16 Jun 2004 06:55:47 -0000	1.16
X+++ contrib/binutils/gas/config/tc-i386.c	17 Dec 2006 06:49:26 -0000
X@@ -363,7 +363,7 @@
X    prefix), and doesn't work, unless the destination is in the bottom
X    64k of the code segment (The top 16 bits of eip are zeroed).  */
X 
X-const relax_typeS md_relax_table[] =
X+static const relax_typeS md_relax_table[] =
X {
X   /* The fields are:
X      1) most positive reach of this state,
X@@ -402,6 +402,8 @@
X   {0, 0, 4, 0}
X };
X 
X+const relax_typeS *md_relax_table_p = &md_relax_table[0];
X+
X static const arch_entry cpu_arch[] = {
X   {"i8086",	Cpu086 },
X   {"i186",	Cpu086|Cpu186 },
XIndex: contrib/binutils/gas/config/tc-i386.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/binutils/gas/config/tc-i386.h,v
Xretrieving revision 1.11
Xdiff -u -r1.11 tc-i386.h
X--- contrib/binutils/gas/config/tc-i386.h	16 Jun 2004 06:55:47 -0000	1.11
X+++ contrib/binutils/gas/config/tc-i386.h	17 Dec 2006 06:49:26 -0000
X@@ -448,8 +448,8 @@
X 
X #define md_operand(x)
X 
X-extern const struct relax_type md_relax_table[];
X-#define TC_GENERIC_RELAX_TABLE md_relax_table
X+extern const struct relax_type *md_relax_table_p;
X+#define TC_GENERIC_RELAX_TABLE md_relax_table_p
X 
X extern int optimize_align_code;
X 
XIndex: contrib/csup/mux.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/csup/mux.c,v
Xretrieving revision 1.1.1.1
Xdiff -u -r1.1.1.1 mux.c
X--- contrib/csup/mux.c	3 Mar 2006 04:11:28 -0000	1.1.1.1
X+++ contrib/csup/mux.c	17 Dec 2006 06:49:26 -0000
X@@ -784,6 +784,7 @@
X 	uint16_t hdrsize, size, len;
X 	int error, id, iovcnt, what;
X 
X+	what = 0;
X 	m = (struct mux *)arg;
X again:
X 	id = sender_waitforwork(m, &what);
XIndex: contrib/csup/queue.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/csup/queue.h,v
Xretrieving revision 1.1.1.2
Xdiff -u -r1.1.1.2 queue.h
X--- contrib/csup/queue.h	3 Mar 2006 18:45:12 -0000	1.1.1.2
X+++ contrib/csup/queue.h	17 Dec 2006 06:49:26 -0000
X@@ -35,7 +35,7 @@
X #ifndef _QUEUE_H_
X #define	_QUEUE_H_
X 
X-#undef __ofsetof
X+#undef __offsetof
X #define	__offsetof(type, field)	((size_t)(&((type *)0)->field))
X 
X /*
XIndex: contrib/gdb/gdb/i386fbsd-tdep.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/gdb/gdb/i386fbsd-tdep.c,v
Xretrieving revision 1.1.1.1
Xdiff -u -r1.1.1.1 i386fbsd-tdep.c
X--- contrib/gdb/gdb/i386fbsd-tdep.c	20 Jun 2004 18:17:51 -0000	1.1.1.1
X+++ contrib/gdb/gdb/i386fbsd-tdep.c	17 Dec 2006 06:49:26 -0000
X@@ -45,7 +45,7 @@
X CORE_ADDR i386fbsd_sigtramp_end_addr = 0xbfbfdff0;
X 
X /* From <machine/signal.h>.  */
X-static int i386fbsd_sc_reg_offset[] =
X+int i386fbsd_sc_reg_offset[] =
X {
X   8 + 14 * 4,			/* %eax */
X   8 + 13 * 4,			/* %ecx */
XIndex: contrib/openpam/lib/openpam_readline.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/openpam/lib/openpam_readline.c,v
Xretrieving revision 1.1.1.2
Xdiff -u -r1.1.1.2 openpam_readline.c
X--- contrib/openpam/lib/openpam_readline.c	17 Jun 2005 08:11:42 -0000	1.1.1.2
X+++ contrib/openpam/lib/openpam_readline.c	17 Dec 2006 06:49:26 -0000
X@@ -52,7 +52,7 @@
X char *
X openpam_readline(FILE *f, int *lineno, size_t *lenp)
X {
X-	unsigned char *line;
X+	char *line;
X 	size_t len, size;
X 	int ch;
X 
X@@ -63,7 +63,7 @@
X 
X #define line_putch(ch) do { \
X 	if (len >= size - 1) { \
X-		unsigned char *tmp = realloc(line, size *= 2); \
X+		char *tmp = realloc(line, size *= 2); \
X 		if (tmp == NULL) \
X 			goto fail; \
X 		line = tmp; \
XIndex: contrib/telnet/telnetd/ext.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/telnet/telnetd/ext.h,v
Xretrieving revision 1.11
Xdiff -u -r1.11 ext.h
X--- contrib/telnet/telnetd/ext.h	30 Nov 2001 22:28:07 -0000	1.11
X+++ contrib/telnet/telnetd/ext.h	17 Dec 2006 06:49:26 -0000
X@@ -175,7 +175,7 @@
X 	wontoption(int);
X 
X int	output_data(const char *, ...) __printflike(1, 2);
X-void	output_datalen(const char *, int);
X+void	output_datalen(const unsigned char *, int);
X void	startslave(char *, int, char *);
X 
X #ifdef	ENCRYPTION
XIndex: contrib/telnet/telnetd/state.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/telnet/telnetd/state.c,v
Xretrieving revision 1.14
Xdiff -u -r1.14 state.c
X--- contrib/telnet/telnetd/state.c	4 May 2003 02:54:49 -0000	1.14
X+++ contrib/telnet/telnetd/state.c	17 Dec 2006 06:49:27 -0000
X@@ -1600,14 +1600,14 @@
X 	va_start(args, format);
X 	if ((len = vasprintf(&buf, format, args)) == -1)
X 		return -1;
X-	output_datalen(buf, len);
X+	output_datalen((unsigned char *)buf, len);
X 	va_end(args);
X 	free(buf);
X 	return (len);
X }
X 
X void
X-output_datalen(const char *buf, int len)
X+output_datalen(const unsigned char *buf, int len)
X {
X 	int remaining, copied;
X 	
XIndex: contrib/telnet/telnetd/telnetd.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/telnet/telnetd/telnetd.c,v
Xretrieving revision 1.29
Xdiff -u -r1.29 telnetd.c
X--- contrib/telnet/telnetd/telnetd.c	26 Sep 2006 21:46:11 -0000	1.29
X+++ contrib/telnet/telnetd/telnetd.c	17 Dec 2006 06:49:27 -0000
X@@ -133,11 +133,12 @@
X {
X 	u_long ultmp;
X 	struct sockaddr_storage from;
X-	int on = 1, fromlen;
X+	int on = 1;
X 	int ch;
X #if	defined(IPPROTO_IP) && defined(IP_TOS)
X 	int tos = -1;
X #endif
X+	socklen_t fromlen;
X 	char *ep;
X 
X 	pfrontp = pbackp = ptyobuf;
X@@ -328,7 +329,8 @@
X 	argv += optind;
X 
X 	if (debug) {
X-	    int s, ns, foo, error;
X+	    int s, ns, error;
X+	    socklen_t foo;
X 	    const char *service = "telnet";
X 	    struct addrinfo hints, *res;
X 
XIndex: contrib/telnet/telnetd/utility.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/contrib/telnet/telnetd/utility.c,v
Xretrieving revision 1.13
Xdiff -u -r1.13 utility.c
X--- contrib/telnet/telnetd/utility.c	4 May 2003 02:54:49 -0000	1.13
X+++ contrib/telnet/telnetd/utility.c	17 Dec 2006 06:49:27 -0000
X@@ -916,7 +916,7 @@
X 			"MUTUAL" : "ONE-WAY");
X 
X     		{
X-		    char buf[512];
X+		    unsigned char buf[512];
X 		    auth_printsub(&pointer[1], length - 1, buf, sizeof(buf));
X 		    output_data("%s", buf);
X 		}
X@@ -994,7 +994,7 @@
X 		    output_data(" %d (unknown)", pointer[2]);
X 
X 		{
X-		    char buf[512];
X+		    unsigned char buf[512];
X 		    encrypt_printsub(&pointer[1], length - 1, buf, sizeof(buf));
X 		    output_data("%s", buf);
X 		}
XIndex: crypto/heimdal/lib/asn1/gen_glue.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/crypto/heimdal/lib/asn1/gen_glue.c,v
Xretrieving revision 1.1.1.1
Xdiff -u -r1.1.1.1 gen_glue.c
X--- crypto/heimdal/lib/asn1/gen_glue.c	9 Jan 2000 20:57:39 -0000	1.1.1.1
X+++ crypto/heimdal/lib/asn1/gen_glue.c	17 Dec 2006 06:49:27 -0000
X@@ -103,7 +103,9 @@
X     int tag = -1;
X 
X     fprintf (headerfile,
X-	     "extern struct units %s_units[];",
X+	     "#ifdef __PARSE_UNITS_H__\n"
X+	     "extern struct units %s_units[];\n"
X+	     "#endif /* __PARSE_UNITS_H__ */\n",
X 	     s->gen_name);
X 
X     fprintf (codefile,
XIndex: etc/mtree/BSD.include.dist
X===================================================================
XRCS file: /usr/download/ncvs2/src/etc/mtree/BSD.include.dist,v
Xretrieving revision 1.111
Xdiff -u -r1.111 BSD.include.dist
X--- etc/mtree/BSD.include.dist	27 Feb 2007 04:01:57 -0000	1.111
X+++ etc/mtree/BSD.include.dist	3 Mar 2007 17:06:21 -0000
X@@ -14,15 +14,17 @@
X     bsnmp
X     ..
X     c++
X-        3.4
X-            backward
X-            ..
X+	4.1
X+	    backward
X+	    ..
X             bits
X             ..
X             debug
X             ..
X             ext
X             ..
X+            tr1
X+            ..
X         ..
X     ..
X     cam
XIndex: gnu/lib/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/Makefile,v
Xretrieving revision 1.41
Xdiff -u -r1.41 Makefile
X--- gnu/lib/Makefile	17 Mar 2006 18:54:22 -0000	1.41
X+++ gnu/lib/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -14,8 +14,4 @@
X SUBDIR+= libobjc
X .endif
X 
X-.if ${MK_FORTRAN} != "no"
X-SUBDIR+= libg2c
X-.endif
X-
X .include <bsd.subdir.mk>
XIndex: gnu/lib/csu/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/csu/Makefile,v
Xretrieving revision 1.24
Xdiff -u -r1.24 Makefile
X--- gnu/lib/csu/Makefile	10 Sep 2004 06:48:04 -0000	1.24
X+++ gnu/lib/csu/Makefile	4 Apr 2007 19:15:47 -0000
X@@ -1,20 +1,21 @@
X # $FreeBSD: src/gnu/lib/csu/Makefile,v 1.24 2004/09/10 06:48:04 ru Exp $
X 
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X CCDIR=	${.CURDIR}/../../usr.bin/cc
X .include "${CCDIR}/Makefile.tgt"
X 
X .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
X 
X-SRCS=		crtstuff.c tconfig.h tm.h
X-OBJS=		crtbegin.o crtend.o
X+SRCS=		crtstuff.c tconfig.h tm.h options.h
X+OBJS=		crtbegin.o crtend.o crtbeginT.o
X SOBJS=		crtbegin.So crtend.So
X CSTD?=		gnu89
X-CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR
X+CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3
X CFLAGS+=	-finhibit-size-directive -fno-inline-functions \
X 		-fno-exceptions -fno-zero-initialized-in-bss \
X 		-fno-omit-frame-pointer -fno-unit-at-a-time
X-CFLAGS+=	-I${GCCDIR}/config -I${GCCDIR} -I. \
X+CFLAGS+=	-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \
X 		-I${CCDIR}/cc_tools
X CRTS_CFLAGS=	-DCRTSTUFFS_O -DSHARED ${PICFLAG}
X MKDEP=		-DCRT_BEGIN
X@@ -46,6 +47,10 @@
X 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN \
X 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
X 
X+crtbeginT.o:	${BEGINSRC}
X+	${CC} ${CFLAGS} -g0 -DCRT_BEGIN -DCRTSTUFFT_O \
X+		-c -o ${.TARGET} ${.ALLSRC:N*.h}
X+
X crtbegin.So:	${BEGINSRC}
X 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \
X 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
X@@ -58,8 +63,8 @@
X 	${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
X 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
X 
X-CLEANFILES+=	tm.h tconfig.h
X-tm.h tconfig.h: ${CCDIR}/cc_tools/Makefile
X+CLEANFILES+=	tm.h tconfig.h options.h optionlist cs-tconfig.h cs-tm.h
X+tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile
X 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X 
X realinstall:
XIndex: gnu/lib/libgcc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libgcc/Makefile,v
Xretrieving revision 1.56
Xdiff -u -r1.56 Makefile
X--- gnu/lib/libgcc/Makefile	12 Oct 2006 16:43:15 -0000	1.56
X+++ gnu/lib/libgcc/Makefile	5 Apr 2007 13:11:12 -0000
X@@ -1,43 +1,24 @@
X # $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.56 2006/10/12 16:43:15 cognet Exp $
X+GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X+
X+LIB=		gcc
X+SHLIB_NAME=	libgcc_s.so.1
X+SHLIBDIR?=	/lib
X 
X .include <bsd.own.mk>
X .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
X 
X-GCCDIR=	${.CURDIR}/../../../contrib/gcc
X .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
X 
X-# allow to be overridden for the a.out case
X-.if !defined(LIB) || ${LIB} != "gcc_r"
X-LIB=	gcc
X-.endif
X-
X-#SHLIB_MAJOR=	1
X-
X-# We need to install libgcc_pic.a as well, for use by shared libs.
X-INSTALL_PIC_ARCHIVE=
X-
X-#
X-# XXX This is a hack, but it seems to work.
X-# libgcc2.a is meant to be compiled by *this* version of gcc.
X-#
X-# Normally, this does not make any difference, since we only have gcc, but
X-# when bootstrapping from gcc-2.6.3, we have to use the freshly built 2.7.2
X-# compiler for some of the libgcc2.c __attribute__ stuff.
X-#
X-# We now depend on a bootstrap pass (normally in `make world') to build
X-# and install the new version of gcc before we get here.  This makes
X-# finding the new version (XCC) easy but may break finding the old version
X-# (CC).
X-#
X-XCC=	${CC}
X-XCXX=	${CXX}
X-
X-CFLAGS+=	-fexceptions
X CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
X-		-DFINE_GRAINED_LIBRARIES
X-CFLAGS+=	-D_PTHREADS -DGTHREAD_USE_WEAK
X-CFLAGS+=	-I${.CURDIR}/../../usr.bin/cc/cc_tools \
X-		-I${GCCDIR}/config -I${GCCDIR} -I.
X+		-DHAVE_GTHR_DEFAULT \
X+		-I${GCCLIB}/include \
X+		-I${GCCDIR}/config -I${GCCDIR} -I. \
X+		-I${.CURDIR}/../../usr.bin/cc/cc_tools
X+
X+LDFLAGS+=	-nodefaultlibs
X+LDADD+=		-lc
X 
X OBJS=		# added to below in various ways depending on TARGET_ARCH
X 
X@@ -46,27 +27,48 @@
X # When upgrading GCC, get the following defintions straight from Makefile.in
X #
X # Library members defined in libgcc2.c.
X-LIB2FUNCS = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
X+LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
X 	_cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \
X 	_fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi \
X 	_floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf _clear_cache \
X 	_enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
X 	_addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \
X 	_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
X-	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 
X+	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
X+	_powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 \
X+	_divxc3 _divtc3
X+
X+LIB2ADD = $(LIB2FUNCS_EXTRA)
X+LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
X+
X+# Additional sources to handle exceptions; overridden by targets as needed.
X+LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \
X+	unwind-c.c
X+LIB2ADDEHSTATIC = $(LIB2ADDEH)
X+LIB2ADDEHSHARED = $(LIB2ADDEH)
X+
X+# List of extra C and assembler files to add to static and shared libgcc2.
X+# Assembler files should have names ending in `.asm'.
X+LIB2FUNCS_EXTRA =
X+
X+# List of extra C and assembler files to add to static libgcc2.
X+# Assembler files should have names ending in `.asm'.
X+LIB2FUNCS_STATIC_EXTRA =
X 
X # Defined in libgcc2.c, included only in the static library.
X+# KAN: Excluded _sf_to_tf and _df_to_tf as TPBIT_FUNCS are not
X+# built on any of our platforms.
X LIB2FUNCS_ST = _eprintf __gcc_bcmp
X 
X FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \
X     _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \
X     _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \
X-    _sf_to_df _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf
X+    _sf_to_df _thenan_sf _sf_to_usi _usi_to_sf
X 
X DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
X     _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \
X     _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \
X-    _df_to_sf _df_to_tf _thenan_df _df_to_usi _usi_to_df
X+    _df_to_sf _thenan_df _df_to_usi _usi_to_df
X 
X TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \
X     _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \
X@@ -77,81 +79,48 @@
X # unwinder info.
X LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
X 
X-LIB2ADD = $(LIB2FUNCS_EXTRA)
X-LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
X-
X-# Additional sources to handle exceptions; overridden by targets as needed.
X-LIB2ADDEH = unwind-dw2.c unwind-dw2-fde.c unwind-sjlj.c gthr-gnat.c unwind-c.c
X-
X #-----------------------------------------------------------------------
X #
X #	Platform specific bits.
X-#	When upgrading GCC, get the following defintions from config/<cpu>/t-*
X+#	When upgrading GCC, get the following definitions from config/<cpu>/t-*
X #
X-
X-.if ${TARGET_ARCH} == "alpha"
X-#	from config/alpha/t-alpha
X-LIB2FUNCS_EXTRA = qrnnd.asm
X-.endif
X-
X .if ${TARGET_ARCH} == "arm"
X #	from config/arm/t-strongarm-elf
X CFLAGS+=	-Dinhibit_libc -fno-inline
X LIB1ASMSRC =	lib1funcs.asm
X-LIB1ASMFUNCS =	_dvmd_tls _bb_init_func
X-OBJS+=	dp-bit.o fp-bit.o
X-# We want fine grained libraries, so use the new code to build the
X-# floating point emulation libraries.
X-XXX fix this: NEED_FP_EMULATION set to "yes" with different rules per platform
X+LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
X+# Not now
X+#LIB1ASMFUNCS =  _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func
X+#LIB1ASMFUNCS+=	_call_via_rX _interwork_call_via_rX \
X+#	_lshrdi3 _ashrdi3 _ashldi3 \
X+#	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
X+#	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
X+#	_fixsfsi _fixunssfsi _floatdidf _floatdisf
X .endif
X 
X .if ${TARGET_ARCH} == "ia64"
X #	from config/ia64/t-ia64
X-LIB1ASMSRC    = lib1funcs.asm
X-LIB1ASMFUNCS  = __divxf3 __divdf3 __divsf3 \
X-        __divdi3 __moddi3 __udivdi3 __umoddi3 \
X-        __divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
X-        __nonlocal_goto __restore_stack_nonlocal __trampoline __compat
X-LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c gthr-gnat.c
X+LIB1ASMSRC   = lib1funcs.asm
X+LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \
X+	__divdi3 __moddi3 __udivdi3 __umoddi3 \
X+	__divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
X+	__nonlocal_goto __restore_stack_nonlocal __trampoline \
X+	_fixtfdi _fixunstfdi _floatditf
X+LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c
X .endif
X 
X .if ${TARGET_ARCH} == "powerpc"
X #	from config/rs6000/t-ppccomm
X-LIB2FUNCS_EXTRA = tramp.asm
X-# This one can't end up in shared libgcc
X+LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c
X LIB2FUNCS_STATIC_EXTRA = eabi.asm
X-# We want fine grained libraries, so use the new code to build the
X-# floating point emulation libraries.
X-OBJS+=	dp-bit.o fp-bit.o
X .endif
X 
X .if ${TARGET_ARCH} == "sparc64"
X #	from config/sparc/t-elf
X-# We want fine grained libraries, so use the new code to build the
X-# floating point emulation libraries.
X-LIB1ASMSRC = lb1spc.asm
X+LIB1ASMSRC =   lb1spc.asm
X LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
X-OBJS+=	dp-bit.o fp-bit.o
X .endif
X 
X-dp-bit.o: config/fp-bit.c
X-	${XCC} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-dp-bit.So: config/fp-bit.c
X-	${XCC} ${PICFLAG} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-dp-bit.po: config/fp-bit.c
X-	${XCC} -p -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-fp-bit.o: config/fp-bit.c
X-	${XCC} -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-fp-bit.So: config/fp-bit.c
X-	${XCC} ${PICFLAG} -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X-fp-bit.po: config/fp-bit.c
X-	${XCC} -p -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*}
X-
X #-----------------------------------------------------------------------
X 
X # Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are
X@@ -163,64 +132,194 @@
X .endfor
X .endif
X 
X-ASM_T=		${LIB1ASMFUNCS:S/$/.o/}
X-ASM_P=		${LIB1ASMFUNCS:S/$/.po/}
X-ASM_S=		${LIB1ASMFUNCS:S/$/.So/}
X-
X-SYMS=		${LIB2FUNCS}		\
X-		${LIB2_DIVMOD_FUNCS}
X-.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
X-SYMS+=		${FPBIT_FUNCS} ${DPBIT_FUNCS}
X-.endif
X-SYMS_ST=	${LIB2FUNCS_ST}		\
X-		${LIB2ADD_ST}
X-OBJS+=		${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/}
X-OBJS_T=		${SYMS:S/$/.o/}  ${SYMS_ST:S/$/.o/}
X-OBJS_P=		${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/}
X-OBJS_S=		${SYMS:S/$/.So/}
X-STATICOBJS=	${SYMS_ST:S/$/.o/}
X-SRCS=		${LIB2ADD} ${LIB2ADDEH}
X-
X-COMMONHDRS=	tm.h tconfig.h
X-SRCS+=		${COMMONHDRS}
X-CLEANFILES+=	${COMMONHDRS}
X+COMMONHDRS=	tm.h tconfig.h options.h unwind.h gthr-default.h
X 
X-${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X+#-----------------------------------------------------------------------
X+#
X+# Helpful shortcuts for compiler invocations.
X+#
X+HIDE =  -fvisibility=hidden -DHIDE_EXPORTS
X+CC_T =	${CC} -c ${CFLAGS} ${HIDE} -fPIC
X+CC_P =	${CC} -c ${CFLAGS} ${HIDE} -p -fPIC
X+CC_S =	${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED
X 
X-${OBJS} beforedepend: ${COMMONHDRS}
X+#-----------------------------------------------------------------------
X+#
X+# Functions from libgcc2.c
X+#
X+STD_CFLAGS =
X+DIV_CFLAGS =	-fexceptions -fnon-call-exceptions
X 
X-${OBJS_T}: libgcc2.c
X-	${XCC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+STD_FUNCS =	${LIB2FUNCS}
X+DIV_FUNCS =	${LIB2_DIVMOD_FUNCS}
X 
X-.if !defined(NO_PIC)
X-${OBJS_S}: libgcc2.c
X-	${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X-.endif
X+STD_CFILE =	libgcc2.c
X+DIV_CFILE =	libgcc2.c
X 
X-.if ${MK_PROFILE} != "no"
X-${OBJS_P}: libgcc2.c
X-	${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+OBJ_GRPS =	STD DIV
X+
X+#-----------------------------------------------------------------------
X+#
X+# Floating point emulation functions
X+#
X+.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "powerpc" || \
X+    ${TARGET_ARCH} == "sparc64"
X+
X+FPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DFLOAT
X+DPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES
X+
X+FPBIT_CFILE =	config/fp-bit.c
X+DPBIT_CFILE =	config/fp-bit.c
X+
X+OBJ_GRPS +=	FPBIT DPBIT
X .endif
X 
X+#-----------------------------------------------------------------------
X+#
X+# Generic build rules for object groups defined above
X+#
X+.for T in ${OBJ_GRPS}
X+${T}_OBJS_T =	${${T}_FUNCS:S/$/.o/}
X+${T}_OBJS_P =	${${T}_FUNCS:S/$/.po/}
X+${T}_OBJS_S =	${${T}_FUNCS:S/$/.So/}
X+OBJS +=		${${T}_FUNCS:S/$/.o/}
X+
X+${${T}_OBJS_T}: ${${T}_CFILE} ${COMMONHDRS}
X+	${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+${${T}_OBJS_P}: ${${T}_CFILE} ${COMMONHDRS}
X+	${CC_P} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+${${T}_OBJS_S}: ${${T}_CFILE} ${COMMONHDRS}
X+	${CC_S} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+.endfor
X+
X+#-----------------------------------------------------------------------
X+#
X+# Objects that should be in static library only.
X+#
X+#SYMS_ST =	${LIB2FUNCS_ST}	${LIB2ADD_ST}
X+STAT_OBJS_T = 	${SYMS_ST:S/$/.o/}
X+STAT_OBJS_P = 	${SYMS_ST:S/$/.po/}
X+STATICOBJS  =	${SYMS_ST:S/$/.o/}
X+
X+${STAT_OBJS_T}:	${STD_CFILE} ${COMMONHDRS}
X+	${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+${STAT_OBJS_P}:	${STD_CFILE} ${COMMONHDRS}
X+	${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X+
X+#-----------------------------------------------------------------------
X+#
X+# Assembler files.
X+#
X .if defined(LIB1ASMSRC)
X-.for _lib1asmsrc in ${LIB1ASMSRC}
X-${ASM_T}: ${_lib1asmsrc}
X-	${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
X+ASM_T =		${LIB1ASMFUNCS:S/$/.o/}
X+ASM_P =		${LIB1ASMFUNCS:S/$/.po/}
X+ASM_S =		${LIB1ASMFUNCS:S/$/.So/}
X+ASM_V =		${LIB1ASMFUNCS:S/$/.vis/}
X+OBJS +=		${LIB1ASMFUNCS:S/$/.o/}
X+
X+${ASM_T}: ${LIB1ASMSRC} ${.PREFIX}.vis
X+	${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
X+	    -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis}
X+${ASM_P}: ${LIB1ASMSRC} ${.PREFIX}.vis
X+	${CC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
X+	    -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis}
X+${ASM_S}: ${LIB1ASMSRC}
X+	${CC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \
X 	    -o ${.TARGET} ${.ALLSRC:N*.h}
X+${ASM_V}: ${LIB1ASMSRC}
X+	${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
X+	    -o ${.PREFIX}.vo ${.ALLSRC:N*.h}
X+	( nm -pg ${.PREFIX}.vo | \
X+		awk 'NF == 3 && $$2 !~ /^[UN]$$/ { print "\t.hidden ", $$3 }'\
X+	) > ${.TARGET}
X 
X-.if !defined(NO_PIC)
X-${ASM_S}: ${_lib1asmsrc}
X-	${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \
X-	    -o ${.TARGET} ${.ALLSRC:N*.h}
X+CLEANFILES += ${ASM_V} ${ASM_V:R:S/$/.vo/}
X .endif
X 
X+#-----------------------------------------------------------------------
X+#
X+# Exception handling / unwinding support.
X+#
X+EH_OBJS_T = ${LIB2ADDEHSTATIC:R:S/$/.o/}
X+EH_OBJS_P = ${LIB2ADDEHSTATIC:R:S/$/.po/}
X+EH_OBJS_S = ${LIB2ADDEHSHARED:R:S/$/.So/}
X+EH_CFLAGS = -fexceptions -D__GLIBC__=3 -DElfW=__ElfN
X+SOBJS    += ${EH_OBJS_S}
X+
X+.for _src in ${LIB2ADDEHSTATIC}
X+${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS}
X+	${CC_T} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
X+${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS}
X+	${CC_P} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
X+.endfor
X+.for _src in ${LIB2ADDEHSHARED}
X+${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS}
X+	${CC_S} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
X+.endfor
X+
X+
X+#-----------------------------------------------------------------------
X+#
X+# Generated headers
X+#
X+${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X+	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X+
X+CLEANFILES += ${COMMONHDRS}
X+CLEANFILES += cs-*.h option*
X+
X+#-----------------------------------------------------------------------
X+#
X+# Build additional static libgcc_eh[_p].a librarries.
X+#
X+SHLIB_MKMAP      = ${GCCDIR}/mkmap-symver.awk
X+SHLIB_MKMAP_OPTS =
X+SHLIB_MAPFILES   = ${GCCDIR}/libgcc-std.ver
X+VERSION_MAP      = libgcc.map
X+
X+libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS} ${OBJS:R:S/$/.So/}
X+	(  nm -pg ${SOBJS};echo %% ; \
X+	  cat ${SHLIB_MAPFILES} \
X+	    | sed -e '/^[   ]*#/d' \
X+	          -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' \
X+	    | ${CC} ${CFLAGS} -E -xassembler-with-cpp -; \
X+	) | awk -f ${SHLIB_MKMAP} ${SHLIB_MKMAP_OPTS} > ${.TARGET}
X+
X+CLEANFILES +=	libgcc.map
X+
X+#-----------------------------------------------------------------------
X+#
X+# Build additional static libgcc_eh[_p].a librarries.
X+#
X+lib${LIB}_eh.a:	${EH_OBJS_T}
X+	@${ECHO} building static ${LIB}_eh library
X+	@rm -f ${.TARGET}
X+	@${AR} cq ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
X+	${RANLIB} ${.TARGET}
X+
X+all:	lib${LIB}_eh.a
X+
X .if ${MK_PROFILE} != "no"
X-${ASM_P}: ${_lib1asmsrc}
X-	${XCC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
X-	    -o ${.TARGET} ${.ALLSRC:N*.h}
X+lib${LIB}_eh_p.a:	${EH_OBJS_P}
X+	@${ECHO} building profiled ${LIB}_eh library
X+	@rm -f ${.TARGET}
X+	@${AR} cq ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
X+	${RANLIB} ${.TARGET}
X+all:	lib${LIB}_eh_p.a
X .endif
X-.endfor
X+
X+_libinstall: _lib-eh-install
X+
X+_lib-eh-install:
X+	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
X+		${_INSTALLFLAGS} lib${LIB}_eh.a ${DESTDIR}${LIBDIR}
X+.if ${MK_PROFILE} != "no"
X+	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
X+		${_INSTALLFLAGS} lib${LIB}_eh_p.a ${DESTDIR}${LIBDIR}
X .endif
X 
X+CLEANFILES+=	lib${LIB}_eh.a lib${LIB}_eh_p.a ${EH_OBJS_T} ${EH_OBJS_P}
X+
X .include <bsd.lib.mk>
X+
X+.SUFFIXES: .vis .vo
XIndex: gnu/lib/libgcov/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libgcov/Makefile,v
Xretrieving revision 1.4
Xdiff -u -r1.4 Makefile
X--- gnu/lib/libgcov/Makefile	18 Mar 2006 21:37:04 -0000	1.4
X+++ gnu/lib/libgcov/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -5,6 +5,7 @@
X .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
X 
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
X 
X LIB=		gcov
X@@ -12,18 +13,22 @@
X CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
X CFLAGS+=	-D_PTHREADS -DGTHREAD_USE_WEAK
X CFLAGS+=	-I${.CURDIR}/../../usr.bin/cc/cc_tools \
X-		-I${GCCDIR}/config -I${GCCDIR} -I.
X+		-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I.
X #
X # Library members defined in libgcov.c.
X-SYMS=		_gcov _gcov_merge_add _gcov_merge_delta _gcov_merge_single
X+# Defined in libgcov.c, included only in gcov library
X+SYMS = _gcov _gcov_merge_add _gcov_merge_single _gcov_merge_delta \
X+    _gcov_fork _gcov_execl _gcov_execlp _gcov_execle \
X+    _gcov_execv _gcov_execvp _gcov_execve \
X+    _gcov_interval_profiler _gcov_pow2_profiler _gcov_one_value_profiler
X 
X OBJS=		${SYMS:S/$/.o/}
X OBJS_T=		${SYMS:S/$/.o/}
X OBJS_P=		${SYMS:S/$/.po/}
X OBJS_S=		${SYMS:S/$/.So/}
X 
X-COMMONHDRS=	tm.h tconfig.h gcov-iov.h
X-CLEANFILES+=	${COMMONHDRS}
X+COMMONHDRS=	tm.h tconfig.h gcov-iov.h options.h 
X+CLEANFILES+=	${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist
X 
X ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X@@ -39,7 +44,7 @@
X .endif
X 
X .if ${MK_PROFILE} != "no"
X-${OBJS_P}: libgcc2.c
X+${OBJS_P}: libgcov.c
X 	${CC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
X .endif
X 
XIndex: gnu/lib/libobjc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libobjc/Makefile,v
Xretrieving revision 1.29
Xdiff -u -r1.29 Makefile
X--- gnu/lib/libobjc/Makefile	16 Mar 2006 15:18:15 -0000	1.29
X+++ gnu/lib/libobjc/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -2,39 +2,44 @@
X 
X OBJCDIR=${.CURDIR}/../../../contrib/libobjc
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X 
X .PATH: ${OBJCDIR}/objc ${OBJCDIR}
X 
X LIB=		objc
X SHLIB_MAJOR=	2
X 
X-SRCS=   archive.c class.c encoding.c gc.c hash.c init.c misc.c \
X-	nil_method.c objects.c sarray.c selector.c sendmsg.c \
X-	thr.c thr-posix.c \
X-	NXConstStr.m Object.m Protocol.m linking.m
X+SRCS=	archive.c class.c encoding.c gc.c hash.c init.c linking.m misc.c \
X+	nil_method.c NXConstStr.m Object.m objects.c Protocol.m sarray.c \
X+	selector.c sendmsg.c thr.c thr-objc.c exception.c hash_compat.c
X 
X INCS=	encoding.h hash.h objc-api.h objc-list.h objc.h runtime.h \
X 	sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h
X INCSDIR=${INCLUDEDIR}/objc
X 
X-OBJCFLAGS= -fgnu-runtime ${CFLAGS}
X CFLAGS+= -DHAVE_GTHR_DEFAULT -DIN_GCC -DIN_TARGET_LIBS
X CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools
X-CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} 
X+CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR}
X CFLAGS+= -I${GCCDIR}/config -I${GCCDIR}
X-CFLAGS+= -frandom-seed=RepeatabilityConsideredGood
X-
X-GENHDRS=	runtime-info.h tconfig.h tm.h
X-CLEANFILES+=	${GENHDRS}
X-SRCS+=		${GENHDRS}
X+CFLAGS+= -I${GCCLIB}/include
X+CFLAGS+= -fexceptions -frandom-seed=RepeatabilityConsideredGood
X+OBJCFLAGS= -fgnu-runtime ${CFLAGS}
X 
X-${OBJS}: ${GENHDRS}
X+GENHDRS= runtime-info.h
X 
X runtime-info.h:
X 	`${CC} --print-prog-name=cc1obj` -print-objc-runtime-info \
X 	    < /dev/null > ${.TARGET}
X 
X-tconfig.h tm.h : ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X+.for H in tconfig.h tm.h config.h options.h gthr-default.h unwind.h
X+$H: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
X 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
X+GENHDRS+=	$H
X+.endfor
X+
X+CLEANFILES+=	${GENHDRS} cs-* optionlist
X+SRCS+=		${GENHDRS}
X+
X+${OBJS}: ${GENHDRS}
X 
X .include <bsd.lib.mk>
XIndex: gnu/lib/libstdc++/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libstdc++/Makefile,v
Xretrieving revision 1.58
Xdiff -u -r1.58 Makefile
X--- gnu/lib/libstdc++/Makefile	5 Oct 2006 20:55:37 -0000	1.58
X+++ gnu/lib/libstdc++/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,21 +1,23 @@
X # $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.58 2006/10/05 20:55:37 obrien Exp $
X 
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
X SUPDIR=	${SRCDIR}/libsupc++
X 
X .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \
X-       ${SRCDIR}/config/locale/generic ${SRCDIR}/include \
X-       ${SUPDIR} ${GCCDIR}
X+       ${SRCDIR}/config/locale/darwin ${SRCDIR}/config/locale/generic \
X+       ${SRCDIR}/include ${SUPDIR} ${GCCDIR} ${GCCLIB}/libiberty
X 
X LIB=		stdc++
X-SHLIB_MAJOR=	5
X+SHLIB_MAJOR=	6
X 
X CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
X .if ${MACHINE_ARCH} == "arm"
X CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
X .endif
X CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
X+CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR}/include -I.
X CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
X CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
X 		-Wno-deprecated
X@@ -24,15 +26,16 @@
X LDADD=		-lm
X 
X # libstdc++ sources
X-SRCS+= 	allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc debug_list.cc \
X+SRCS+=  bitmap_allocator.cc pool_allocator.cc mt_allocator.cc codecvt.cc \
X+	compatibility.cc complex_io.cc ctype.cc debug.cc debug_list.cc \
X 	functexcept.cc globals_locale.cc globals_io.cc ios.cc ios_failure.cc \
X-	ios_init.cc ios_locale.cc limits.cc debug_list.cc list.cc locale.cc \
X-	locale_init.cc locale_facets.cc localename.cc stdexcept.cc \
X-	strstream.cc tree.cc allocator-inst.cc concept-inst.cc fstream-inst.cc \
X-	ext-inst.cc io-inst.cc istream-inst.cc locale-inst.cc \
X+	ios_init.cc ios_locale.cc limits.cc list.cc locale.cc locale_init.cc \
X+	locale_facets.cc localename.cc stdexcept.cc strstream.cc tree.cc \
X+	allocator-inst.cc concept-inst.cc fstream-inst.cc ext-inst.cc \
X+	ios-inst.cc iostream-inst.cc istream-inst.cc istream.cc locale-inst.cc \
X 	locale-misc-inst.cc misc-inst.cc ostream-inst.cc sstream-inst.cc \
X-	streambuf-inst.cc string-inst.cc valarray-inst.cc wlocale-inst.cc \
X-	wstring-inst.cc 
X+	streambuf-inst.cc streambuf.cc string-inst.cc valarray-inst.cc \
X+	wlocale-inst.cc wstring-inst.cc
X 
X # target sources
X SRCS+=  atomicity.cc codecvt_members.cc collate_members.cc ctype_members.cc \
X@@ -43,11 +46,11 @@
X SRCS+=  basic_file_stdio.cc c_locale.cc
X 
X # C parts of math
X-SRCS+=	signbitf.c signbitl.c stubs.c
X+SRCS+=	stubs.c
X 
X # Embedded copy of libsupc++
X-SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc \
X-	eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc \
X+SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \
X+	eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \
X 	eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \
X 	eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \
X 	new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \
X@@ -79,8 +82,8 @@
X CLEANFILES+=	atomicity.cc
X 
X INCSGROUPS=	BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \
X-		TARGETHDRS THRHDRS DEBUGHDRS
X-CXXINCLUDEDIR=	${INCLUDEDIR}/c++/3.4
X+		TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS
X+CXXINCLUDEDIR=	${INCLUDEDIR}/c++/4.1
X 
X STDHDRS=	std_algorithm.h std_bitset.h std_complex.h std_deque.h \
X 		std_fstream.h std_functional.h std_iomanip.h std_ios.h \
X@@ -109,8 +112,8 @@
X 		stl_iterator_base_types.h stl_list.h stl_map.h stl_multimap.h \
X 		stl_multiset.h stl_numeric.h stl_pair.h stl_queue.h \
X 		stl_raw_storage_iter.h stl_relops.h stl_set.h stl_stack.h \
X-		stl_tempbuf.h stl_threads.h stl_tree.h stl_uninitialized.h \
X-		stl_vector.h streambuf.tcc stringfwd.h type_traits.h \
X+		stl_tempbuf.h stl_tree.h stl_uninitialized.h \
X+		stl_vector.h streambuf.tcc stringfwd.h \
X 		valarray_array.h valarray_array.tcc valarray_before.h \
X 		valarray_after.h vector.tcc
X BITSHDRS:=	${BITSHDRS:S;^;${SRCDIR}/include/bits/;}
X@@ -125,15 +128,27 @@
X BKWHDRS:=	${BKWHDRS:S;^;${SRCDIR}/include/backward/;}
X BKWHDRSDIR=	${CXXINCLUDEDIR}/backward
X 
X-EXTHDRS=	algorithm bitmap_allocator.h debug_allocator.h \
X-		enc_filebuf.h stdio_filebuf.h stdio_sync_filebuf.h functional \
X-		hash_map hash_set iterator malloc_allocator.h memory \
X-		mt_allocator.h new_allocator.h numeric pod_char_traits.h \
X-		pool_allocator.h rb_tree rope ropeimpl.h slist hash_fun.h \
X-		hashtable.h
X+EXTHDRS=	algorithm array_allocator.h bitmap_allocator.h \
X+		codecvt_specializations.h debug_allocator.h functional \
X+		hash_fun.h hash_map hash_set hashtable.h iterator \
X+		malloc_allocator.h memory mt_allocator.h new_allocator.h \
X+		numeric pod_char_traits.h pool_allocator.h rb_tree rope \
X+		rc_string_base.h ropeimpl.h slist stdio_filebuf.h \
X+		stdio_sync_filebuf.h sso_string_base.h typelist.h vstring.h \
X+		vstring.tcc vstring_fwd.h vstring_util.h
X+
X EXTHDRS:=	${EXTHDRS:S;^;${SRCDIR}/include/ext/;}
X EXTHDRSDIR=	${CXXINCLUDEDIR}/ext
X 
X+TR1HDRS=	array bind_iterate.h bind_repeat.h boost_shared_ptr.h \
X+		functional functional_iterate.h hashtable memory mu_iterate.h \
X+		ref_fwd.h ref_wrap_iterate.h repeat.h tuple tuple_iterate.h \
X+		type_traits type_traits_fwd.h unordered_map unordered_set \
X+		utility
X+
X+TR1HDRS:=	${TR1HDRS:S;^;${SRCDIR}/include/tr1/;}
X+TR1HDRSDIR=	${CXXINCLUDEDIR}/tr1
X+
X # This is the common subset of files that all three "C" header models use.
X BASEHDRS=	std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \
X 		std_ciso646.h std_climits.h std_clocale.h std_cmath.h \
X@@ -150,21 +165,22 @@
X BASEXHDRS=	${SRCDIR}/include/c_std/cmath.tcc
X BASEXHDRSDIR=	${CXXINCLUDEDIR}/bits
X 
X-DEBUGHDRS=	bitset debug.h deque formatter.h hash_map hash_map.h \
X-		hash_multimap.h hash_multiset.h hash_set hash_set.h list \
X-		map map.h multimap.h multiset.h safe_base.h safe_iterator.h \
X-		safe_iterator.tcc safe_sequence.h set set.h string vector
X+DEBUGHDRS=	bitset debug.h deque formatter.h functions.h hash_map \
X+		hash_map.h hash_multimap.h hash_multiset.h hash_set hash_set.h \
X+		list macros.h map map.h multimap.h multiset.h safe_base.h \
X+		safe_iterator.h safe_iterator.tcc safe_sequence.h set set.h \
X+		string vector
X DEBUGHDRS:=	${DEBUGHDRS:S;^;${SRCDIR}/include/debug/;}
X DEBUGHDRSDIR=	${CXXINCLUDEDIR}/debug
X 
X-TARGETHDRS=	allocator/new_allocator_base.h \
X+TARGETHDRS=	abi/compatibility.h \
X+		allocator/new_allocator_base.h \
X 		io/basic_file_stdio.h \
X 		io/c_io_stdio.h \
X 		locale/generic/c_locale.h \
X 		locale/generic/c++locale_internal.h \
X 		locale/generic/messages_members.h \
X 		locale/generic/time_members.h \
X-		locale/generic/codecvt_specializations.h \
X 		os/bsd/freebsd/ctype_base.h \
X 		os/bsd/freebsd/ctype_inline.h \
X 		os/bsd/freebsd/ctype_noninline.h \
X@@ -177,7 +193,7 @@
X TARGETHDRSNAME_new_allocator_base.h= c++allocator.h
X TARGETHDRSDIR=	${CXXINCLUDEDIR}/bits
X 
X-MARCHHDRS=	atomic_word.h
X+MARCHHDRS=	atomic_word.h cpu_defines.h cxxabi_tweaks.h
X .for h in ${MARCHHDRS}
X .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/${h})
X TARGETHDRS+=	${SRCDIR}/config/cpu/${MARCHDIR}/${h}
X@@ -186,12 +202,13 @@
X .endif
X .endfor
X 
X-THRHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-default.h
X+THRHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-tpf.h gthr-default.h
X THRHDRSDIR=	${CXXINCLUDEDIR}/bits
X uppercase =	[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
X 
X gthr.h: ${GCCDIR}/gthr.h
X-	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
X+	sed -e '/^#pragma/b' \
X+	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
X 	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
X 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
X 	    < ${.ALLSRC} > ${.TARGET}
X@@ -208,6 +225,13 @@
X 	    -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \
X 	    < ${.ALLSRC} > ${.TARGET}
X 
X+gthr-tpf.h: ${GCCDIR}/gthr-posix.h
X+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
X+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
X+	    -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \
X+	    -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \
X+	    < ${.ALLSRC} > ${.TARGET}
X+
X gthr-default.h: ${GCCDIR}/gthr-posix.h
X 	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
X 	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
X@@ -218,6 +242,12 @@
X 
X CLEANFILES+=	${THRHDRS}
X 
X+unwind.h: ${GCCDIR}/unwind-generic.h
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+SRCS+=		unwind.h
X+CLEANFILES+=	unwind.h
X+
X c++config.h: ${.CURDIR}/config.h ${SRCDIR}/include/bits/c++config
X 	cat ${SRCDIR}/include/bits/c++config > ${.TARGET} && \
X 	sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
X@@ -228,4 +258,13 @@
X 	echo "#endif // _CXXCONFIG_" >> ${.TARGET}
X CLEANFILES+=	c++config.h
X 
X+# Symbol versioning.
X+
X+VERSION_MAP=  	libstdc++.map
X+
X+${VERSION_MAP}: ${SRCDIR}/config/linker-map.gnu
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+CLEANFILES+=	${VERSION_MAP}
X+
X .include <bsd.lib.mk>
XIndex: gnu/lib/libstdc++/config.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libstdc++/config.h,v
Xretrieving revision 1.14
Xdiff -u -r1.14 config.h
X--- gnu/lib/libstdc++/config.h	22 Sep 2006 15:08:07 -0000	1.14
X+++ gnu/lib/libstdc++/config.h	5 Apr 2007 05:22:49 -0000
X@@ -1,180 +1,10 @@
X-/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.14 2006/09/22 15:08:07 kan Exp $ */
X+/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.14 2006/09/22 15:08:07 kan Exp$ */
X #ifndef __ISO_C_VISIBLE
X #include <sys/cdefs.h>
X #endif
X 
X /* config.h.  Generated by configure.  */
X /* config.h.in.  Generated from configure.ac by autoheader.  */
X-// acconfig.h symbols and macros for libstdc++ v3 -*- C++ -*-
X-
X-// Defines libstdc++ version.
X-/* #undef PACKAGE */
X-/* #undef VERSION */
X-
X-// Needed for gettext.
X-/* #undef ENABLE_NLS */
X-/* #undef HAVE_CATGETS */
X-/* #undef HAVE_GETTEXT */
X-/* #undef HAVE_STPCPY */
X-
X-// Include I/O support for 'long long' and 'unsigned long long'.
X-#define _GLIBCXX_USE_LONG_LONG 1
X-
X-// Include support for 'long double'.
X-/* #undef _GLIBCXX_USE_LONG_DOUBLE */
X-
X-// Define if C99 math functions (like fpclassify) should be exposed.
X-#define _GLIBCXX_USE_C99_MATH 1
X-
X-// Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
X-#define _GLIBCXX_USE_C99 1
X-
X-// Define if code specialized for wchar_t should be used.
X-#define _GLIBCXX_USE_WCHAR_T 1
X-
X-// Define if using setrlimit to limit memory usage during 'make check'.
X-#define _GLIBCXX_MEM_LIMITS 1
X-
X-// Define to use concept checking code from the boost libraries.
X-/* #undef _GLIBCXX_CONCEPT_CHECKS */
X-
X-// Define to use symbol versioning in the shared library.
X-/* #undef _GLIBCXX_SYMVER */
X-
X-// Define symbol versioning in assember directives. If symbol
X-// versioning is beigng used, and the assembler supports this kind of
X-// thing, then use it.
X-// NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4.
X-#if _GLIBCXX_SYMVER
X-  #define _GLIBCXX_ASM_SYMVER(cur, old, version) \
X-   asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version);
X-#else
X-  #define _GLIBCXX_ASM_SYMVER(cur, old, version)
X-#endif
X-
X-// Define if LFS support is available.
X-/* #undef _GLIBCXX_USE_LFS */
X-
X-// Define if a fully dynamic basic_string is wanted.
X-/* #undef _GLIBCXX_FULLY_DYNAMIC_STRING */
X-
X-// Define if NLS translations are to be used.
X-/* #undef _GLIBCXX_USE_NLS */
X-
X-// Define if gthr-default.h exists (meaning that threading support is enabled).
X-#define HAVE_GTHR_DEFAULT 1
X-
X-// Define if the atan2f function exists.
X-#define HAVE_ATAN2F 1
X-
X-// Define if the atan2l function exists.
X-/* #undef HAVE_ATAN2L */
X-
X-// Define if the tanl function exists.
X-/* #undef HAVE_TANL */
X-
X-// Define if the copysignf function exists.
X-#define HAVE_COPYSIGNF 1
X-
X-// Define if getpagesize exists.
X-#define HAVE_GETPAGESIZE 1
X-
X-// Define if setenv exists.
X-#define HAVE_SETENV 1
X-
X-// Define if sigsetjmp exists.
X-#define HAVE_SIGSETJMP 1
X-
X-// Define if mbstate_t exists in wchar.h.
X-#define HAVE_MBSTATE_T 1
X-
X-// Define if you have the modff function.
X-#define HAVE_MODFF 1
X-
X-// Define if you have the modfl function.
X-/* #undef HAVE_MODFL */
X-
X-// Define if you have the expf function.
X-#define HAVE_EXPF 1
X-
X-// Define if you have the expl function.
X-/* #undef HAVE_EXPL */
X-
X-// Define if you have the hypot function.
X-#define HAVE_HYPOT 1
X-
X-// Define if you have the hypotf function.
X-#define HAVE_HYPOTF 1
X-
X-// Define if you have the hypotl function.
X-/* #undef HAVE_HYPOTL */
X-
X-// Define if the compiler/host combination has __builtin_abs
X-#define HAVE___BUILTIN_ABS 1
X-
X-// Define if the compiler/host combination has __builtin_labs
X-#define HAVE___BUILTIN_LABS 1
X-
X-// Define if the compiler/host combination has __builtin_cos
X-#define HAVE___BUILTIN_COS 1
X-
X-// Define if the compiler/host combination has __builtin_cosf
X-#define HAVE___BUILTIN_COSF 1
X-
X-// Define if the compiler/host combination has __builtin_cosl
X-#define HAVE___BUILTIN_COSL 1
X-
X-// Define if the compiler/host combination has __builtin_fabs
X-#define HAVE___BUILTIN_FABS 1
X-
X-// Define if the compiler/host combination has __builtin_fabsf
X-#define HAVE___BUILTIN_FABSF 1
X-
X-// Define if the compiler/host combination has __builtin_fabsl
X-#define HAVE___BUILTIN_FABSL 1
X-
X-// Define if the compiler/host combination has __builtin_sin
X-#define HAVE___BUILTIN_SIN 1
X-
X-// Define if the compiler/host combination has __builtin_sinf
X-#define HAVE___BUILTIN_SINF 1
X-
X-// Define if the compiler/host combination has __builtin_sinl
X-#define HAVE___BUILTIN_SINL 1
X-
X-// Define if the compiler/host combination has __builtin_sqrt
X-#define HAVE___BUILTIN_SQRT 1
X-
X-// Define if the compiler/host combination has __builtin_sqrtf
X-#define HAVE___BUILTIN_SQRTF 1
X-
X-// Define if the compiler/host combination has __builtin_sqrtl
X-#define HAVE___BUILTIN_SQRTL 1
X-
X-// Define if poll is available in <poll.h>.
X-#define HAVE_POLL 1
X-
X-// Define if S_ISREG (Posix) is available in <sys/stat.h>.
X-#define HAVE_S_ISREG 1
X-
X-// Define if S_IFREG is available in <sys/stat.h>.
X-/* #undef HAVE_S_IFREG */
X-
X-// Define if writev is available in <sys/uio.h>.
X-#define HAVE_WRITEV 1
X-
X-// Define if int64_t is available in <stdint.h>.
X-#define HAVE_INT64_T 1
X-
X-// Define if LC_MESSAGES is available in <locale.h>.
X-#define HAVE_LC_MESSAGES 1
X-
X-// Define if <float.h> exists.
X-#define HAVE_FLOAT_H 1
X-
X-// Define if modf is present in <math.h>
X-/* #undef HAVE_MODF */
X-
X 
X /* Define to 1 if you have the `acosf' function. */
X #define HAVE_ACOSF 1
X@@ -200,15 +30,15 @@
X /* Define to 1 if you have the `atanl' function. */
X /* #undef HAVE_ATANL */
X 
X-/* Define to 1 if you have the `btowc' function. */
X-#define HAVE_BTOWC 1
X-
X /* Define to 1 if you have the `ceilf' function. */
X #define HAVE_CEILF 1
X 
X /* Define to 1 if you have the `ceill' function. */
X #define HAVE_CEILL 1
X 
X+/* Define to 1 if you have the <complex.h> header file. */
X+#define HAVE_COMPLEX_H 1
X+
X /* Define to 1 if you have the `copysign' function. */
X #define HAVE_COPYSIGN 1
X 
X@@ -245,12 +75,6 @@
X /* Define to 1 if you have the `fabsl' function. */
X #define HAVE_FABSL 1
X 
X-/* Define to 1 if you have the `fgetwc' function. */
X-#define HAVE_FGETWC 1
X-
X-/* Define to 1 if you have the `fgetws' function. */
X-#define HAVE_FGETWS 1
X-
X /* Define to 1 if you have the `finite' function. */
X #define HAVE_FINITE 1
X 
X@@ -278,12 +102,6 @@
X /* Define to 1 if you have the `fpclass' function. */
X /* #undef HAVE_FPCLASS */
X 
X-/* Define to 1 if you have the `fputwc' function. */
X-#define HAVE_FPUTWC 1
X-
X-/* Define to 1 if you have the `fputws' function. */
X-#define HAVE_FPUTWS 1
X-
X /* Define to 1 if you have the <fp.h> header file. */
X /* #undef HAVE_FP_H */
X 
X@@ -293,26 +111,15 @@
X /* Define to 1 if you have the `frexpl' function. */
X #define HAVE_FREXPL 1
X 
X-/* Define to 1 if you have the `fwide' function. */
X-#define HAVE_FWIDE 1
X-
X-/* Define to 1 if you have the `fwprintf' function. */
X-#define HAVE_FWPRINTF 1
X-
X-/* Define to 1 if you have the `fwscanf' function. */
X-#define HAVE_FWSCANF 1
X-
X /* Define to 1 if you have the <gconv.h> header file. */
X /* #undef HAVE_GCONV_H */
X 
X /* Define to 1 if you have the `getpagesize' function. */
X #define HAVE_GETPAGESIZE 1
X 
X-/* Define to 1 if you have the `getwc' function. */
X-#define HAVE_GETWC 1
X-
X-/* Define to 1 if you have the `getwchar' function. */
X-#define HAVE_GETWCHAR 1
X+/* Define if gthr-default.h exists (meaning that threading support is
X+   enabled). */
X+#define HAVE_GTHR_DEFAULT 1
X 
X /* Define to 1 if you have the `hypot' function. */
X #define HAVE_HYPOT 1
X@@ -324,17 +131,20 @@
X /* #undef HAVE_HYPOTL */
X 
X /* Define to 1 if you have the `iconv' function. */
X-#define HAVE_ICONV 1
X+/* #undef HAVE_ICONV */
X 
X /* Define to 1 if you have the `iconv_close' function. */
X-#define HAVE_ICONV_CLOSE 1
X+/* #undef HAVE_ICONV_CLOSE */
X 
X /* Define to 1 if you have the `iconv_open' function. */
X-#define HAVE_ICONV_OPEN 1
X+/* #undef HAVE_ICONV_OPEN */
X 
X /* Define to 1 if you have the <ieeefp.h> header file. */
X #define HAVE_IEEEFP_H 1
X 
X+/* Define if int64_t is available in <stdint.h>. */
X+#define HAVE_INT64_T 1
X+
X /* Define to 1 if you have the <inttypes.h> header file. */
X #define HAVE_INTTYPES_H 1
X 
X@@ -356,9 +166,12 @@
X /* Define to 1 if you have the `isnanl' function. */
X /* #undef HAVE_ISNANL */
X 
X-/* Define to 1 if you have the `iswblank' function. */
X+/* Defined if iswblank exists. */
X #define HAVE_ISWBLANK 1
X 
X+/* Define if LC_MESSAGES is available in <locale.h>. */
X+#define HAVE_LC_MESSAGES 1
X+
X /* Define to 1 if you have the `ldexpf' function. */
X #define HAVE_LDEXPF 1
X 
X@@ -407,17 +220,8 @@
X /* Define to 1 if you have the <machine/param.h> header file. */
X #define HAVE_MACHINE_PARAM_H 1
X 
X-/* Define to 1 if you have the `mbrlen' function. */
X-#define HAVE_MBRLEN 1
X-
X-/* Define to 1 if you have the `mbrtowc' function. */
X-#define HAVE_MBRTOWC 1
X-
X-/* Define to 1 if you have the `mbsinit' function. */
X-#define HAVE_MBSINIT 1
X-
X-/* Define to 1 if you have the `mbsrtowcs' function. */
X-#define HAVE_MBSRTOWCS 1
X+/* Define if mbstate_t exists in wchar.h. */
X+#define HAVE_MBSTATE_T 1
X 
X /* Define to 1 if you have the <memory.h> header file. */
X #define HAVE_MEMORY_H 1
X@@ -425,6 +229,9 @@
X /* Define to 1 if you have a working `mmap' system call. */
X #define HAVE_MMAP 1
X 
X+/* Define to 1 if you have the `modf' function. */
X+#define HAVE_MODF 1
X+
X /* Define to 1 if you have the `modff' function. */
X #define HAVE_MODFF 1
X 
X@@ -437,18 +244,15 @@
X /* Define to 1 if you have the `nl_langinfo' function. */
X #define HAVE_NL_LANGINFO 1
X 
X+/* Define if poll is available in <poll.h>. */
X+#define HAVE_POLL 1
X+
X /* Define to 1 if you have the `powf' function. */
X #define HAVE_POWF 1
X 
X /* Define to 1 if you have the `powl' function. */
X /* #undef HAVE_POWL */
X 
X-/* Define to 1 if you have the `putwc' function. */
X-#define HAVE_PUTWC 1
X-
X-/* Define to 1 if you have the `putwchar' function. */
X-#define HAVE_PUTWCHAR 1
X-
X /* Define to 1 if you have the `qfpclass' function. */
X /* #undef HAVE_QFPCLASS */
X 
X@@ -503,18 +307,15 @@
X /* Define to 1 if you have the `strtold' function. */
X #define HAVE_STRTOLD 1
X 
X-/* Define to 1 if you have the `swprintf' function. */
X-#define HAVE_SWPRINTF 1
X-
X-/* Define to 1 if you have the `swscanf' function. */
X-#define HAVE_SWSCANF 1
X-
X /* Define to 1 if you have the <sys/filio.h> header file. */
X #define HAVE_SYS_FILIO_H 1
X 
X /* Define to 1 if you have the <sys/ioctl.h> header file. */
X #define HAVE_SYS_IOCTL_H 1
X 
X+/* Define to 1 if you have the <sys/ipc.h> header file. */
X+#define HAVE_SYS_IPC_H 1
X+
X /* Define to 1 if you have the <sys/isa_defs.h> header file. */
X /* #undef HAVE_SYS_ISA_DEFS_H */
X 
X@@ -527,6 +328,9 @@
X /* Define to 1 if you have the <sys/resource.h> header file. */
X #define HAVE_SYS_RESOURCE_H 1
X 
X+/* Define to 1 if you have the <sys/sem.h> header file. */
X+#define HAVE_SYS_SEM_H 1
X+
X /* Define to 1 if you have the <sys/stat.h> header file. */
X #define HAVE_SYS_STAT_H 1
X 
X@@ -539,6 +343,12 @@
X /* Define to 1 if you have the <sys/uio.h> header file. */
X #define HAVE_SYS_UIO_H 1
X 
X+/* Define if S_IFREG is available in <sys/stat.h>. */
X+/* #undef HAVE_S_IFREG */
X+
X+/* Define if S_IFREG is available in <sys/stat.h>. */
X+#define HAVE_S_ISREG 1
X+
X /* Define to 1 if you have the `tanf' function. */
X #define HAVE_TANF 1
X 
X@@ -551,136 +361,38 @@
X /* Define to 1 if you have the `tanl' function. */
X /* #undef HAVE_TANL */
X 
X-/* Define to 1 if you have the `ungetwc' function. */
X-#define HAVE_UNGETWC 1
X+#if !defined(__sparc64__) && !defined(__arm__)
X+/* Define to 1 if the target supports thread-local storage. */
X+#define HAVE_TLS 1
X+#endif
X 
X /* Define to 1 if you have the <unistd.h> header file. */
X #define HAVE_UNISTD_H 1
X 
X-/* Define to 1 if you have the `vfwprintf' function. */
X-#define HAVE_VFWPRINTF 1
X-
X #if __ISO_C_VISIBLE >= 1999
X-/* Define to 1 if you have the `vfwscanf' function. */
X+/* Defined if vfwscanf exists. */
X #define HAVE_VFWSCANF 1
X-#endif
X-
X-/* Define to 1 if you have the `vswprintf' function. */
X-#define HAVE_VSWPRINTF 1
X 
X-#if __ISO_C_VISIBLE >= 1999
X-/* Define to 1 if you have the `vswscanf' function. */
X+/* Defined if vswscanf exists. */
X #define HAVE_VSWSCANF 1
X-#endif
X 
X-/* Define to 1 if you have the `vwprintf' function. */
X-#define HAVE_VWPRINTF 1
X-
X-#if __ISO_C_VISIBLE >= 1999
X-/* Define to 1 if you have the `vwscanf' function. */
X+/* Defined if vwscanf exists. */
X #define HAVE_VWSCANF 1
X-#endif
X+#endif /* __ISO_C_VISIBLE >= 1999 */
X 
X /* Define to 1 if you have the <wchar.h> header file. */
X #define HAVE_WCHAR_H 1
X 
X-/* Define to 1 if you have the `wcrtomb' function. */
X-#define HAVE_WCRTOMB 1
X-
X-/* Define to 1 if you have the `wcscat' function. */
X-#define HAVE_WCSCAT 1
X-
X-/* Define to 1 if you have the `wcschr' function. */
X-#define HAVE_WCSCHR 1
X-
X-/* Define to 1 if you have the `wcscmp' function. */
X-#define HAVE_WCSCMP 1
X-
X-/* Define to 1 if you have the `wcscoll' function. */
X-#define HAVE_WCSCOLL 1
X-
X-/* Define to 1 if you have the `wcscpy' function. */
X-#define HAVE_WCSCPY 1
X-
X-/* Define to 1 if you have the `wcscspn' function. */
X-#define HAVE_WCSCSPN 1
X-
X-/* Define to 1 if you have the `wcsftime' function. */
X-#define HAVE_WCSFTIME 1
X-
X-/* Define to 1 if you have the `wcslen' function. */
X-#define HAVE_WCSLEN 1
X-
X-/* Define to 1 if you have the `wcsncat' function. */
X-#define HAVE_WCSNCAT 1
X-
X-/* Define to 1 if you have the `wcsncmp' function. */
X-#define HAVE_WCSNCMP 1
X-
X-/* Define to 1 if you have the `wcsncpy' function. */
X-#define HAVE_WCSNCPY 1
X-
X-/* Define to 1 if you have the `wcspbrk' function. */
X-#define HAVE_WCSPBRK 1
X-
X-/* Define to 1 if you have the `wcsrchr' function. */
X-#define HAVE_WCSRCHR 1
X-
X-/* Define to 1 if you have the `wcsrtombs' function. */
X-#define HAVE_WCSRTOMBS 1
X-
X-/* Define to 1 if you have the `wcsspn' function. */
X-#define HAVE_WCSSPN 1
X-
X-/* Define to 1 if you have the `wcsstr' function. */
X-#define HAVE_WCSSTR 1
X-
X-/* Define to 1 if you have the `wcstod' function. */
X-#define HAVE_WCSTOD 1
X-
X #if __ISO_C_VISIBLE >= 1999
X-/* Define to 1 if you have the `wcstof' function. */
X+/* Defined if wcstof exists. */
X #define HAVE_WCSTOF 1
X-#endif
X-
X-/* Define to 1 if you have the `wcstok' function. */
X-#define HAVE_WCSTOK 1
X-
X-/* Define to 1 if you have the `wcstol' function. */
X-#define HAVE_WCSTOL 1
X-
X-/* Define to 1 if you have the `wcstoul' function. */
X-#define HAVE_WCSTOUL 1
X-
X-/* Define to 1 if you have the `wcsxfrm' function. */
X-#define HAVE_WCSXFRM 1
X-
X-/* Define to 1 if you have the `wctob' function. */
X-#define HAVE_WCTOB 1
X+#endif /* __ISO_C_VISIBLE >= 1999 */
X 
X /* Define to 1 if you have the <wctype.h> header file. */
X #define HAVE_WCTYPE_H 1
X 
X-/* Define to 1 if you have the `wmemchr' function. */
X-#define HAVE_WMEMCHR 1
X-
X-/* Define to 1 if you have the `wmemcmp' function. */
X-#define HAVE_WMEMCMP 1
X-
X-/* Define to 1 if you have the `wmemcpy' function. */
X-#define HAVE_WMEMCPY 1
X-
X-/* Define to 1 if you have the `wmemmove' function. */
X-#define HAVE_WMEMMOVE 1
X-
X-/* Define to 1 if you have the `wmemset' function. */
X-#define HAVE_WMEMSET 1
X-
X-/* Define to 1 if you have the `wprintf' function. */
X-#define HAVE_WPRINTF 1
X-
X-/* Define to 1 if you have the `wscanf' function. */
X-#define HAVE_WSCANF 1
X+/* Define if writev is available in <sys/uio.h>. */
X+#define HAVE_WRITEV 1
X 
X /* Define to 1 if you have the `_acosf' function. */
X /* #undef HAVE__ACOSF */
X@@ -817,6 +529,9 @@
X /* Define to 1 if you have the `_logl' function. */
X /* #undef HAVE__LOGL */
X 
X+/* Define to 1 if you have the `_modf' function. */
X+/* #undef HAVE__MODF */
X+
X /* Define to 1 if you have the `_modff' function. */
X /* #undef HAVE__MODFF */
X 
X@@ -871,6 +586,48 @@
X /* Define to 1 if you have the `_tanl' function. */
X /* #undef HAVE__TANL */
X 
X+/* Define if the compiler/host combination has __builtin_abs. */
X+#define HAVE___BUILTIN_ABS 1
X+
X+/* Define if the compiler/host combination has __builtin_cos. */
X+#define HAVE___BUILTIN_COS 1
X+
X+/* Define if the compiler/host combination has __builtin_cosf. */
X+#define HAVE___BUILTIN_COSF 1
X+
X+/* Define if the compiler/host combination has __builtin_cosl. */
X+#define HAVE___BUILTIN_COSL 1
X+
X+/* Define if the compiler/host combination has __builtin_fabs. */
X+#define HAVE___BUILTIN_FABS 1
X+
X+/* Define if the compiler/host combination has __builtin_fabsf. */
X+#define HAVE___BUILTIN_FABSF 1
X+
X+/* Define if the compiler/host combination has __builtin_fabsl. */
X+#define HAVE___BUILTIN_FABSL 1
X+
X+/* Define if the compiler/host combination has __builtin_labs. */
X+#define HAVE___BUILTIN_LABS 1
X+
X+/* Define if the compiler/host combination has __builtin_sin. */
X+#define HAVE___BUILTIN_SIN 1
X+
X+/* Define if the compiler/host combination has __builtin_sinf. */
X+#define HAVE___BUILTIN_SINF 1
X+
X+/* Define if the compiler/host combination has __builtin_sinl. */
X+#define HAVE___BUILTIN_SINL 1
X+
X+/* Define if the compiler/host combination has __builtin_sqrt. */
X+#define HAVE___BUILTIN_SQRT 1
X+
X+/* Define if the compiler/host combination has __builtin_sqrtf. */
X+#define HAVE___BUILTIN_SQRTF 1
X+
X+/* Define if the compiler/host combination has __builtin_sqrtl. */
X+#define HAVE___BUILTIN_SQRTL 1
X+
X /* Define to 1 if you have the `__signbit' function. */
X #define HAVE___SIGNBIT 1
X 
X@@ -880,6 +637,9 @@
X /* Define to 1 if you have the `__signbitl' function. */
X #define HAVE___SIGNBITL 1
X 
X+/* Name of package */
X+/* #undef PACKAGE */
X+
X /* Define to the address where bug reports for this package should be sent. */
X #define PACKAGE_BUGREPORT ""
X 
X@@ -898,59 +658,64 @@
X /* Define to 1 if you have the ANSI C header files. */
X #define STDC_HEADERS 1
X 
X+/* Version number of package */
X+/* #undef VERSION */
X+
X+/* Define to use concept checking code from the boost libraries. */
X+/* #undef _GLIBCXX_CONCEPT_CHECKS */
X+
X+/* Define if a fully dynamic basic_string is wanted. */
X+/* #undef _GLIBCXX_FULLY_DYNAMIC_STRING */
X+
X /* Define to 1 if a full hosted library is built, or 0 if freestanding. */
X #define _GLIBCXX_HOSTED 1
X 
X-/* Define if the compiler is configured for setjmp/longjmp exceptions. */
X-/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */
X-//
X-// Systems that have certain non-standard functions prefixed with an
X-// underscore, we'll handle those here. Must come after config.h.in.
X-//
X-#if defined (HAVE__ISNAN) && ! defined (HAVE_ISNAN)
X-# define HAVE_ISNAN 1
X-# define isnan _isnan
X+#if !defined(__LP64__)
X+/* Define if ptrdiff_t is int. */
X+#define _GLIBCXX_PTRDIFF_T_IS_INT 1
X #endif
X 
X-#if defined (HAVE__ISNANF) && ! defined (HAVE_ISNANF)
X-# define HAVE_ISNANF 1
X-# define isnanf _isnanf
X-#endif
X+/* Define if using setrlimit to set resource limits during "make check" */
X+#define _GLIBCXX_RES_LIMITS 1
X 
X-#if defined (HAVE__ISNANL) && ! defined (HAVE_ISNANL)
X-# define HAVE_ISNANL 1
X-# define isnanl _isnanl
X+/* Define if size_t is unsigned int. */
X+#if !defined(__LP64__)
X+#define _GLIBCXX_SIZE_T_IS_UINT  1
X #endif
X 
X-#if defined (HAVE__ISINF) && ! defined (HAVE_ISINF)
X-# define HAVE_ISINF 1
X-# define isinf _isinf
X-#endif
X+/* Define if the compiler is configured for setjmp/longjmp exceptions. */
X+/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */
X 
X-#if defined (HAVE__ISINFF) && ! defined (HAVE_ISINFF)
X-# define HAVE_ISINFF 1
X-# define isinff _isinff
X-#endif
X+/* Define to use GNU symbol versioning in the shared library. */
X+#define _GLIBCXX_SYMVER 1
X 
X-#if defined (HAVE__ISINFL) && ! defined (HAVE_ISINFL)
X-# define HAVE_ISINFL 1
X-# define isinfl _isinfl
X-#endif
X+/* Define if C99 functions or macros from <wchar.h>, <math.h>, <complex.h>,
X+   <stdio.h>, and <stdlib.h> can be used or exposed. */
X+/* #undef _GLIBCXX_USE_C99 */
X+
X+/* Define if C99 functions in <complex.h> should be used in <complex>. Using
X+   compiler builtins for these functions requires corresponding C99 library
X+   functions to be present. */
X+/* #undef _GLIBCXX_USE_C99_COMPLEX */
X 
X-#if defined (HAVE__COPYSIGN) && ! defined (HAVE_COPYSIGN)
X-# define HAVE_COPYSIGN 1
X-# define copysign _copysign
X-#endif
X+/* Define if C99 functions or macros in <math.h> should be imported in <cmath>
X+   in namespace std. */
X+#define _GLIBCXX_USE_C99_MATH 1
X 
X-#if defined (HAVE__COPYSIGNL) && ! defined (HAVE_COPYSIGNL)
X-# define HAVE_COPYSIGNL 1
X-# define copysignl _copysignl
X-#endif
X+/* Define if iconv and related functions exist and are usable. */
X+#define _GLIBCXX_USE_ICONV 1
X 
X-#if defined (HAVE__COSF) && ! defined (HAVE_COSF)
X-# define HAVE_COSF 1
X-# define cosf _cosf
X-#endif
X+/* Define if LFS support is available. */
X+/* #undef _GLIBCXX_USE_LFS */
X+
X+/* Define if code specialized for long long should be used. */
X+#define _GLIBCXX_USE_LONG_LONG 1
X+
X+/* Define if NLS translations are to be used. */
X+/* #undef _GLIBCXX_USE_NLS */
X+
X+/* Define if code specialized for wchar_t should be used. */
X+#define _GLIBCXX_USE_WCHAR_T 1
X 
X #if defined (HAVE__ACOSF) && ! defined (HAVE_ACOSF)
X # define HAVE_ACOSF 1
X@@ -972,6 +737,16 @@
X # define asinl _asinl
X #endif
X 
X+#if defined (HAVE__ATAN2F) && ! defined (HAVE_ATAN2F)
X+# define HAVE_ATAN2F 1
X+# define atan2f _atan2f
X+#endif
X+
X+#if defined (HAVE__ATAN2L) && ! defined (HAVE_ATAN2L)
X+# define HAVE_ATAN2L 1
X+# define atan2l _atan2l
X+#endif
X+
X #if defined (HAVE__ATANF) && ! defined (HAVE_ATANF)
X # define HAVE_ATANF 1
X # define atanf _atanf
X@@ -984,27 +759,32 @@
X 
X #if defined (HAVE__CEILF) && ! defined (HAVE_CEILF)
X # define HAVE_CEILF 1
X-# define aceil _ceilf
X+# define ceilf _ceilf
X #endif
X 
X #if defined (HAVE__CEILL) && ! defined (HAVE_CEILL)
X # define HAVE_CEILL 1
X-# define aceil _ceill
X+# define ceill _ceill
X #endif
X 
X-#if defined (HAVE__COSHF) && ! defined (HAVE_COSHF)
X-# define HAVE_COSHF 1
X-# define coshf _coshf
X+#if defined (HAVE__COPYSIGN) && ! defined (HAVE_COPYSIGN)
X+# define HAVE_COPYSIGN 1
X+# define copysign _copysign
X #endif
X 
X-#if defined (HAVE__COSL) && ! defined (HAVE_COSL)
X-# define HAVE_COSL 1
X-# define cosl _cosl
X+#if defined (HAVE__COPYSIGNL) && ! defined (HAVE_COPYSIGNL)
X+# define HAVE_COPYSIGNL 1
X+# define copysignl _copysignl
X #endif
X 
X-#if defined (HAVE__LOGF) && ! defined (HAVE_LOGF)
X-# define HAVE_LOGF 1
X-# define logf _logf
X+#if defined (HAVE__COSF) && ! defined (HAVE_COSF)
X+# define HAVE_COSF 1
X+# define cosf _cosf
X+#endif
X+
X+#if defined (HAVE__COSHF) && ! defined (HAVE_COSHF)
X+# define HAVE_COSHF 1
X+# define coshf _coshf
X #endif
X 
X #if defined (HAVE__COSHL) && ! defined (HAVE_COSHL)
X@@ -1012,6 +792,11 @@
X # define coshl _coshl
X #endif
X 
X+#if defined (HAVE__COSL) && ! defined (HAVE_COSL)
X+# define HAVE_COSL 1
X+# define cosl _cosl
X+#endif
X+
X #if defined (HAVE__EXPF) && ! defined (HAVE_EXPF)
X # define HAVE_EXPF 1
X # define expf _expf
X@@ -1032,6 +817,21 @@
X # define fabsl _fabsl
X #endif
X 
X+#if defined (HAVE__FINITE) && ! defined (HAVE_FINITE)
X+# define HAVE_FINITE 1
X+# define finite _finite
X+#endif
X+
X+#if defined (HAVE__FINITEF) && ! defined (HAVE_FINITEF)
X+# define HAVE_FINITEF 1
X+# define finitef _finitef
X+#endif
X+
X+#if defined (HAVE__FINITEL) && ! defined (HAVE_FINITEL)
X+# define HAVE_FINITEL 1
X+# define finitel _finitel
X+#endif
X+
X #if defined (HAVE__FLOORF) && ! defined (HAVE_FLOORF)
X # define HAVE_FLOORF 1
X # define floorf _floorf
X@@ -1052,6 +852,11 @@
X # define fmodl _fmodl
X #endif
X 
X+#if defined (HAVE__FPCLASS) && ! defined (HAVE_FPCLASS)
X+# define HAVE_FPCLASS 1
X+# define fpclass _fpclass
X+#endif
X+
X #if defined (HAVE__FREXPF) && ! defined (HAVE_FREXPF)
X # define HAVE_FREXPF 1
X # define frexpf _frexpf
X@@ -1062,6 +867,51 @@
X # define frexpl _frexpl
X #endif
X 
X+#if defined (HAVE__HYPOT) && ! defined (HAVE_HYPOT)
X+# define HAVE_HYPOT 1
X+# define hypot _hypot
X+#endif
X+
X+#if defined (HAVE__HYPOTF) && ! defined (HAVE_HYPOTF)
X+# define HAVE_HYPOTF 1
X+# define hypotf _hypotf
X+#endif
X+
X+#if defined (HAVE__HYPOTL) && ! defined (HAVE_HYPOTL)
X+# define HAVE_HYPOTL 1
X+# define hypotl _hypotl
X+#endif
X+
X+#if defined (HAVE__ISINF) && ! defined (HAVE_ISINF)
X+# define HAVE_ISINF 1
X+# define isinf _isinf
X+#endif
X+
X+#if defined (HAVE__ISINFF) && ! defined (HAVE_ISINFF)
X+# define HAVE_ISINFF 1
X+# define isinff _isinff
X+#endif
X+
X+#if defined (HAVE__ISINFL) && ! defined (HAVE_ISINFL)
X+# define HAVE_ISINFL 1
X+# define isinfl _isinfl
X+#endif
X+
X+#if defined (HAVE__ISNAN) && ! defined (HAVE_ISNAN)
X+# define HAVE_ISNAN 1
X+# define isnan _isnan
X+#endif
X+
X+#if defined (HAVE__ISNANF) && ! defined (HAVE_ISNANF)
X+# define HAVE_ISNANF 1
X+# define isnanf _isnanf
X+#endif
X+
X+#if defined (HAVE__ISNANL) && ! defined (HAVE_ISNANL)
X+# define HAVE_ISNANL 1
X+# define isnanl _isnanl
X+#endif
X+
X #if defined (HAVE__LDEXPF) && ! defined (HAVE_LDEXPF)
X # define HAVE_LDEXPF 1
X # define ldexpf _ldexpf
X@@ -1077,29 +927,64 @@
X # define log10f _log10f
X #endif
X 
X+#if defined (HAVE__LOG10L) && ! defined (HAVE_LOG10L)
X+# define HAVE_LOG10L 1
X+# define log10l _log10l
X+#endif
X+
X+#if defined (HAVE__LOGF) && ! defined (HAVE_LOGF)
X+# define HAVE_LOGF 1
X+# define logf _logf
X+#endif
X+
X #if defined (HAVE__LOGL) && ! defined (HAVE_LOGL)
X # define HAVE_LOGL 1
X # define logl _logl
X #endif
X 
X+#if defined (HAVE__MODF) && ! defined (HAVE_MODF)
X+# define HAVE_MODF 1
X+# define modf _modf
X+#endif
X+
X+#if defined (HAVE__MODFF) && ! defined (HAVE_MODFF)
X+# define HAVE_MODFF 1
X+# define modff _modff
X+#endif
X+
X+#if defined (HAVE__MODFL) && ! defined (HAVE_MODFL)
X+# define HAVE_MODFL 1
X+# define modfl _modfl
X+#endif
X+
X #if defined (HAVE__POWF) && ! defined (HAVE_POWF)
X # define HAVE_POWF 1
X # define powf _powf
X #endif
X 
X-#if defined (HAVE__LOG10L) && ! defined (HAVE_LOG10L)
X-# define HAVE_LOG10L 1
X-# define log10l _log10l
X+#if defined (HAVE__POWL) && ! defined (HAVE_POWL)
X+# define HAVE_POWL 1
X+# define powl _powl
X #endif
X 
X-#if defined (HAVE__MODF) && ! defined (HAVE_MODF)
X-# define HAVE_MODF 1
X-# define modf _modf
X+#if defined (HAVE__QFPCLASS) && ! defined (HAVE_QFPCLASS)
X+# define HAVE_QFPCLASS 1
X+# define qfpclass _qfpclass
X+#endif
X+
X+#if defined (HAVE__SINCOS) && ! defined (HAVE_SINCOS)
X+# define HAVE_SINCOS 1
X+# define sincos _sincos
X+#endif
X+
X+#if defined (HAVE__SINCOSF) && ! defined (HAVE_SINCOSF)
X+# define HAVE_SINCOSF 1
X+# define sincosf _sincosf
X #endif
X 
X-#if defined (HAVE__MODL) && ! defined (HAVE_MODL)
X-# define HAVE_MODL 1
X-# define modl _modl
X+#if defined (HAVE__SINCOSL) && ! defined (HAVE_SINCOSL)
X+# define HAVE_SINCOSL 1
X+# define sincosl _sincosl
X #endif
X 
X #if defined (HAVE__SINF) && ! defined (HAVE_SINF)
X@@ -1107,16 +992,16 @@
X # define sinf _sinf
X #endif
X 
X-#if defined (HAVE__POWL) && ! defined (HAVE_POWL)
X-# define HAVE_POWL 1
X-# define powl _powl
X-#endif
X-
X #if defined (HAVE__SINHF) && ! defined (HAVE_SINHF)
X # define HAVE_SINHF 1
X # define sinhf _sinhf
X #endif
X 
X+#if defined (HAVE__SINHL) && ! defined (HAVE_SINHL)
X+# define HAVE_SINHL 1
X+# define sinhl _sinhl
X+#endif
X+
X #if defined (HAVE__SINL) && ! defined (HAVE_SINL)
X # define HAVE_SINL 1
X # define sinl _sinl
X@@ -1127,88 +1012,37 @@
X # define sqrtf _sqrtf
X #endif
X 
X-#if defined (HAVE__SINHL) && ! defined (HAVE_SINHL)
X-# define HAVE_SINHL 1
X-# define sinhl _sinhl
X-#endif
X-
X-#if defined (HAVE__TANF) && ! defined (HAVE_TANF)
X-# define HAVE_TANF 1
X-# define tanf _tanf
X-#endif
X-
X #if defined (HAVE__SQRTL) && ! defined (HAVE_SQRTL)
X # define HAVE_SQRTL 1
X # define sqrtl _sqrtl
X #endif
X 
X-#if defined (HAVE__TANHF) && ! defined (HAVE_TANHF)
X-# define HAVE_TANHF 1
X-# define tanhf _tanhf
X-#endif
X-
X-#if defined (HAVE__TANL) && ! defined (HAVE_TANL)
X-# define HAVE_TANF 1
X-# define tanf _tanf
X-#endif
X-
X #if defined (HAVE__STRTOF) && ! defined (HAVE_STRTOF)
X # define HAVE_STRTOF 1
X # define strtof _strtof
X #endif
X 
X-#if defined (HAVE__TANHL) && ! defined (HAVE_TANHL)
X-# define HAVE_TANHL 1
X-# define tanhl _tanhl
X-#endif
X-
X #if defined (HAVE__STRTOLD) && ! defined (HAVE_STRTOLD)
X # define HAVE_STRTOLD 1
X # define strtold _strtold
X #endif
X 
X-#if defined (HAVE__SINCOS) && ! defined (HAVE_SINCOS)
X-# define HAVE_SINCOS 1
X-# define sincos _sincos
X-#endif
X-
X-#if defined (HAVE__SINCOSF) && ! defined (HAVE_SINCOSF)
X-# define HAVE_SINCOSF 1
X-# define sincosf _sincosf
X-#endif
X-
X-#if defined (HAVE__SINCOSL) && ! defined (HAVE_SINCOSL)
X-# define HAVE_SINCOSL 1
X-# define sincosl _sincosl
X-#endif
X-
X-#if defined (HAVE__FINITE) && ! defined (HAVE_FINITE)
X-# define HAVE_FINITE 1
X-# define finite _finite
X-#endif
X-
X-#if defined (HAVE__FINITEF) && ! defined (HAVE_FINITEF)
X-# define HAVE_FINITEF 1
X-# define finitef _finitef
X-#endif
X-
X-#if defined (HAVE__FINITEL) && ! defined (HAVE_FINITEL)
X-# define HAVE_FINITEL 1
X-# define finitel _finitel
X+#if defined (HAVE__TANF) && ! defined (HAVE_TANF)
X+# define HAVE_TANF 1
X+# define tanf _tanf
X #endif
X 
X-#if defined (HAVE__QFINITE) && ! defined (HAVE_QFINITE)
X-# define HAVE_QFINITE 1
X-# define qfinite _qfinite
X+#if defined (HAVE__TANHF) && ! defined (HAVE_TANHF)
X+# define HAVE_TANHF 1
X+# define tanhf _tanhf
X #endif
X 
X-#if defined (HAVE__FPCLASS) && ! defined (HAVE_FPCLASS)
X-# define HAVE_FPCLASS 1
X-# define fpclass _fpclass
X+#if defined (HAVE__TANHL) && ! defined (HAVE_TANHL)
X+# define HAVE_TANHL 1
X+# define tanhl _tanhl
X #endif
X 
X-#if defined (HAVE__QFPCLASS) && ! defined (HAVE_QFPCLASS)
X-# define HAVE_QFPCLASS 1
X-# define qfpclass _qfpclass
X+#if defined (HAVE__TANL) && ! defined (HAVE_TANL)
X+# define HAVE_TANL 1
X+# define tanl _tanl
X #endif
X-
XIndex: gnu/lib/libsupc++/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/lib/libsupc++/Makefile,v
Xretrieving revision 1.8
Xdiff -u -r1.8 Makefile
X--- gnu/lib/libsupc++/Makefile	19 Aug 2006 00:52:54 -0000	1.8
X+++ gnu/lib/libsupc++/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,14 +1,15 @@
X # $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.8 2006/08/19 00:52:54 kan Exp $
X 
X GCCDIR=	${.CURDIR}/../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
X SRCDIR=	${.CURDIR}/../../../contrib/libstdc++/libsupc++
X 
X-.PATH: ${SRCDIR} ${GCCDIR}
X+.PATH: ${SRCDIR} ${GCCLIB}/libiberty 
X 
X # Static only.
X LIB=	supc++
X-SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc \
X-	eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc \
X+SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \
X+	eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \
X 	eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \
X 	eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \
X 	new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \
X@@ -18,12 +19,19 @@
X SRCS+=	cp-demangle.c
X 
X CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
X-CFLAGS+=	-I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++
X+CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR} -I${GCCDIR}
X+CFLAGS+=	-I${.CURDIR}/../libstdc++ -I.
X CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
X CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
X 
X HDRS=	exception new typeinfo cxxabi.h exception_defines.h
X INCS=	${HDRS:S;^;${SRCDIR}/;}
X-INCSDIR=${INCLUDEDIR}/c++/3.4
X+INCSDIR=${INCLUDEDIR}/c++/4.1
X+
X+unwind.h: ${GCCDIR}/unwind-generic.h
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+SRCS+=		unwind.h
X+CLEANFILES+=	unwind.h
X 
X .include <bsd.lib.mk>
XIndex: gnu/usr.bin/cc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/Makefile,v
Xretrieving revision 1.40
Xdiff -u -r1.40 Makefile
X--- gnu/usr.bin/cc/Makefile	21 Mar 2006 08:59:36 -0000	1.40
X+++ gnu/usr.bin/cc/Makefile	4 Apr 2007 15:37:18 -0000
X@@ -5,7 +5,7 @@
X # The order of some of these are rather important.  Some depend on previous
X # subdirs.
X 
X-SUBDIR= cc_tools cc_int cc cc1 include protoize doc
X+SUBDIR= cc_tools libiberty libcpp cc_int cc cc1 include doc #protoize
X 
X .if ${MK_CPP} != "no"
X SUBDIR+= cpp
X@@ -13,19 +13,12 @@
X 
X .if ${MK_CXX} != "no"
X SUBDIR+= cc1plus c++ c++filt
X-#.if ${MK_COLLECT2} != "no"
X-#SUBDIR+= collect2
X-#.endif
X .endif
X 
X .if ${MK_OBJC} != "no"
X SUBDIR+= cc1obj
X .endif
X 
X-.if ${MK_FORTRAN} != "no"
X-SUBDIR+= f77 f771 f77doc
X-.endif
X-
X .if ${MK_GCOV} != "no"
X SUBDIR+= gcov
X .endif
XIndex: gnu/usr.bin/cc/Makefile.fe
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/Makefile.fe,v
Xretrieving revision 1.4
Xdiff -u -r1.4 Makefile.fe
X--- gnu/usr.bin/cc/Makefile.fe	12 Mar 2007 00:28:06 -0000	1.4
X+++ gnu/usr.bin/cc/Makefile.fe	14 Mar 2007 00:56:13 -0000
X@@ -2,14 +2,15 @@
X 
X #	Front-end-only bits
X 
X-GCC_VERSION!=	sed -n /version_string/p ${GCCDIR}/version.c | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'
X+.include "Makefile.ver"
X 
X #
X # These were previously defined in gcc.c.  Just copy previous values from
X # there. We ifdef most of them out for FREEBSD_NATIVE builds anyway.
X # gcc.c won't compile without them though.
X DRIVER_DEFINES = \
X-	-DDEFAULT_TARGET_VERSION=\"$(GCC_VERSION)\" \
X-	-DDEFAULT_TARGET_MACHINE=\"$(GCC_TARGET)\" \
X+	-DDEFAULT_TARGET_VERSION=\"$(BASEVER)\" \
X+	-DDEFAULT_TARGET_MACHINE=\"$(GCC_TARGET)\"  \
X+	-DENABLE_SHARED_LIBGCC
X 
X CFLAGS+= ${DRIVER_DEFINES}
XIndex: gnu/usr.bin/cc/Makefile.inc
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/Makefile.inc,v
Xretrieving revision 1.65
Xdiff -u -r1.65 Makefile.inc
X--- gnu/usr.bin/cc/Makefile.inc	12 Mar 2007 00:28:06 -0000	1.65
X+++ gnu/usr.bin/cc/Makefile.inc	4 Apr 2007 15:38:04 -0000
X@@ -7,15 +7,12 @@
X __CC_MAKEFILE_INC__= ${MFILE}
X 
X GCCDIR=	${.CURDIR}/../../../../contrib/gcc
X+GCCLIB=	${.CURDIR}/../../../../contrib/gcclibs
X 
X .include "Makefile.tgt"
X 
X # Machine description.
X-.if ${TARGET_ARCH} == "arm"
X-MD_FILE=	../cc_tools/arm-diked.md
X-.else
X MD_FILE=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md
X-.endif
X GCC_TARGET=	${TARGET_ARCH}-undermydesk-freebsd
X 
X CFLAGS+=	-DIN_GCC -DHAVE_CONFIG_H
X@@ -44,10 +41,24 @@
X # correctly.
X CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
X 
X+CFLAGS+=	-I${GCCLIB}/include -I${GCCLIB}/libcpp/include
X+
X .if exists(${.OBJDIR}/../cc_int)
X-LIBCC_INT=	${.OBJDIR}/../cc_int/libcc_int.a
X+LIBBACKEND=	${.OBJDIR}/../cc_int/libbackend.a
X+.else
X+LIBBACKEND=	${.CURDIR}/../cc_int/libbackend.a
X+.endif
X+
X+.if exists(${.OBJDIR}/../libiberty)
X+LIBIBERTY=	${.OBJDIR}/../libiberty/libiberty.a
X+.else
X+LIBIBERTY=	${.CURDIR}/../libiberty/libiberty.a
X+.endif
X+
X+.if exists(${.OBJDIR}/../libcpp)
X+LIBCPP=		${.OBJDIR}/../libcpp/libcpp.a
X .else
X-LIBCC_INT=	${.CURDIR}/../cc_int/libcc_int.a
X+LIBCPP=		${.CURDIR}/../libcpp/libcpp.a
X .endif
X 
X .endif # !__CC_MAKEFILE_INC__
XIndex: gnu/usr.bin/cc/Makefile.tgt
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/Makefile.tgt,v
Xretrieving revision 1.10
Xdiff -u -r1.10 Makefile.tgt
X--- gnu/usr.bin/cc/Makefile.tgt	15 Sep 2006 05:21:06 -0000	1.10
X+++ gnu/usr.bin/cc/Makefile.tgt	17 Dec 2006 06:49:27 -0000
X@@ -1,15 +1,9 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.10 2006/09/15 05:21:06 imp Exp $
X+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8 2004/07/28 05:27:19 kan Exp $
X 
X TARGET_ARCH?=	${MACHINE_ARCH}
X 
X-.if ${TARGET_ARCH} == "alpha"
X-GCC_CPU=	alpha
X-.elif ${TARGET_ARCH} == "arm"
X+.if ${TARGET_ARCH} == "arm"
X GCC_CPU=	arm
X-# TARGET_CPU_DEFAULT= TARGET_CPU_xscale
X-.if defined(TARGET_BIG_ENDIAN)
X-CFLAGS+=	-DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
X-.endif
X .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
X GCC_CPU=	i386
X .elif ${TARGET_ARCH} == "ia64"
XIndex: gnu/usr.bin/cc/c++/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/c++/Makefile,v
Xretrieving revision 1.23
Xdiff -u -r1.23 Makefile
X--- gnu/usr.bin/cc/c++/Makefile	21 Dec 2004 08:46:58 -0000	1.23
X+++ gnu/usr.bin/cc/c++/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -11,7 +11,7 @@
X LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
X NO_MAN=
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBBACKEND} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBIBERTY}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/c++filt/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/c++filt/Makefile,v
Xretrieving revision 1.21
Xdiff -u -r1.21 Makefile
X--- gnu/usr.bin/cc/c++filt/Makefile	12 Mar 2007 00:28:06 -0000	1.21
X+++ gnu/usr.bin/cc/c++filt/Makefile	14 Mar 2007 00:58:59 -0000
X@@ -3,7 +3,7 @@
X .include "../Makefile.inc"
X .include "../Makefile.fe"
X 
X-.PATH: ${GCCDIR}
X+.PATH: ${GCCLIB}/libiberty
X 
X PROG=	c++filt
X SRCS=	cp-demangle.c
X@@ -11,7 +11,7 @@
X 
X CFLAGS+= -DSTANDALONE_DEMANGLER -DVERSION=\"$(GCC_VERSION)\"
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBIBERTY}
X+LDADD=	${LIBIBERTY}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc/Makefile,v
Xretrieving revision 1.32
Xdiff -u -r1.32 Makefile
X--- gnu/usr.bin/cc/cc/Makefile	21 Sep 2006 07:52:40 -0000	1.32
X+++ gnu/usr.bin/cc/cc/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,19 +1,20 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.32 2006/09/21 07:52:40 ru Exp $
X+# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.31 2004/12/21 09:59:41 ru Exp $
X 
X .include "../Makefile.inc"
X .include "../Makefile.fe"
X 
X-.PATH: ${GCCDIR} ${GCCDIR}/doc
X+.PATH: ${GCCDIR}
X 
X PROG=	cc
X-MAN=	gcc.1
X+#MAN=	gcc.1
X+NO_MAN=
X SRCS=	gcc.c gccspec.c
X NO_SHARED?=yes
X 
X LINKS=	${BINDIR}/cc ${BINDIR}/gcc
X MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBBACKEND} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBIBERTY}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc1/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc1/Makefile,v
Xretrieving revision 1.34
Xdiff -u -r1.34 Makefile
X--- gnu/usr.bin/cc/cc1/Makefile	21 Dec 2004 09:59:41 -0000	1.34
X+++ gnu/usr.bin/cc/cc1/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -3,31 +3,24 @@
X .include "../Makefile.inc"
X 
X .PATH: ${GCCDIR}
X- 
X+
X PROG=	cc1
X-SRCS=	main.c c-parse+%DIKED.c c-lang.c stub-objc.c
X+SRCS=	main.c c-parser.c c-lang.c
X BINDIR=	/usr/libexec
X NO_MAN=
X NO_SHARED?=yes
X 
X-CFLAGS+= -I.
X-
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X-
X-#-----------------------------------------------------------------------
X-# C parser
X-c-parse+%DIKED.c: c-parse.c
X-	sed -e "s/malloc/xmalloc/g" \
X-	    -e "s/realloc/xrealloc/g" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-c-parse.y: c-parse.in
X-	sed -e "/^@@ifobjc.*/,/^@@end_ifobjc.*/d" \
X-	    -e "/^@@ifc.*/d" -e "/^@@end_ifc.*/d" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-CLEANFILES=	c-parse+%DIKED.c c-parse.c c-parse.y
X-CLEANFILES+=	y.tab.h # we don't use it, but the system YACC rules are naive
X+OBJS+=  ${PROG}-checksum.o
X+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+
X+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
X+${PROG}-dummy:	${DOBJS}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
X+CLEANFILES+=	${PROG}-dummy
X+
X+${PROG}-checksum.c:	${PROG}-dummy
X+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
X+CLEANFILES+=	${PROG}-checksum.c
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc1obj/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc1obj/Makefile,v
Xretrieving revision 1.27
Xdiff -u -r1.27 Makefile
X--- gnu/usr.bin/cc/cc1obj/Makefile	21 Dec 2004 09:59:41 -0000	1.27
X+++ gnu/usr.bin/cc/cc1obj/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -5,31 +5,24 @@
X .PATH: ${GCCDIR}/objc ${GCCDIR}
X 
X PROG=	cc1obj
X-SRCS=	main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c
X+SRCS=	main.c c-parser.c objc-act.c objc-lang.c c-decl.c
X BINDIR=	/usr/libexec
X NO_MAN=
X NO_SHARED?=yes
X 
X CFLAGS+= -I${GCCDIR}/objc -I.
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X-
X-#-----------------------------------------------------------------------
X-# objc parser
X-objc-parse+DIKED.c: objc-parse.c
X-	sed -e "s/malloc/xmalloc/g" \
X-	    -e "s/realloc/xrealloc/g" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-objc-parse.y: c-parse.in
X-	sed -e "/^@@ifc.*/,/^@@end_ifc.*/d" \
X-	    -e "/^@@ifobjc.*/d" -e "/^@@end_ifobjc.*/d" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-CLEANFILES=	objc-parse+DIKED.c objc-parse.c objc-parse.y
X-CLEANFILES+=	y.tab.h # we don't use it, but the system YACC rules are naive
X-
X-#-----------------------------------------------------------------------
X+OBJS+=  ${PROG}-checksum.o
X+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+
X+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
X+${PROG}-dummy:	${DOBJS}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
X+CLEANFILES+=	${PROG}-dummy
X+
X+${PROG}-checksum.c:	${PROG}-dummy
X+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
X+CLEANFILES+=	${PROG}-checksum.c
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc1plus/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc1plus/Makefile,v
Xretrieving revision 1.38
Xdiff -u -r1.38 Makefile
X--- gnu/usr.bin/cc/cc1plus/Makefile	21 Dec 2004 09:59:41 -0000	1.38
X+++ gnu/usr.bin/cc/cc1plus/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -9,7 +9,8 @@
X SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
X 	decl.c decl2.c error.c except.c expr.c dump.c friend.c  init.c lex.c \
X 	mangle.c method.c name-lookup.c parser.c pt.c ptree.c repo.c rtti.c \
X-	search.c semantics.c tree.c typeck.c typeck2.c optimize.c 
X+	search.c semantics.c tree.c typeck.c typeck2.c optimize.c \
X+	cp-objcp-common.c cp-gimplify.c tree-mudflap.c
X 
X BINDIR=	/usr/libexec
X NO_MAN=
X@@ -17,15 +18,24 @@
X 
X CFLAGS+= -I${GCCDIR}/cp -I.
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+OBJS+=	${PROG}-checksum.o
X+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBIBERTY}
X 
X #-----------------------------------------------------------------------
X # C++ parser
X cfns.h: cfns.gperf
X 	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
X 	    ${.ALLSRC} > ${.TARGET}
X-
X CLEANFILES= cfns.h
X 
X+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
X+${PROG}-dummy:	${DOBJS}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
X+CLEANFILES+=	${PROG}-dummy
X+
X+${PROG}-checksum.c:	${PROG}-dummy
X+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
X+CLEANFILES+=	${PROG}-checksum.c
X+
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc_int/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc_int/Makefile,v
Xretrieving revision 1.50
Xdiff -u -r1.50 Makefile
X--- gnu/usr.bin/cc/cc_int/Makefile	12 Mar 2007 00:28:06 -0000	1.50
X+++ gnu/usr.bin/cc/cc_int/Makefile	4 Apr 2007 15:34:50 -0000
X@@ -1,93 +1,101 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.50 2007/03/12 00:28:06 kan Exp $
X+# $FreeBSD:  $
X 
X .include "../Makefile.inc"
X+.include "../Makefile.ver"
X 
X-.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
X+.PATH: ../cc_tools ${GCCDIR} ${GCCDIR}/config/${GCC_CPU}
X 
X-LIB=		cc_int
X+LIB=	backend
X INTERNALLIB=
X 
X-# Files from libiberty.
X-SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
X-	dyn-string.c fibheap.c getpwd.c getruntime.c hashtab.c hex.c \
X-	lbasename.c make-temp-file.c md5.c obstack.c partition.c pex-unix.c \
X-	physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c
X-
X-# Language-independent files.
X-SRCS+=	alias.c bb-reorder.c bitmap.c builtins.c caller-save.c calls.c \
X-	cfg.c cfganal.c cfgbuild.c cfgcleanup.c cfglayout.c cfgloop.c \
X-	cfgloopanal.c cfgloopmanip.c loop-init.c loop-unswitch.c loop-unroll.c \
X-	cfgrtl.c combine.c conflict.c convert.c coverage.c cse.c cselib.c \
X-	dbxout.c debug.c df.c diagnostic.c dojump.c doloop.c dominance.c \
X-	dwarf2asm.c dwarf2out.c emit-rtl.c except.c explow.c \
X-	expmed.c expr.c final.c flow.c fold-const.c function.c gcse.c \
X-	genrtl.c ggc-common.c global.c graph.c gtype-desc.c \
X-	haifa-sched.c hooks.c ifcvt.c  \
X-	integrate.c intl.c jump.c  langhooks.c lcm.c lists.c local-alloc.c \
X-	loop.c optabs.c options.c opts.c params.c postreload.c predict.c \
X-	print-rtl.c print-tree.c value-prof.c \
X-	profile.c ra.c ra-build.c ra-colorize.c ra-debug.c ra-rewrite.c \
X-	real.c recog.c reg-stack.c regclass.c regmove.c regrename.c \
X-	reload.c reload1.c reorg.c resource.c rtl.c rtlanal.c rtl-error.c \
X-	sbitmap.c sched-deps.c sched-ebb.c sched-rgn.c sched-vis.c sdbout.c \
X-	sibcall.c simplify-rtx.c sreal.c stmt.c stor-layout.c stringpool.c \
X-	targhooks.c timevar.c toplev.c tracer.c tree.c tree-dump.c unroll.c \
X-	varasm.c varray.c version.c vmsdbgout.c xcoffout.c alloc-pool.c \
X-	et-forest.c cfghooks.c bt-load.c pretty-print.c ggc-page.c web.c
X-
X-# Miscellaneous files.
X-SRCS+=	hashtable.c tree-inline.c tree-optimize.c cgraph.c cgraphunit.c
X-
X-# Host hooks.
X-SRCS+=	host-default.c
X-
X-# C and ObjC files.
X-SRCS+=	attribs.c c-errors.c c-lex.c c-pragma.c c-decl.c c-typeck.c \
X-	c-convert.c c-aux-info.c c-common.c c-opts.c c-format.c c-semantics.c \
X-	c-incpath.c cppdefault.c c-ppoutput.c c-cppbuiltin.c prefix.c \
X-	c-objc-common.c c-dump.c c-pch.c
X+EXTRA_OBJS=
X+GGC=		ggc-page.o
X+host_hook_obj=	host-default.o
X+
X+#
X+# Most lists copied verbatim from GCC Makefiles.
X+#
X+OBJS-common = \
X+ tree-chrec.o tree-scalar-evolution.o tree-data-ref.o                      \
X+ tree-cfg.o tree-dfa.o tree-eh.o tree-ssa.o tree-optimize.o tree-gimple.o  \
X+ gimplify.o tree-pretty-print.o tree-into-ssa.o                            \
X+ tree-outof-ssa.o tree-ssa-ccp.o tree-vn.o tree-ssa-uncprop.o              \
X+ tree-ssa-dce.o  tree-ssa-copy.o tree-nrv.o tree-ssa-copyrename.o          \
X+ tree-ssa-pre.o tree-ssa-live.o tree-ssa-operands.o tree-ssa-alias.o       \
X+ tree-ssa-phiopt.o tree-ssa-forwprop.o tree-nested.o tree-ssa-dse.o        \
X+ tree-ssa-dom.o domwalk.o tree-tailcall.o gimple-low.o tree-iterator.o     \
X+ tree-phinodes.o tree-ssanames.o tree-sra.o tree-complex.o                 \
X+ tree-vect-generic.o tree-ssa-loop.o tree-ssa-loop-niter.o                 \
X+ tree-ssa-loop-manip.o tree-ssa-threadupdate.o                             \
X+ tree-vectorizer.o tree-vect-analyze.o tree-vect-transform.o               \
X+ tree-ssa-loop-ivcanon.o tree-ssa-propagate.o tree-ssa-address.o           \
X+ tree-ssa-math-opts.o                                                      \
X+ tree-ssa-loop-ivopts.o tree-if-conv.o tree-ssa-loop-unswitch.o            \
X+ alias.o bb-reorder.o bitmap.o builtins.o caller-save.o calls.o            \
X+ cfg.o cfganal.o cfgbuild.o cfgcleanup.o cfglayout.o cfgloop.o             \
X+ cfgloopanal.o cfgloopmanip.o loop-init.o loop-unswitch.o loop-unroll.o    \
X+ cfgrtl.o combine.o conflict.o convert.o coverage.o cse.o cselib.o         \
X+ dbxout.o ddg.o tree-ssa-loop-ch.o loop-invariant.o tree-ssa-loop-im.o     \
X+ debug.o df.o diagnostic.o dojump.o dominance.o loop-doloop.o              \
X+ dwarf2asm.o dwarf2out.o emit-rtl.o except.o explow.o loop-iv.o            \
X+ expmed.o expr.o final.o flow.o fold-const.o function.o gcse.o             \
X+ genrtl.o ggc-common.o global.o graph.o gtype-desc.o                       \
X+ haifa-sched.o hooks.o ifcvt.o insn-attrtab.o insn-emit.o insn-modes.o     \
X+ insn-extract.o insn-opinit.o insn-output.o insn-peep.o insn-recog.o       \
X+ integrate.o intl.o jump.o  langhooks.o lcm.o lists.o local-alloc.o        \
X+ loop.o mode-switching.o modulo-sched.o optabs.o options.o opts.o          \
X+ params.o postreload.o postreload-gcse.o predict.o                         \
X+ insn-preds.o pointer-set.o                                                \
X+ print-rtl.o print-tree.o profile.o value-prof.o var-tracking.o            \
X+ real.o recog.o reg-stack.o regclass.o regmove.o regrename.o               \
X+ reload.o reload1.o reorg.o resource.o rtl.o rtlanal.o rtl-error.o         \
X+ sbitmap.o sched-deps.o sched-ebb.o sched-rgn.o sched-vis.o sdbout.o       \
X+ simplify-rtx.o sreal.o stmt.o stor-layout.o stringpool.o                  \
X+ targhooks.o timevar.o toplev.o tracer.o tree.o tree-dump.o                \
X+ varasm.o varray.o vec.o version.o vmsdbgout.o xcoffout.o alloc-pool.o     \
X+ et-forest.o cfghooks.o bt-load.o pretty-print.o $(GGC) web.o passes.o     \
X+ tree-profile.o rtlhooks.o cfgexpand.o lambda-mat.o                        \
X+ lambda-trans.o lambda-code.o tree-loop-linear.o tree-ssa-sink.o           \
X+ tree-vrp.o tree-stdarg.o tree-cfgcleanup.o tree-ssa-reassoc.o             \
X+ tree-ssa-structalias.o tree-object-size.o
X+
X+OBJS-archive=	$(EXTRA_OBJS) $(host_hook_obj) tree-inline.o		   \
X+  cgraph.o cgraphunit.o tree-nomudflap.o ipa.o ipa-inline.o		   \
X+  ipa-utils.o ipa-reference.o ipa-pure-const.o ipa-type-escape.o	   \
X+  ipa-prop.o ipa-cp.o
X 
X-# Files shared by cc1plus, cc1 and cc1obj
X-SRCS+=	c-pretty-print.c
X-
X-# Machine-dependent files.
X-SRCS+=	${GCC_CPU}.c
X+OBJS-md=  ${GCC_CPU}.o
X .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-c.c)
X-SRCS+=	${GCC_CPU}-c.c
X+OBJS-md+= ${GCC_CPU}-c.o
X .endif
X 
X-# libcpp files.
X-SRCS+=	cpplib.c cpplex.c cppmacro.c cppexp.c cppfiles.c cpptrad.c \
X-	cpphash.c cpperror.c cppinit.c cppcharset.c \
X-	line-map.c mkdeps.c cpppch.c
X-
X-# insn-* gunk -- headers are built in cc_tools, as they are used by the
X-# "build-tools"
X-.for F in attrtab emit extract opinit output peep recog
X-SRCS+=	insn-$F.c
X-CLEANFILES+= insn-$F.c
X-insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE}
X-	${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} > insn-$F.c \
X-	    ${.MAKEFLAGS:M-s:S;-s;2>/dev/null;}
X-.endfor
X-.for F in modes
X-SRCS+=	insn-$F.c
X-CLEANFILES+= insn-$F.c
X-insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F
X-	${.OBJDIR}/../cc_tools/gen$F > insn-$F.c
X-.endfor
X-
X-CFLAGS+=	-DHAVE_CONFIG_H
X-CFLAGS+=	-DTARGET_NAME=\"${GCC_TARGET}\"
X+# Target specific, C specific object file
X+C_TARGET_OBJS=
X 
X-.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
X-CFLAGS += -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
X-.endif
X+# Language-specific object files for C and Objective C.
X+C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \
X+  c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \
X+  c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
X+  c-objc-common.o c-dump.o c-pch.o c-parser.o $(C_TARGET_OBJS) \
X+  c-gimplify.o tree-mudflap.o c-pretty-print.o
X+
X+# Language-specific object files for C.
X+C_OBJS = c-lang.o stub-objc.o $(C_AND_OBJC_OBJS)
X+
X+# Put objC stub objects in library. objc frontend will override it
X+OBJS-dummy=  stub-objc.o dummy-checksum.o
X+
X+OBJS-all=  ${OBJS-common} ${OBJS-archive} ${OBJS-md} ${C_AND_OBJC_OBJS} \
X+	   ${OBJS-dummy}
X+
X+SRCS+= ${OBJS-all:R:S/$/.c/g}
X+
X+version.o:	version.c
X+	${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \
X+		-DDATESTAMP=\"\ ${DATESTAMP}\" \
X+		-DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC}
X 
X-# c-pch.o needs extra defines. Replicate the rule here rather than
X-# pollute compiler command line for all other files.
X-c-pch.o: c-pch.c
X-	${CC} ${CFLAGS} -DHOST_MACHINE=\"${host}\" \
X-		 -DTARGET_MACHINE=\"${GCC_TARGET}\" -c ${.IMPSRC}
X+toplev.o:	toplev.c
X+	${CC} ${CFLAGS} -DTARGET_NAME=\"${GCC_TARGET}\" -c ${.IMPSRC}
X 
X .include <bsd.lib.mk>
XIndex: gnu/usr.bin/cc/cc_tools/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc_tools/Makefile,v
Xretrieving revision 1.84
Xdiff -u -r1.84 Makefile
X--- gnu/usr.bin/cc/cc_tools/Makefile	18 Sep 2006 17:08:32 -0000	1.84
X+++ gnu/usr.bin/cc/cc_tools/Makefile	5 Apr 2007 01:56:32 -0000
X@@ -1,210 +1,17 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.84 2006/09/18 17:08:32 imp Exp $
X-
X .include <bsd.own.mk>
X 
X-#
X-# This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
X-# is such a !@#!*#% nightmare because of how it reprograms the dependencies,
X-# suffix rules, SRCS, etc.  It's easiest to cheat by using bsd.prog.mk and
X-# SRCS to get dependencies.
X-#
X-
X-#
X-# ../Makefile.inc will put an absolute path to our objdir in CFLAGS.
X-# Prevent mkdep from using it, so that we don't have to give rules for
X-# aliases of generated headers.
X-#
X CFLAGS+=	-I.
X 
X .include "../Makefile.inc"
X 
X-.PATH: ${GCCDIR} ${GCCDIR}/f
X-
X-CFLAGS+=	-DGENERATOR_FILE
X-
X-#
X-#-----------------------------------------------------------------------
X-# Build 'pocket' libiberty exclusively for build tools use.
X-
X-LIBIBERTY_SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
X-	dyn-string.c fibheap.c getpwd.c getruntime.c hashtab.c hex.c \
X-	lbasename.c make-temp-file.c md5.c obstack.c partition.c pex-unix.c \
X-	physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c
X-LIBIBERTY_OBJS=	${LIBIBERTY_SRCS:R:S/$/.o/g}
X-
X-SRCS+=	${LIBIBERTY_SRCS}
X-
X-LIBIBERTY=libiberty.a
X-${LIBIBERTY}: ${LIBIBERTY_OBJS}
X-	@rm -f ${.TARGET}
X-	@${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q`
X-	${RANLIB} ${.TARGET}
X-CLEANFILES+=	${LIBIBERTY}
X-
X-#
X-#-----------------------------------------------------------------------
X-# options
X-OPTION_FILES=${GCCDIR}/f/lang.opt ${GCCDIR}/c.opt ${GCCDIR}/common.opt
X+CFLAGS+=	-g
X+CFLAGS+=	-DGENERATOR_FILE -DAVE_CONFIG_H
X 
X-.ORDER: options.h options.c
X-options.h options.c: opts.sh ${OPTION_FILES}
X-	/bin/sh ${GCCDIR}/opts.sh mv options.c options.h ${OPTION_FILES}
X+# Override LIBIBERTY set by Makefile.inc, We use our own for
X+# build tools.
X+LIBIBERTY=	libiberty.a
X 
X-GENSRCS+=	options.c options.h
X-CLEANFILES+=	options.c options.h
X-
X-#-----------------------------------------------------------------------
X-# insn-* gunk
X-
X-.for F in attr codes config flags constants
X-insn-$F.h: gen$F ${MD_FILE}
X-	./gen$F ${MD_FILE} > insn-$F.h
X-GENSRCS+=	insn-$F.h
X-.endfor
X-
X-.for F in conditions
X-insn-$F.c: gen$F ${MD_FILE}
X-	./gen$F ${MD_FILE} > insn-$F.c
X-GENSRCS+=	insn-$F.c
X-.endfor
X-
X-GENSRCS+=	gen-time-stamp
X-gen-time-stamp: genattr genattrtab genconditions genconstants genemit \
X-		genextract gengtype genopinit genoutput genpeep genrecog
X-	touch ${.TARGET}
X-
X-.for F in attr codes config emit extract flags opinit output peep recog
X-gen$F: gen$F.o rtl.o print-rtl.o bitmap.o gensupport.o  ggc-none.o \
X-	read-rtl.o insn-conditions.o min-insn-modes.o errors.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-
X-GENSRCS+=	gen$F.c
X-CLEANFILES+=	gen$F
X-.endfor
X-
X-#
X-# genattrtab needs more complex build rule
X-#
X-genattrtab : genattrtab.o rtl.o print-rtl.o bitmap.o gensupport.o ggc-none.o \
X-	read-rtl.o insn-conditions.o genautomata.o varray.o min-insn-modes.o \
X-	errors.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
X-
X-GENSRCS+=	genattrtab.c
X-CLEANFILES+=	genattrtab
X-
X-#
X-# genconstants and genconditions cannot depend on insn-conditions.o
X-# they should be liked with dummy-conditions.o stubs instead
X-#
X-.for F in constants conditions
X-gen$F: gen$F.o rtl.o bitmap.o gensupport.o ggc-none.o read-rtl.o dummy-conditions.o min-insn-modes.o errors.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-
X-GENSRCS+=	gen$F.c
X-CLEANFILES+=	gen$F
X-.endfor
X-
X-.for F in modes check genrtl preds
X-gen$F: gen$F.o errors.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-
X-GENSRCS+=	gen$F.c
X-CLEANFILES+=	gen$F
X-.endfor
X-
X-.ORDER: genrtl.c genrtl.h
X-genrtl.c genrtl.h: gengenrtl
X-	./gengenrtl > genrtl.c
X-	./gengenrtl -h > genrtl.h
X-
X-GENSRCS+=	genrtl.c genrtl.h
X-
X-SRCS+=	bitmap.c dummy-conditions.c errors.c genautomata.c gensupport.c \
X-	ggc-none.c print-rtl.c read-rtl.c rtl.c varray.c
X-
X-#-----------------------------------------------------------------------
X-# insn modes stuff.
X-
X-.ORDER: insn-modes.c insn-modes.h
X-insn-modes.h: genmodes
X-	./genmodes -h > insn-modes.h
X-
X-insn-modes.c: genmodes
X-	./genmodes > insn-modes.c
X-
X-min-insn-modes.c: genmodes
X-	./genmodes -m > min-insn-modes.c
X-
X-GENSRCS+= insn-modes.c min-insn-modes.c insn-modes.h
X-
X-#-----------------------------------------------------------------------
X-# Common parser stuff.
X-
X-tree-check.h: gencheck
X-	./gencheck > ${.TARGET}
X-GENSRCS+=	tree-check.h
X-
X-#-----------------------------------------------------------------------
X-# Predicates stuff.
X-
X-tm-preds.h: genpreds
X-	./genpreds > ${.TARGET}
X-GENSRCS+=	tm-preds.h
X-
X-#-----------------------------------------------------------------------
X-# Gengtype
X-
X-gengtype-lex.c : gengtype-lex.l
X-	${LEX} -t  ${.ALLSRC} | \
X-	sed 's/^\(char msg\[\];\)/yyconst \1/' > ${.TARGET}
X-
X-.ORDER: gengtype-yacc.c gengtype-yacc.h
X-gengtype-yacc.c gengtype-yacc.h: gengtype-yacc.y
X-	${YACC} -d -o gengtype-yacc.c ${.ALLSRC}
X-
X-GENSRCS+=	gengtype-yacc+%DIKED.c gengtype-yacc.h gengtype-lex.c
X-CLEANFILES+=	gengtype-yacc.c
X-
X-gengtype-yacc+%DIKED.c: gengtype-yacc.c
X-	cat    ${.ALLSRC} > ${.TARGET}
X-	sed -e "s/xmalloc/malloc/g" \
X-	    -e "s/xrealloc/realloc/g" \
X-	    -e "s/malloc/xmalloc/g" \
X-	    -e "s/realloc/xrealloc/g" \
X-	    ${.ALLSRC} > ${.TARGET}
X-
X-gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-
X-GENSRCS+=	gengtype.c
X-CLEANFILES+=	gengtype
X-
X-gengtype-lex.o: gengtype-yacc.h
X-
X-.ORDER: gtype-desc.c gtype-desc.h
X-gtype-desc.c gtype-desc.h: gtype-time-stamp
X-	@true
X-
X-GENSRCS+=	gtype-time-stamp
X-gtype-time-stamp: gengtype ${GTFILES}
X-	./gengtype
X-	touch ${.TARGET}
X-
X-GENSRCS+=	gtype-desc.c gtype-desc.h
X-CLEANFILES+=	gt-*.h gtype-*.h
X-
X-#
X-#-----------------------------------------------------------------------
X-# Fortran build tools
X-
X-.if ${MK_FORTRAN} != "no"
X-gen-time-stamp: fini
X-fini: fini.o ${LIBIBERTY}
X-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X-SRCS+=		fini.c
X-CLEANFILES+=	fini
X-.endif
X+.PATH:	${GCCDIR} ${GCCLIB}/libiberty
X 
X #-----------------------------------------------------------------------
X # Determine content of variables used by the target/host config files
X@@ -212,8 +19,9 @@
X #
X # The list of headers to go into tm.h
X #
X+TARGET_INC+=	options.h
X .if ${TARGET_ARCH} == "amd64"
X-TARGET_INC=	i386/biarch64.h
X+TARGET_INC+=	i386/biarch64.h
X .endif
X .if ${TARGET_ARCH} != "arm"
X TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
X@@ -222,92 +30,89 @@
X TARGET_INC+=	${GCC_CPU}/unix.h
X TARGET_INC+=	${GCC_CPU}/att.h
X .endif
X-.if ${TARGET_ARCH} != "alpha"
X TARGET_INC+=	dbxelf.h
X TARGET_INC+=	elfos.h
X-.endif
X TARGET_INC+=	freebsd-native.h
X TARGET_INC+=	freebsd-spec.h
X TARGET_INC+=	freebsd.h
X-.if ${TARGET_ARCH} == "alpha"
X-TARGET_INC+=	${GCC_CPU}/elf.h
X-.endif
X .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
X .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h)
X TARGET_INC+=	${GCC_CPU}/sysv4.h
X .endif
X .endif
X-.if ${TARGET_ARCH} == "arm"
X-TARGET_INC+=	${GCC_CPU}/elf.h
X-TARGET_INC+=	${GCC_CPU}/aout.h
X-TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
X-. if defined(TARGET_BIG_ENDIAN)
X-CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
X-. endif
X-.endif
X-.if ${TARGET_ARCH} == "arm"
X-TARGET_INC+=	freebsd-diked.h
X-.else
X-TARGET_INC+=	${GCC_CPU}/freebsd.h
X-.endif
X .if ${TARGET_ARCH} == "amd64"
X TARGET_INC+=	${GCC_CPU}/x86-64.h
X+TARGET_INC+=	${GCC_CPU}/freebsd.h
X TARGET_INC+=	${GCC_CPU}/freebsd64.h
X TARGET_INC+=	freebsd64-fix.h
X-.endif
X-.if ${TARGET_ARCH} == "powepc"
X-TARGET_INC+=	altivec-defs.h
X+.elif ${TARGET_ARCH} == "arm"
X+TARGET_INC+=	${GCC_CPU}/elf.h
X+TARGET_INC+=	${GCC_CPU}/aout.h
X+TARGET_INC+=	${GCC_CPU}/freebsd.h
X+TARGET_INC+=	${GCC_CPU}/arm.h
X+.else
X+TARGET_INC+=	${GCC_CPU}/freebsd.h
X .endif
X TARGET_INC+=	defaults.h
X 
X-#
X-# Use TARGET_INC as a template and build a list of target specific
X-# include files for gengtype to scan
X-#
X-GCONFIG_H=	${.CURDIR}/auto-host.h
X-
X .for H in ${TARGET_INC}
X .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR}
X .if exists($D/$H)
X-GCONFIG_H+=	$D/$H
X+TARGET_INC_FILES+=     $D/$H
X .endif
X .endfor
X .endfor
X 
X #
X-# Define some variables to make blocks copied from Makefile.in happy
X+# gtyp includes.
X #
X srcdir=		${GCCDIR}
X-HASHTAB_H=	${GCCDIR}/hashtab.h
X-SPLAY_TREE_H=	${GCCDIR}/splay-tree.h
X-out_file=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.c
X-GTFILES_SRCDIR=	${GCCDIR}
X+CPPLIB_H=	${GCCLIB}/libcpp/include/line-map.h \
X+		${GCCLIB}/libcpp/include/cpplib.h
X+SYMTAB_H=	${GCCLIB}/libcpp/include/symtab.h
X+CPP_ID_DATA_H=	${CPPLIB_H} ${GCCLIB}/libcpp/include/cpp-id-data.h
X+HASHTAB_H=	${GCCLIB}/include/hashtab.h
X+SPLAY_TREE_H=	${GCCLIB}/include/splay-tree.h
X+out_file=	${srcdir}/config/${GCC_CPU}/${GCC_CPU}.c
X+tm_file_list=	${TARGET_INC_FILES}
X+host_xm_file_list= ${.CURDIR}/auto-host.h ${GCCLIB}/include/ansidecl.h
X+GTFILES_SRCDIR=	${srcdir}
X 
X-#
X # Copied unchanged from gcc/Makefile.in
X-#
X-GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \
X-  $(GCONFIG_H) $(HASHTAB_H) $(SPLAY_TREE_H) \
X-  $(srcdir)/bitmap.h $(srcdir)/coverage.c $(srcdir)/function.h  $(srcdir)/rtl.h \
X-  $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/libfuncs.h $(srcdir)/hashtable.h \
X-  $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h \
X+GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h \
X+  $(CPP_ID_DATA_H) $(host_xm_file_list) \
X+  $(tm_file_list) $(HASHTAB_H) $(SPLAY_TREE_H) $(srcdir)/bitmap.h \
X+  $(srcdir)/coverage.c $(srcdir)/function.h $(srcdir)/rtl.h \
X+  $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/libfuncs.h $(SYMTAB_H) \
X+  $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h $(srcdir)/hwint.h \
X+  $(srcdir)/ipa-reference.h \
X   $(srcdir)/cselib.h $(srcdir)/basic-block.h  $(srcdir)/cgraph.h \
X-  $(srcdir)/c-common.h $(srcdir)/c-tree.h \
X+  $(srcdir)/c-common.h $(srcdir)/c-tree.h $(srcdir)/reload.h \
X   $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
X+  $(srcdir)/ipa-prop.c $(srcdir)/ipa-cp.c $(srcdir)/cgraphunit.c \
X   $(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
X-  $(srcdir)/dojump.c \
X+  $(srcdir)/dojump.c $(srcdir)/tree-profile.c \
X   $(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
X-  $(srcdir)/fold-const.c $(srcdir)/function.c \
X+  $(srcdir)/function.c $(srcdir)/except.h \
X   $(srcdir)/gcse.c $(srcdir)/integrate.c $(srcdir)/lists.c $(srcdir)/optabs.c \
X-  $(srcdir)/profile.c $(srcdir)/ra-build.c $(srcdir)/regclass.c \
X-  $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c $(srcdir)/langhooks.c \
X-  $(srcdir)/sdbout.c $(srcdir)/stmt.c $(srcdir)/stor-layout.c \
X+  $(srcdir)/profile.c $(srcdir)/regclass.c \
X+  $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c \
X+  $(srcdir)/sdbout.c $(srcdir)/stor-layout.c \
X   $(srcdir)/stringpool.c $(srcdir)/tree.c $(srcdir)/varasm.c \
X-  $(out_file)
X+  $(srcdir)/tree-mudflap.c $(srcdir)/tree-flow.h \
X+  $(srcdir)/c-objc-common.c $(srcdir)/c-common.c $(srcdir)/c-parser.c \
X+  $(srcdir)/tree-ssanames.c $(srcdir)/tree-eh.c $(srcdir)/tree-ssa-address.c \
X+  $(srcdir)/tree-phinodes.c $(srcdir)/tree-cfg.c \
X+  $(srcdir)/tree-dfa.c $(srcdir)/tree-ssa-propagate.c \
X+  $(srcdir)/tree-iterator.c $(srcdir)/gimplify.c \
X+  $(srcdir)/tree-chrec.h $(srcdir)/tree-vect-generic.c \
X+  $(srcdir)/tree-ssa-operands.h $(srcdir)/tree-ssa-operands.c \
X+  $(srcdir)/tree-profile.c $(srcdir)/tree-nested.c \
X+  $(srcdir)/ipa-reference.c $(srcdir)/tree-ssa-structalias.h \
X+  $(srcdir)/tree-ssa-structalias.c \
X+  $(srcdir)/targhooks.c $(out_file)
X 
X-#
X-# Build a list of frontend directories to look into
X-#
X+# The list of frontend directories to look into
X GTFILES_LANG_DIR_NAMES=
X 
X .if ${MK_CXX} != "no"
X@@ -318,13 +123,7 @@
X GTFILES_LANG_DIR_NAMES+=	objc
X .endif
X 
X-.if ${MK_FORTRAN} != "no"
X-GTFILES_LANG_DIR_NAMES+=	f
X-.endif
X-
X-#
X-# Build a list of language specific files for gengtype
X-#
X+# The list of language specific files for gengtype
X .for L in ${GTFILES_LANG_DIR_NAMES} c
X .if exists(${GCCDIR}/$L-config-lang.in)
X # Source the language config file
X@@ -339,167 +138,340 @@
X .endfor
X GTFILES+=	${GTFILES_FILES}
X 
X-#-----------------------------------------------------------------------
X-# the host/target compiler config.
X+#
X+# Tree definition files.
X+#
X+TREE_DEF_FILES=
X 
X-COMMONHDRS=	bconfig.h config.h configargs.h gencheck.h multilib.h \
X-		specs.h safe-ctype.h tconfig.h tm.h tm_p.h gcov-iov.h \
X-		gtyp-gen.h
X-GENSRCS+=	${COMMONHDRS}
X+.if ${MK_CXX} != "no"
X+TREE_DEF_FILES+=	cp/cp-tree.def
X+.endif
X 
X-MFILE?=	${.CURDIR}/Makefile
X-${COMMONHDRS}: ${MFILE}
X+.if ${MK_OBJC} != "no"
X+TREE_DEF_FILES+=	objc/objc-tree.def
X+.endif
X 
X-configargs.h:
X-	echo 'static const char configuration_arguments[] ='	> ${.TARGET}
X-	echo '	"FreeBSD/${TARGET_ARCH} system compiler";'	>> ${.TARGET}
X-	echo 'static const char thread_model[] = "posix";'	>> ${.TARGET}
X-	echo 'static const struct {'				>> ${.TARGET}
X-	echo '	const char *name, *value;'			>> ${.TARGET}
X-	echo '} configure_default_options[] = {'		>> ${.TARGET}
X-	echo '	{ "NULL", "NULL" } };'				>> ${.TARGET}
X+#
X+# Option files.
X+#
X+OPT_FILES=	c.opt common.opt
X 
X-tconfig.h:
X-	echo '#ifndef GCC_TCONFIG_H'			> ${.TARGET}
X-	echo '#define GCC_TCONFIG_H'			>> ${.TARGET}
X-	echo '#ifdef IN_GCC'				>> ${.TARGET}
X-	echo '# include "ansidecl.h"'			>> ${.TARGET}
X-	echo '#endif'					>> ${.TARGET}
X-	echo '#define USED_FOR_TARGET'			>> ${.TARGET}
X-	echo '#endif /* GCC_TCONFIG_H */'		>> ${.TARGET}
X+.if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt)
X+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt
X+.endif
X+
X+.if exists(${.CURDIR}/${GCC_CPU}-freebsd.opt)
X+OPT_FILES+=	${.CURDIR}/${GCC_CPU}-freebsd.opt
X+.endif
X 
X+.if ${TARGET_ARCH} == "powerpc"
X+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/sysv4.opt
X+.endif
X+
X+.if ${TARGET_ARCH} == "sparc64"
X+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/long-double-switch.opt
X+.endif
X+
X+.if exists(${.CURDIR}/freebsd.opt)
X+OPT_FILES+=	${.CURDIR}/freebsd.opt
X+.endif
X+
X+#-----------------------------------------------------------------------
X+# Build rules for header files and generator tools
X+
X+# Host config
X+config.h:
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="auto-host.h ansidecl.h" \
X+	DEFINES="" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
X+
X+GENSRCS+=	config.h
X+CLEANFILES+=	cs-config.h
X+
X+# Build config
X bconfig.h:
X-	echo '#ifndef GCC_BCONFIG_H'			> ${.TARGET}
X-	echo '#define GCC_BCONFIG_H'			>> ${.TARGET}
X-	echo '#include "auto-host.h"'			>> ${.TARGET}
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="auto-host.h ansidecl.h" \
X+	DEFINES="" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
X .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
X 	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
X .endif
X-	echo '#ifdef IN_GCC'				>> ${.TARGET}
X-	echo '# include "ansidecl.h"'			>> ${.TARGET}
X-	echo '#endif'					>> ${.TARGET}
X-	echo '#endif /* GCC_BCONFIG_H */'		>> ${.TARGET}
X-
X-gencheck.h:
X-	echo '#include "cp/cp-tree.def"'		> ${.TARGET}
X-	echo '#include "objc/objc-tree.def"'		>> ${.TARGET}
X-
X-multilib.h:
X-	echo 'static const char *const multilib_raw[] = { \
X-	    "aout maout;", "elf !maout;", NULL };'	> ${.TARGET}
X-	echo 'static const char *const multilib_matches_raw[] = { \
X-	    "maout maout;", "melf melf;", NULL };'	>> ${.TARGET}
X-	echo 'static const char *multilib_extra = "";'	>> ${.TARGET}
X-	echo 'static const char *multilib_options = "";'>> ${.TARGET}
X-	echo 'static const char *const multilib_exclusions_raw[] = { \
X-	    NULL };'					>> ${.TARGET}
X 
X-specs.h:
X-	echo '#include "cp/lang-specs.h"'		> ${.TARGET}
X-	echo '#include "f/lang-specs.h"'		>> ${.TARGET}
X-	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
X+GENSRCS+=	bconfig.h
X+CLEANFILES+=	cs-bconfig.h
X 
X-config.h: bconfig.h
X-	echo '#include <bconfig.h>'			> ${.TARGET}
X+# tconfig.h
X+tconfig.h:
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="auto-host.h ansidecl.h" \
X+	DEFINES="USED_FOR_TARGET" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
X+
X+GENSRCS+=	tconfig.h
X+CLEANFILES+=	cs-tconfig.h
X+# Options
X+optionlist: ${OPT_FILES}
X+	awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET}
X+
X+options.h:	optionlist
X+	awk -f ${GCCDIR}/opt-functions.awk \
X+	    -f ${GCCDIR}/opth-gen.awk \
X+		< ${.ALLSRC} > ${.TARGET}
X+
X+options.c:	optionlist
X+	awk -f ${GCCDIR}/opt-functions.awk \
X+	    -f ${GCCDIR}/optc-gen.awk \
X+		-v header_name="config.h system.h coretypes.h tm.h" \
X+		< ${.ALLSRC} > ${.TARGET}
X+GENSRCS+=	optionlist options.h options.c
X 
X+# Target machine config
X tm.h:
X-	echo '#ifndef GCC_TM_H'				> ${.TARGET}
X-	echo '#define GCC_TM_H'				>> ${.TARGET}
X-.if defined(TARGET_CPU_DEFAULT)
X-	echo "#define TARGET_CPU_DEFAULT (${TARGET_CPU_DEFAULT})" >> ${.TARGET}
X-.endif
X-	echo '#ifdef IN_GCC'				>> ${.TARGET}
X-.for H in ${TARGET_INC}
X-	echo '#include "$H"'				>> ${.TARGET}
X-.endfor
X-	echo '#if !defined GENERATOR_FILE && !defined USED_FOR_TARGET' >> ${.TARGET}
X-	echo '# include "insn-constants.h"'		>> ${.TARGET}
X-	echo '# include "insn-flags.h"'			>> ${.TARGET}
X-	echo '#endif'					>> ${.TARGET}
X-	echo '#endif'					>> ${.TARGET}
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="${TARGET_INC}" \
X+	DEFINES="" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
X .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
X 	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
X .endif
X-	echo '#endif /* GCC_TM_H */'			>> ${.TARGET}
X 
X+GENSRCS+=	tm.h
X+CLEANFILES+=	cs-tm.h
X+
X+# Target machine protos/preds.
X tm_p.h:
X-	echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"'	>> ${.TARGET}
X-	echo '#include "tm-preds.h"'				>> ${.TARGET}
X+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
X+	HEADERS="${GCC_CPU}/${GCC_CPU}-protos.h tm-preds.h" \
X+	DEFINES="" \
X+	/bin/sh ${GCCDIR}/mkconfig.sh tm_p.h
X+
X+GENSRCS+=	tm_p.h
X+CLEANFILES+=	cs-tm_p.h
X+
X+# gencheck
X+gencheck.h:
X+.for F in ${TREE_DEF_FILES}
X+	echo "#include \"$F\""					>> ${.TARGET}
X+.endfor
X 
X-safe-ctype.h:
X-	echo '#include <ctype.h>'				> ${.TARGET}
X-.for Z in TOUPPER TOLOWER ISDIGIT ISXDIGIT ISUPPER ISLOWER ISALPHA ISALNUM \
X-    ISSPACE ISPUNCT ISGRAPH ISBLANK ISPRINT ISCNTRL
X-	echo '#define ${Z}	${Z:L}'				>> ${.TARGET}
X-.endfor
X-	echo "#define ISIDST(x)		\
X-		((x) == '_' || isalpha(x))"			>> ${.TARGET}
X-	echo "#define ISIDNUM(x)	\
X-		(isdigit(x) || ISIDST(x))"			>> ${.TARGET}
X-	echo "#define IS_VSPACE(x)	\
X-		((x) == '\n' || (x) == '\r')"			>> ${.TARGET}
X-	echo "#define IS_NVSPACE(x)	\
X-		(!IS_VSPACE(x) && (isspace(x) || (x) == '\0'))"	>> ${.TARGET}
X-	echo "#define IS_SPACE_OR_NUL(x)	\
X-		(isspace(x) || (x) == '\0')"			>> ${.TARGET}
X+GENSRCS+=	gencheck.h
X 
X-gtyp-gen.h:
X+
X+# Source header for gtyp generator.
X+gtyp-gen.h:	${GTFILES}
X 	echo "/* This file is machine generated.  Do not edit.  */" > ${.TARGET}
X-	echo "static const char *srcdir = "			>> ${.TARGET}
X+	echo "static const char * const srcdir = "		>> ${.TARGET}
X 	echo "\"$(GTFILES_SRCDIR)\";"				>> ${.TARGET}
X-	echo "static const char *lang_files[] = {"		>> ${.TARGET}
X+	echo "static const char * const lang_files[] = {"	>> ${.TARGET}
X .for F in ${GTFILES_FILES}
X 	echo "\"$F\", "						>> ${.TARGET}
X .endfor
X 	echo "NULL};"						>> ${.TARGET}
X-	echo "static const char *langs_for_lang_files[] = {"	>> ${.TARGET}
X+	echo "static const char * const langs_for_lang_files[] = {">> ${.TARGET}
X .for F in ${GTFILES_LANGS}
X 	echo "\"$F\", "						>> ${.TARGET}
X .endfor
X 	echo "NULL};"						>> ${.TARGET}
X-	echo "static const char *all_files[] = {"		>> ${.TARGET}
X+	echo "static const char * const all_files[] = {"	>> ${.TARGET}
X .for F in ${GTFILES}
X 	echo "\"$F\", "						>> ${.TARGET}
X .endfor
X 	echo "NULL};"						>> ${.TARGET}
X-	echo "static const char *lang_dir_names[] = { \"c\", "	>> ${.TARGET}
X-.for F in ${GTFILES_LANG_DIR_NAMES}
X+	echo "static const char * const lang_dir_names[] = {"	>> ${.TARGET}
X+.for F in c ${GTFILES_LANG_DIR_NAMES}
X 	echo "\"$F\", "						>> ${.TARGET}
X .endfor
X 	echo "NULL};"						>> ${.TARGET}
X 
X+GENSRCS+=	gtyp-gen.h
X+
X+# Version header for gcov
X gcov-iov.h:
X-	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET}
X+	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x34303170)" >> ${.TARGET}
X+
X+GENSRCS+=	gcov-iov.h
X+
X+# Multilib config file
X+multilib.h:
X+	echo 'static const char *const multilib_raw[] = { \
X+	    "aout maout;", "elf !maout;", NULL };'	> ${.TARGET}
X+	echo 'static const char *const multilib_matches_raw[] = { \
X+	    "maout maout;", "melf melf;", NULL };'	>> ${.TARGET}
X+	echo 'static const char *multilib_extra = "";'	>> ${.TARGET}
X+	echo 'static const char *multilib_options = "";'>> ${.TARGET}
X+	echo 'static const char *const multilib_exclusions_raw[] = { \
X+	    NULL };'					>> ${.TARGET}
X+
X+GENSRCS+=	multilib.h
X+
X+configargs.h:
X+	echo 'static const char configuration_arguments[] ='	> ${.TARGET}
X+	echo '	"FreeBSD/${TARGET_ARCH} system compiler";'	>> ${.TARGET}
X+	echo 'static const char thread_model[] = "posix";'	>> ${.TARGET}
X+	echo 'static const struct {'				>> ${.TARGET}
X+	echo '	const char *name, *value;'			>> ${.TARGET}
X+	echo '} configure_default_options[] = {'		>> ${.TARGET}
X+	echo '	{ "NULL", "NULL" } };'				>> ${.TARGET}
X+
X+GENSRCS+=	configargs.h
X+
X+# Language spec files
X+specs.h:
X+	echo '#include "cp/lang-specs.h"'		> ${.TARGET}
X+	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
X+
X+GENSRCS+=	specs.h
X+
X+# Linked headers
X+gthr-default.h: ${GCCDIR}/gthr-posix.h
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+GENSRCS+=	gthr-default.h
X+
X+unwind.h: ${GCCDIR}/unwind-generic.h
X+	ln -sf ${.ALLSRC} ${.TARGET}
X+
X+GENSRCS+=	unwind.h
X+
X+#
X+# gtype gunk
X+#
X+gengtype-lex.c:	gengtype-lex.l
X+	flex -ogengtype-lex.c ${.ALLSRC}
X+
X+gengtype-yacc.h: gengtype-yacc.y
X+	yacc -d -o gengtype-yacc.c ${.ALLSRC}
X+
X+gengtype-yacc.c: gengtype-yacc.h
X+
X+gengtype-yacc+%DIKED.c: gengtype-yacc.c
X+	cat    ${.ALLSRC} > ${.TARGET}
X+	sed -e "s/xmalloc/malloc/g" \
X+	    -e "s/xrealloc/realloc/g" \
X+	    -e "s/malloc/xmalloc/g" \
X+	    -e "s/realloc/xrealloc/g" \
X+	    ${.ALLSRC} > ${.TARGET}
X+
X+GENSRCS+= gengtype-lex.c gengtype-yacc.h gengtype-yacc+%DIKED.c
X+CLEANFILES+= gengtype-yacc.c
X+
X+gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o errors.o \
X+	  ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X+
X+gtype-desc.h:	gengtype
X+	./gengtype
X+	touch ${.TARGET}
X+
X+gtype-desc.c:	gtype-desc.h
X+
X+GENSRCS+=	gtype-desc.c gtype-desc.h
X+CLEANFILES+=	gt-*.h gtype-*.h
X+
X+#
X+# Generator tools.
X+#
X+.for F in check checksum genrtl modes
X+gen$F:	gen$F.o errors.o ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X+.endfor
X+
X+.for F in conditions constants preds
X+gen$F:	gen$F.o gensupport.o dummy-conditions.o rtl.o read-rtl.o ggc-none.o \
X+	min-insn-modes.o errors.o ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X+.endfor
X+
X+.for F in attr codes config flags extract emit opinit output peep recog
X+gen$F:	gen$F.o gensupport.o insn-conditions.o rtl.o read-rtl.o ggc-none.o \
X+	min-insn-modes.o errors.o print-rtl.o ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
X+.endfor
X+
X+genattrtab:	genattrtab.o genautomata.o gensupport.o insn-conditions.o \
X+	rtl.o read-rtl.o ggc-none.o min-insn-modes.o errors.o print-rtl.o \
X+	varray.o ${LIBIBERTY}
X+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
X+
X+#
X+# Generated header files.
X+#
X+.for F in attr codes config constants flags
X+insn-$F.h:	gen$F
X+	./gen$F ${MD_FILE} > ${.TARGET}
X+GENSRCS+=	insn-$F.h
X+.endfor
X+
X+# Header files with irregular names.
X+genrtl.h:	gengenrtl
X+	./gengenrtl -h > ${.TARGET}
X+GENSRCS+=	genrtl.h
X+
X+tm-preds.h:	genpreds
X+	./genpreds -h ${MD_FILE} > ${.TARGET}
X+GENSRCS+=	tm-preds.h
X+
X+tree-check.h:	gencheck
X+	./gencheck > ${.TARGET}
X+GENSRCS+=	tree-check.h
X+
X+insn-modes.h:	genmodes
X+	./genmodes -h > ${.TARGET}
X+GENSRCS+=	insn-modes.h
X+
X+#
X+# Generated source files.
X+#
X+.for F in attrtab conditions extract emit opinit output peep preds recog
X+insn-$F.c:	gen$F
X+	./gen$F ${MD_FILE} > ${.TARGET}
X+GENSRCS+=	insn-$F.c
X+.endfor
X+
X+# Source files with irregular names.
X+insn-modes.c:	genmodes
X+	./genmodes > ${.TARGET}
X+GENSRCS+=	insn-modes.c
X+
X+min-insn-modes.c:	genmodes
X+	./genmodes -m > ${.TARGET}
X+GENSRCS+=	min-insn-modes.c
X+
X+genrtl.c:	gengenrtl
X+	./gengenrtl > ${.TARGET}
X+GENSRCS+=	genrtl.c
X 
X-.if ${TARGET_ARCH} == "arm"
X-freebsd-diked.h: ${GCCDIR}/../../gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff
X-	cp ${GCCDIR}/config/arm/freebsd.h freebsd.h
X-	patch freebsd.h ${.ALLSRC}
X-	mv freebsd.h ${.TARGET}
X-COMMONHDRS+=	freebsd-diked.h
X-CLEANFILES+=    freebsd.h.orig
X-
X-# Make sure freebsd-diked.h is built when tm.h is built for csu's sake
X-tm.h:	freebsd-diked.h
X-
X-${MD_FILE}: ${MFILE}
X-	cp ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md .
X-	ln -sf ${GCCDIR}/config/${GCC_CPU}/fpa.md .
X-	ln -sf ${GCCDIR}/config/${GCC_CPU}/cirrus.md .
X-	ln -sf ${GCCDIR}/config/${GCC_CPU}/iwmmxt.md .
X-	patch ${GCC_CPU}.md ${.CURDIR}/arm.md.diff
X-	mv ${GCC_CPU}.md ${.TARGET}
X-CLEANFILES+=	arm-diked.md ${GCC_CPU}.md.orig fpa.md cirrus.md iwmmxt.md
X-.endif
X #-----------------------------------------------------------------------
X-# General things.
X+# Build tools.
X 
X-SRCS+=		${GENSRCS}
X-CLEANFILES+=	${GENSRCS}
X+GNTOOLS+=	genattr genattrtab gencodes gencheck genchecksum genconditions \
X+		genconfig genconstants genemit genextract genflags gengenrtl \
X+		gengtype genmodes genopinit genoutput genpeep genpreds genrecog
X 
X-all:		${SRCS}
X+all: ${GNTOOLS} ${GENSRCS}
X 
X-.include <bsd.prog.mk>
X+#
X+#-----------------------------------------------------------------------
X+# Build 'pocket' libiberty exclusively for build tools use.
X+
X+LIBIBERTY_SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
X+	dyn-string.c fibheap.c fopen_unlocked.c getpwd.c getruntime.c \
X+	hashtab.c hex.c lbasename.c make-temp-file.c md5.c obstack.c \
X+	partition.c pex-unix.c physmem.c safe-ctype.c splay-tree.c xexit.c \
X+	xmalloc.c xmemdup.c xstrdup.c xstrerror.c
X+LIBIBERTY_OBJS=	${LIBIBERTY_SRCS:R:S/$/.o/g}
X+
X+SRCS+=	${LIBIBERTY_SRCS}
X+
X+${LIBIBERTY_OBJS}: config.h
X+
X+${LIBIBERTY}: ${LIBIBERTY_OBJS}
X+	@rm -f ${.TARGET}
X+	@${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q`
X+	${RANLIB} ${.TARGET}
X+CLEANFILES+=	${LIBIBERTY} ${LIBIBERTY_OBJS}
X 
X #-----------------------------------------------------------------------
X # Fixups.
X@@ -507,47 +479,25 @@
X # Set OBJS the same as bsd.prog.mk would do if we defined PROG.  We can't
X # define PROG because we have multiple programs.
X #
X-OBJS+=		${SRCS:N*.h:R:S/$/.o/g}
X-CLEANFILES+=	${OBJS}
X+SRCS=		dummy-conditions.c errors.c genattr.c genattrtab.c \
X+		genautomata.c gencheck.c genchecksum.c gencodes.c \
X+		genconditions.c genconfig.c genconstants.c genemit.c \
X+		genextract.c genflags.c gengenrtl.c gengtype.c genmodes.c \
X+		genopinit.c genoutput.c genpeep.c genpreds.c genrecog.c \
X+		gensupport.c ggc-none.c print-rtl.c read-rtl.c rtl.c varray.c
X 
X-.if !exists(${DEPENDFILE})
X-# Fudge pre-dependfile dependencies of objects in much the same way as
X-# bsd.prog.mk would do if we defined PROG.
X+SRCS+=		${GENSRCS}
X+
X+OBJS+=		${SRCS:N*.h:R:S/$/.o/g}
X 
X-${OBJS}: ${COMMONHDRS}
X+GENOBJS+=	${GENSRCS:N*.h:R:S/$/.o/g}
X 
X-dummy-conditions.o:
X-gencheck.o:
X-genmodes.o:
X-
X-genpreds.o: insn-modes.h
X-genconstants.o: insn-modes.h genrtl.h
X-gengtype.o: insn-modes.h genrtl.h gtyp-gen.h
X-rtl.o: insn-modes.h gtype-desc.h genrtl.h
X-bitmap.o: insn-modes.h gtype-desc.h genrtl.h
X-ggc-none.o: gtype-desc.h
X-gensupport.o: insn-modes.h genrtl.h
X-varray.o: gtype-desc.h
X-genautomata.o: insn-modes.h genrtl.h
X-genconditions.o: insn-modes.h genrtl.h
X-gencodes.o: insn-modes.h genrtl.h
X-genconfig.o: insn-modes.h genrtl.h
X-print-rtl.o: insn-modes.h genrtl.h tm-preds.h tree-check.h
X-read-rtl.o: insn-modes.h genrtl.h
X-genattr.o: insn-modes.h genrtl.h
X-genemit.o: insn-modes.h genrtl.h
X-genflags.o: insn-modes.h genrtl.h
X-genopinit.o: insn-modes.h genrtl.h
X-genoutput.o: insn-modes.h genrtl.h
X-genpeep.o: insn-modes.h genrtl.h
X-genrecog.o: insn-modes.h genrtl.h
X-genextract.o: genrtl.h insn-config.h
X-genattrtab.o: insn-modes.h gtype-desc.h genrtl.h
X-genrtl.o: insn-modes.h genrtl.h gtype-desc.h
X-
X-insn-conditions.o: insn-constants.h tm-preds.h
X-insn-modes.o: insn-modes.h
X-min-insn-modes.o: insn-modes.h
X-gtype-desc.o: insn-modes.h insn-config.h insn-codes.h tree-check.h
X+CLEANFILES+=	${GENSRCS} ${GENOBJS} ${GNTOOLS}
X 
X+#-----------------------------------------------------------------------
X+# Manual dependencies.
X+.if !exists(${DEPENDFILE})
X+.include  "Makefile.dep"
X .endif
X+
X+.include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/cc_tools/auto-host.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v
Xretrieving revision 1.19
Xdiff -u -r1.19 auto-host.h
X--- gnu/usr.bin/cc/cc_tools/auto-host.h	22 Jul 2006 14:12:02 -0000	1.19
X+++ gnu/usr.bin/cc/cc_tools/auto-host.h	17 Dec 2006 06:49:27 -0000
X@@ -1,591 +1,1378 @@
X-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.19 2006/07/22 14:12:02 obrien Exp $ */
X-
X-#ifndef __FreeBSD_version
X-#include <sys/param.h>
X-#include <sys/endian.h>
X-#endif
X-
X /* auto-host.h.  Generated by configure.  */
X /* config.in.  Generated from configure.ac by autoheader.  */
X 
X-/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
X-#define BYTEORDER _BYTE_ORDER
X-
X /* Define as the number of bits in a byte, if \`limits.h' doesn't. */
X+#ifndef USED_FOR_TARGET
X /* #undef CHAR_BIT */
X+#endif
X+
X 
X /* Define 0/1 to force the choice for exception handling model. */
X+#ifndef USED_FOR_TARGET
X /* #undef CONFIG_SJLJ_EXCEPTIONS */
X+#endif
X+
X 
X /* Define to enable the use of a default assembler. */
X+#ifndef USED_FOR_TARGET
X /* #undef DEFAULT_ASSEMBLER */
X+#endif
X+
X 
X /* Define to enable the use of a default linker. */
X+#ifndef USED_FOR_TARGET
X /* #undef DEFAULT_LINKER */
X+#endif
X+
X 
X /* Define if you want to use __cxa_atexit, rather than atexit, to register C++
X    destructors for local statics and global objects. This is essential for
X    fully standards-compliant handling of destructors, but requires
X    __cxa_atexit in libc. */
X+#ifndef USED_FOR_TARGET
X #define DEFAULT_USE_CXA_ATEXIT 1
X+#endif
X 
X-/* Define to 1 if translation of program messages to the user's native
X-   language is requested. */
X-/* #undef ENABLE_NLS */
X 
X-#ifdef WANT_COMPILER_INVARIANTS
X-/* #warning WANT_COMPILER_INVARIANTS turned on */
X+/* Define if you want assertions enabled. This is a cheap check. */
X+#ifndef USED_FOR_TARGET
X+#define ENABLE_ASSERT_CHECKING 1
X+#endif
X+
X 
X /* Define if you want more run-time sanity checks. This one gets a grab bag of
X    miscellaneous but relatively cheap checks. */
X-#define ENABLE_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_CHECKING */
X+#endif
X+
X 
X /* Define if you want fold checked that it never destructs its argument. This
X    is quite expensive. */
X-#define ENABLE_FOLD_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_FOLD_CHECKING */
X+#endif
X+
X 
X /* Define if you want the garbage collector to operate in maximally paranoid
X    mode, validating the entire heap and collecting garbage at every
X    opportunity. This is extremely expensive. */
X-#define ENABLE_GC_ALWAYS_COLLECT 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_GC_ALWAYS_COLLECT */
X+#endif
X+
X 
X /* Define if you want the garbage collector to do object poisoning and other
X    memory allocation checks. This is quite expensive. */
X-#define ENABLE_GC_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_GC_CHECKING */
X+#endif
X+
X+
X+/* Define to 1 if translation of program messages to the user's native
X+   language is requested. */
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_NLS */
X+#endif
X+
X 
X /* Define if you want all operations on RTL (the basic data structure of the
X    optimizer and back end) to be checked for dynamic type safety at runtime.
X    This is quite expensive. */
X-#define ENABLE_RTL_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_RTL_CHECKING */
X+#endif
X+
X 
X /* Define if you want RTL flag accesses to be checked against the RTL codes
X    that are supported for each access macro. This is relatively cheap. */
X-#define ENABLE_RTL_FLAG_CHECKING 1
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_RTL_FLAG_CHECKING */
X+#endif
X+
X+
X+/* Define if you want runtime assertions enabled. This is a cheap check. */
X+#define ENABLE_RUNTIME_CHECKING 1
X 
X /* Define if you want all operations on trees (the basic data structure of the
X    front ends) to be checked for dynamic type safety at runtime. This is
X-   moderately expensive. */
X-#define ENABLE_TREE_CHECKING 1
X+   moderately expensive. The tree browser debugging routines will also be
X+   enabled by this option. */
X+#ifndef USED_FOR_TARGET
X+/* #undef ENABLE_TREE_CHECKING */
X+#endif
X+
X 
X /* Define if you want to run subprograms and generated programs through
X    valgrind (a memory checker). This is extremely expensive. */
X+#ifndef USED_FOR_TARGET
X /* #undef ENABLE_VALGRIND_CHECKING */
X+#endif
X 
X-#endif /* WANT_COMPILER_INVARIANTS */
X 
X-/* Define to 1 if installation paths should be looked up in Windows32
X-   Registry. Ignored on non windows32 hosts. */
X+/* Define to 1 if installation paths should be looked up in the Windows
X+   Registry. Ignored on non-Windows hosts. */
X+#ifndef USED_FOR_TARGET
X /* #undef ENABLE_WIN32_REGISTRY */
X+#endif
X+
X+
X+/* Define to the name of a file containing a list of extra machine modes for
X+   this architecture. */
X+#ifndef USED_FOR_TARGET
X+/* #undef EXTRA_MODES_FILE */
X+#endif
X+
X 
X /* Define to enable detailed memory allocation stats gathering. */
X+#ifndef USED_FOR_TARGET
X /* #undef GATHER_STATISTICS */
X+#endif
X+
X 
X /* Define to the type of elements in the array set by `getgroups'. Usually
X    this is either `int' or `gid_t'. */
X+#ifndef USED_FOR_TARGET
X #define GETGROUPS_T gid_t
X+#endif
X+
X+
X+/* Define if the zone collector is in use */
X+#ifndef USED_FOR_TARGET
X+/* #undef GGC_ZONE */
X+#endif
X+
X 
X /* Define to 1 if you have the `alphasort' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_ALPHASORT 1
X+#endif
X+
X 
X /* Define if your assembler supports dwarf2 .file/.loc directives, and
X    preserves file table indices exactly as given. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_DWARF2_DEBUG_LINE 1
X+#endif
X+
X 
X /* Define if your assembler supports explicit relocations. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_AS_EXPLICIT_RELOCS */
X+#endif
X+
X+
X+/* Define if your assembler supports fprnd. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_AS_FPRND */
X+#endif
X+
X 
X /* Define if your assembler supports the --gdwarf2 option. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_GDWARF2_DEBUG_FLAG 1
X+#endif
X+
X 
X /* Define true if the assembler supports '.long foo@GOTOFF'. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_GOTOFF_IN_DATA 1
X+#endif
X+
X 
X /* Define if your assembler supports the --gstabs option. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_GSTABS_DEBUG_FLAG 1
X+#endif
X+
X 
X /* Define if your assembler supports the Sun syntax for cmov. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_AS_IX86_CMOV_SUN_SYNTAX */
X+#endif
X+
X+
X+/* Define if your assembler supports the lituse_jsrdirect relocation. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_AS_JSRDIRECT_RELOCS */
X+#endif
X+
X 
X /* Define if your assembler supports .sleb128 and .uleb128. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_LEB128 1
X+#endif
X+
X 
X /* Define if your assembler supports ltoffx and ldxmov relocations. */
X-/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_LTOFFX_LDXMOV_RELOCS 1
X+#endif
X+
X 
X /* Define if your assembler supports mfcr field. */
X-/* #undef HAVE_AS_MFCRF */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_MFCRF 1
X+#endif
X+
X 
X /* Define if your assembler supports the -no-mul-bug-abort option. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION */
X+#endif
X+
X 
X /* Define if your assembler supports offsetable %lo(). */
X-/* #undef HAVE_AS_OFFSETABLE_LO10 */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_OFFSETABLE_LO10 1
X+#endif
X+
X+
X+/* Define if your assembler supports popcntb field. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_AS_POPCNTB */
X+#endif
X+
X 
X /* Define if your assembler supports .register. */
X-/* #undef HAVE_AS_REGISTER_PSEUDO_OP */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_REGISTER_PSEUDO_OP 1
X+#endif
X+
X+
X+/* Define if your assembler supports R_PPC_REL16 relocs. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_AS_REL16 */
X+#endif
X+
X 
X /* Define if your assembler supports -relax option. */
X-/* #undef HAVE_AS_RELAX_OPTION */
X+#ifndef USED_FOR_TARGET
X+# ifdef __sparc64__
X+#  define HAVE_AS_RELAX_OPTION 1
X+# endif
X+#endif
X+
X 
X /* Define if your assembler and linker support unaligned PC relative relocs.
X    */
X-/* #undef HAVE_AS_SPARC_UA_PCREL */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_SPARC_UA_PCREL 1
X+#endif
X+
X 
X /* Define if your assembler and linker support unaligned PC relative relocs
X    against hidden symbols. */
X-/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_AS_SPARC_UA_PCREL_HIDDEN 1
X+#endif
X+
X 
X /* Define if your assembler supports thread-local storage. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_AS_TLS 1
X+#endif
X+
X 
X /* Define to 1 if you have the `atoll' function. */
X-#if __FreeBSD_version >= 500027
X+#ifndef USED_FOR_TARGET
X #define HAVE_ATOLL 1
X #endif
X 
X+
X /* Define to 1 if you have the `atoq' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_ATOQ */
X+#endif
X+
X+
X+/* Define to 1 if you have the `clearerr_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_CLEARERR_UNLOCKED 1
X+#endif
X+
X 
X /* Define to 1 if you have the `clock' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_CLOCK 1
X+#endif
X+
X 
X /* Define if <time.h> defines clock_t. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_CLOCK_T 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define 0/1 if your assembler and linker support COMDAT groups. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_COMDAT_GROUP 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'abort', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_ABORT 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'asprintf', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_ASPRINTF 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'atof', otherwise define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_ATOF 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'atol', otherwise define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_ATOL 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'basename', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_BASENAME 0
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'calloc', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_CALLOC 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'clearerr_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_CLEARERR_UNLOCKED 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'clock', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_CLOCK 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'errno', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_ERRNO 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'feof_unlocked', otherwise define
X+   to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FEOF_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'ferror_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FERROR_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fflush_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FFLUSH_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fgetc_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FGETC_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fgets_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FGETS_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fileno_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FILENO_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fprintf_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_FPRINTF_UNLOCKED 0
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'fputc_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FPUTC_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fputs_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_FPUTS_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'fread_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_FREAD_UNLOCKED 0
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'free', otherwise define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_FREE 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'fwrite_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_FWRITE_UNLOCKED 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'getchar_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_GETCHAR_UNLOCKED 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'getcwd', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETCWD 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'getc_unlocked', otherwise define
X+   to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_GETC_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'getenv', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETENV 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'getopt', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETOPT 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'getpagesize', otherwise define
X+   to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_GETPAGESIZE 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'getrlimit', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETRLIMIT 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'getrusage', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETRUSAGE 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'getwd', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_GETWD 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'ldgetname', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_LDGETNAME 0
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'malloc', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_MALLOC 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'putchar_unlocked', otherwise
X+   define to 0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_PUTCHAR_UNLOCKED 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'putc_unlocked', otherwise define
X+   to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_PUTC_UNLOCKED 1
X+#endif
X+
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+/* Define to 1 if we found a declaration for 'realloc', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_REALLOC 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'sbrk', otherwise define to 0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_SBRK 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'setrlimit', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_SETRLIMIT 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'snprintf', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_SNPRINTF 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'strsignal', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_STRSIGNAL 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'strstr', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_STRSTR 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'strverscmp', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_STRVERSCMP 0
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'times', otherwise define to 0.
X+   */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_TIMES 1
X+#endif
X 
X-/* Define to 1 if we found this declaration otherwise define to 0. */
X+
X+/* Define to 1 if we found a declaration for 'vasprintf', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_DECL_VASPRINTF 1
X+#endif
X+
X+
X+/* Define to 1 if we found a declaration for 'vsnprintf', otherwise define to
X+   0. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_DECL_VSNPRINTF 1
X+#endif
X+
X 
X /* Define to 1 if you have the <direct.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_DIRECT_H */
X+#endif
X 
X-/* Define to 1 if you have the `dup2' function. */
X-#define HAVE_DUP2 1
X 
X /* Define to 1 if you have the <fcntl.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_FCNTL_H 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `feof_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_FEOF_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `ferror_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_FERROR_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `fflush_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_FFLUSH_UNLOCKED */
X+#endif
X+
X+
X+/* Define to 1 if you have the `fgetc_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_FGETC_UNLOCKED */
X+#endif
X+
X+
X+/* Define to 1 if you have the `fgets_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_FGETS_UNLOCKED */
X+#endif
X+
X+
X+/* Define to 1 if you have the `fileno_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_FILENO_UNLOCKED 1
X+#endif
X+
X 
X /* Define to 1 if you have the `fork' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_FORK 1
X+#endif
X+
X 
X /* Define to 1 if you have the `fprintf_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_FPRINTF_UNLOCKED */
X+#endif
X+
X 
X /* Define to 1 if you have the `fputc_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_FPUTC_UNLOCKED */
X+#endif
X+
X 
X /* Define to 1 if you have the `fputs_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_FPUTS_UNLOCKED */
X+#endif
X+
X+
X+/* Define to 1 if you have the `fread_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_FREAD_UNLOCKED */
X+#endif
X+
X 
X /* Define to 1 if you have the `fwrite_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_FWRITE_UNLOCKED */
X+#endif
X+
X 
X /* Define if your assembler supports .balign and .p2align. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_BALIGN_AND_P2ALIGN 1
X+#endif
X+
X 
X /* Define if your assembler uses the new HImode fild and fist notation. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_FILDS_FISTS 1
X+#endif
X+
X 
X /* Define if your assembler and linker support .hidden. */
X #define HAVE_GAS_HIDDEN 1
X 
X /* Define if your assembler supports specifying the maximum number of bytes to
X    skip when using the GAS .p2align command. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_MAX_SKIP_P2ALIGN 1
X+#endif
X+
X+
X+/* Define if your assembler supports .nsubspa comdat option. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_GAS_NSUBSPA_COMDAT */
X+#endif
X+
X+
X+/* Define if your assembler and linker support 32-bit section relative relocs
X+   via '.secrel32 label'. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_GAS_PE_SECREL32_RELOC */
X+#endif
X+
X 
X /* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag.
X    */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_SHF_MERGE 1
X+#endif
X+
X 
X /* Define if your assembler supports .subsection and .subsection -1 starts
X    emitting at the beginning of your section. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_SUBSECTION_ORDERING 1
X+#endif
X+
X 
X /* Define if your assembler supports .weak. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GAS_WEAK 1
X+#endif
X+
X+
X+/* Define if your assembler supports .weakref. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_GAS_WEAKREF */
X+#endif
X+
X+
X+/* Define to 1 if you have the `getchar_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_GETCHAR_UNLOCKED 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `getc_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_GETC_UNLOCKED 1
X+#endif
X+
X 
X /* Define to 1 if you have the `getrlimit' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GETRLIMIT 1
X+#endif
X+
X 
X /* Define to 1 if you have the `getrusage' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GETRUSAGE 1
X+#endif
X+
X 
X /* Define to 1 if you have the `gettimeofday' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_GETTIMEOFDAY 1
X+#endif
X+
X 
X /* Define if you have the iconv() function. */
X-/* #undef HAVE_ICONV */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_ICONV 1
X+#endif
X+
X 
X /* Define to 1 if you have the <iconv.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_ICONV_H */
X+#endif
X+
X 
X /* Define .init_array/.fini_array sections are available and working. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_INITFINI_ARRAY */
X+#endif
X+
X 
X /* Define if you have a working <inttypes.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_INTTYPES_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `kill' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_KILL 1
X+#endif
X+
X+
X+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_LANGINFO_CODESET 1
X+#endif
X+
X 
X /* Define to 1 if you have the <langinfo.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LANGINFO_H 1
X+#endif
X+
X 
X /* Define if your <locale.h> file defines LC_MESSAGES. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LC_MESSAGES 1
X+#endif
X+
X 
X /* Define to 1 if you have the <ldfcn.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_LDFCN_H */
X+#endif
X+
X 
X /* Define if your linker supports --as-needed and --no-as-needed options. */
X-/* #undef HAVE_LD_AS_NEEDED */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_LD_AS_NEEDED 1
X+#endif
X+
X+
X+/* Define if your linker supports --demangle option. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_LD_DEMANGLE */
X+#endif
X+
X 
X /* Define if your linker supports --eh-frame-hdr option. */
X #define HAVE_LD_EH_FRAME_HDR 1
X 
X+/* Define if your PowerPC64 linker only needs function descriptor syms. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_LD_NO_DOT_SYMS */
X+#endif
X+
X+
X /* Define if your linker supports -pie option. */
X-/* #undef HAVE_LD_PIE */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_LD_PIE 1
X+#endif
X+
X 
X /* Define if your linker links a mix of read-only and read-write sections into
X    a read-write section. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LD_RO_RW_SECTION_MIXING 1
X+#endif
X+
X+
X+/* Define if your linker supports -Bstatic/-Bdynamic option. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_LD_STATIC_DYNAMIC 1
X+#endif
X+
X+
X+/* Define if your linker supports --sysroot. */
X+#ifndef USED_FOR_TARGET
X+/* #undef HAVE_LD_SYSROOT */
X+#endif
X+
X 
X /* Define to 1 if you have the <limits.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LIMITS_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <locale.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LOCALE_H 1
X+#endif
X 
X-/* Define if your compiler supports the \`long long' type. */
X+
X+/* Define to 1 if the system has the type `long long'. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_LONG_LONG 1
X+#endif
X+
X 
X /* Define to 1 if you have the <malloc.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_MALLOC_H */
X+#endif
X+
X 
X /* Define to 1 if you have the `mbstowcs' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MBSTOWCS 1
X+#endif
X+
X 
X /* Define if valgrind's memcheck.h header is installed. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_MEMCHECK_H */
X+#endif
X+
X 
X /* Define to 1 if you have the <memory.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MEMORY_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `mincore' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MINCORE 1
X+#endif
X+
X 
X /* Define to 1 if you have the `mmap' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MMAP 1
X+#endif
X+
X 
X /* Define if mmap with MAP_ANON(YMOUS) works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MMAP_ANON 1
X+#endif
X+
X 
X /* Define if mmap of /dev/zero works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MMAP_DEV_ZERO 1
X+#endif
X+
X 
X /* Define if read-only mmap of a plain file works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_MMAP_FILE 1
X+#endif
X+
X 
X /* Define to 1 if you have the `nl_langinfo' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_NL_LANGINFO 1
X+#endif
X+
X+
X+/* Define to 1 if you have the `putchar_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X+#define HAVE_PUTCHAR_UNLOCKED 1
X+#endif
X 
X-/* Define if printf supports "%p". */
X-#define HAVE_PRINTF_PTR 1
X 
X /* Define to 1 if you have the `putc_unlocked' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_PUTC_UNLOCKED 1
X+#endif
X+
X 
X /* Define to 1 if you have the `scandir' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SCANDIR 1
X+#endif
X+
X 
X /* Define to 1 if you have the `setlocale' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SETLOCALE 1
X+#endif
X+
X 
X /* Define to 1 if you have the `setrlimit' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SETRLIMIT 1
X-
X-/* Define if you have a working <stdbool.h> header file. */
X-#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \
X-    __FreeBSD_version >= 500014
X-#define HAVE_STDBOOL_H 1
X #endif
X 
X+
X /* Define to 1 if you have the <stddef.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STDDEF_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <stdint.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STDINT_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <stdlib.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STDLIB_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <strings.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STRINGS_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <string.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STRING_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `strsignal' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STRSIGNAL 1
X+#endif
X+
X 
X /* Define if <sys/times.h> defines struct tms. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_STRUCT_TMS 1
X+#endif
X+
X 
X /* Define to 1 if you have the `sysconf' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYSCONF 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/file.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_FILE_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/mman.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_MMAN_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/param.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_PARAM_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/resource.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_RESOURCE_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/stat.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_STAT_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/times.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_TIMES_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/time.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_TIME_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the <sys/types.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_TYPES_H 1
X+#endif
X+
X 
X /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_SYS_WAIT_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `times' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_TIMES 1
X+#endif
X+
X 
X /* Define to 1 if you have the <time.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_TIME_H 1
X+#endif
X 
X-/* Define if <sys/types.h> defines \`uchar'. */
X-/* #undef HAVE_UCHAR */
X 
X /* Define to 1 if you have the <unistd.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_UNISTD_H 1
X+#endif
X+
X 
X /* Define if valgrind's valgrind/memcheck.h header is installed. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_VALGRIND_MEMCHECK_H */
X+#endif
X+
X 
X /* Define to 1 if you have the `vfork' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_VFORK 1
X+#endif
X+
X 
X /* Define to 1 if you have the <vfork.h> header file. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE_VFORK_H */
X+#endif
X+
X 
X /* Define to 1 if you have the <wchar.h> header file. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WCHAR_H 1
X+#endif
X+
X 
X /* Define to 1 if you have the `wcswidth' function. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WCSWIDTH 1
X+#endif
X+
X 
X /* Define to 1 if `fork' works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WORKING_FORK 1
X+#endif
X+
X 
X /* Define this macro if mbstowcs does not crash when its first argument is
X    NULL. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WORKING_MBSTOWCS 1
X+#endif
X+
X 
X /* Define to 1 if `vfork' works. */
X+#ifndef USED_FOR_TARGET
X #define HAVE_WORKING_VFORK 1
X+#endif
X 
X-/* Define if the \`_Bool' type is built-in. */
X-#define HAVE__BOOL 1
X 
X-/* Define if your compiler supports the \`__int64' type. */
X+/* Define to 1 if the system has the type `__int64'. */
X+#ifndef USED_FOR_TARGET
X /* #undef HAVE___INT64 */
X-
X-/* Define if the host machine stores words of multi-word integers in
X-   big-endian order. */
X-#if _QUAD_HIGHWORD == 0
X-#define HOST_WORDS_BIG_ENDIAN 1 
X #endif
X 
X+
X /* Define as const if the declaration of iconv() needs const. */
X-/* #undef ICONV_CONST */
X+#ifndef USED_FOR_TARGET
X+#define ICONV_CONST const
X+#endif
X+
X 
X /* Define if host mkdir takes a single argument. */
X+#ifndef USED_FOR_TARGET
X /* #undef MKDIR_TAKES_ONE_ARG */
X+#endif
X+
X 
X /* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */
X+#ifndef USED_FOR_TARGET
X #define NEED_64BIT_HOST_WIDE_INT 1
X+#endif
X+
X 
X /* Define to 1 if your C compiler doesn't accept -c and -o together. */
X+#ifndef USED_FOR_TARGET
X /* #undef NO_MINUS_C_MINUS_O */
X+#endif
X+
X 
X /* Define to the address where bug reports for this package should be sent. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_BUGREPORT ""
X+#endif
X+
X 
X /* Define to the full name of this package. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_NAME ""
X+#endif
X+
X 
X /* Define to the full name and version of this package. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_STRING ""
X+#endif
X+
X 
X /* Define to the one symbol short name of this package. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_TARNAME ""
X+#endif
X+
X 
X /* Define to the version of this package. */
X+#ifndef USED_FOR_TARGET
X #define PACKAGE_VERSION ""
X+#endif
X+
X 
X /* Define to PREFIX/include if cpp should also search that directory. */
X+#ifndef USED_FOR_TARGET
X /* #undef PREFIX_INCLUDE_DIR */
X+#endif
X 
X-/* The number of bytes in type int */
X+
X+/* The size of a `int', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X #define SIZEOF_INT 4
X+#endif
X 
X-#if defined(__i386__) || defined(__powerpc__) || defined(__arm__)
X-/* The number of bytes in type long */
X-# define SIZEOF_LONG SIZEOF_INT
X-#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
X-# define SIZEOF_LONG SIZEOF_LONG_LONG
X-#else
X-# error "I don't know what arch this is."
X+
X+/* The size of a `long', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X+#define SIZEOF_LONG 4
X #endif
X 
X-/* The number of bytes in type long long */
X+
X+/* The size of a `long long', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X #define SIZEOF_LONG_LONG 8
X+#endif
X+
X 
X-/* The number of bytes in type short */
X+/* The size of a `short', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X #define SIZEOF_SHORT 2
X+#endif
X+
X+
X+/* The size of a `void *', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X+#define SIZEOF_VOID_P 4
X+#endif
X 
X-/* The number of bytes in type void * */
X-#define SIZEOF_VOID_P SIZEOF_LONG
X 
X-/* The number of bytes in type __int64 */
X+/* The size of a `__int64', as computed by sizeof. */
X+#ifndef USED_FOR_TARGET
X /* #undef SIZEOF___INT64 */
X+#endif
X+
X 
X /* Define to 1 if you have the ANSI C header files. */
X+#ifndef USED_FOR_TARGET
X #define STDC_HEADERS 1
X+#endif
X+
X 
X /* Define if you can safely include both <string.h> and <strings.h>. */
X+#ifndef USED_FOR_TARGET
X #define STRING_WITH_STRINGS 1
X+#endif
X+
X+
X+/* Define if your target C library provides stack protector support */
X+#ifndef USED_FOR_TARGET
X+/* #undef TARGET_LIBC_PROVIDES_SSP */
X+#endif
X+
X 
X /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
X+#ifndef USED_FOR_TARGET
X #define TIME_WITH_SYS_TIME 1
X+#endif
X+
X 
X /* Define if your assembler mis-optimizes .eh_frame data. */
X+#ifndef USED_FOR_TARGET
X /* #undef USE_AS_TRADITIONAL_FORMAT */
X+#endif
X+
X+
X+/* Define to 1 if the 'long long' (or '__int64') is wider than 'long' but
X+   still efficiently supported by the host hardware. */
X+#ifndef USED_FOR_TARGET
X+/* #undef USE_LONG_LONG_FOR_WIDEST_FAST_INT */
X+#endif
X 
X-/* Define if gcc should use -lunwind. */
X-/* #undef USE_LIBUNWIND_EXCEPTIONS */
X 
X-/* Define to be the last portion of registry key on windows hosts. */
X+/* Define if location_t is fileline integer cookie. */
X+#ifndef USED_FOR_TARGET
X+/* #undef USE_MAPPED_LOCATION */
X+#endif
X+
X+
X+/* Define to be the last component of the Windows registry key under which to
X+   look for installation paths. The full key used will be
X+   HKEY_LOCAL_MACHINE/SOFTWARE/Free Software Foundation/{WIN32_REGISTRY_KEY}.
X+   The default is the GCC version number. */
X+#ifndef USED_FOR_TARGET
X /* #undef WIN32_REGISTRY_KEY */
X+#endif
X 
X-/* whether byteorder is bigendian */
X+
X+/* Define to 1 if your processor stores words with the most significant byte
X+   first (like Motorola and SPARC, unlike Intel and VAX). */
X+#ifndef USED_FOR_TARGET
X /* #undef WORDS_BIGENDIAN */
X+#endif
X+
X 
X /* Always define this when using the GNU C Library */
X+#ifndef USED_FOR_TARGET
X /* #undef _GNU_SOURCE */
X+#endif
X+
X 
X /* Define to `int' if <sys/types.h> doesn't define. */
X+#ifndef USED_FOR_TARGET
X /* #undef gid_t */
X+#endif
X+
X 
X-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
X-   if it is not supported. */
X+/* Define to `__inline__' or `__inline' if that's what the C compiler
X+   calls it, or to nothing if 'inline' is not supported under any name.  */
X+#ifndef __cplusplus
X /* #undef inline */
X+#endif
X 
X /* Define to `int' if <sys/types.h> does not define. */
X+#ifndef USED_FOR_TARGET
X /* #undef pid_t */
X+#endif
X+
X 
X /* Define to \`long' if <sys/resource.h> doesn't define. */
X+#ifndef USED_FOR_TARGET
X /* #undef rlim_t */
X+#endif
X+
X 
X /* Define to `int' if <sys/types.h> does not define. */
X+#ifndef USED_FOR_TARGET
X /* #undef ssize_t */
X+#endif
X+
X 
X /* Define to `int' if <sys/types.h> doesn't define. */
X+#ifndef USED_FOR_TARGET
X /* #undef uid_t */
X+#endif
X+
X 
X /* Define as `fork' if `vfork' does not work. */
X+#ifndef USED_FOR_TARGET
X /* #undef vfork */
X+#endif
X+
X+/* Override SIZEOF_?? using proper values. */
X+#include <size-host.h>
XIndex: gnu/usr.bin/cc/cc_tools/freebsd-native.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v
Xretrieving revision 1.27
Xdiff -u -r1.27 freebsd-native.h
X--- gnu/usr.bin/cc/cc_tools/freebsd-native.h	21 Sep 2006 03:27:07 -0000	1.27
X+++ gnu/usr.bin/cc/cc_tools/freebsd-native.h	4 Apr 2007 17:32:01 -0000
X@@ -1,4 +1,4 @@
X-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.27 2006/09/21 03:27:07 kan Exp $ */
X+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.26 2005/10/30 19:04:47 obrien Exp $ */
X 
X /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD
X    source tree so it can be configured appropriately without using
X@@ -8,15 +8,19 @@
X 
X /* Fake out gcc/config/freebsd<version>.h.  */
X #define	FBSD_MAJOR	7
X-#define	FBSD_CC_VER	700002		/* form like __FreeBSD_version */
X+#define	FBSD_CC_VER	700003		/* form like __FreeBSD_version */
X 
X #undef SYSTEM_INCLUDE_DIR		/* We don't need one for now. */
X #undef TOOL_INCLUDE_DIR			/* We don't need one for now. */
X #undef LOCAL_INCLUDE_DIR		/* We don't wish to support one. */
X 
X /* Look for the include files in the system-defined places.  */
X+#define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/4.1"
X+#define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/4.1/backward"
X+#if XXXKAN
X #define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/3.4"
X #define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/3.4/backward"
X+#endif
X #define GCC_INCLUDE_DIR			PREFIX"/include"
X #ifdef CROSS_COMPILE
X #define CROSS_INCLUDE_DIR		PREFIX"/include"
X@@ -28,9 +32,9 @@
X    /usr/libexec directory.
X 
X    ``cc --print-search-dirs'' gives:
X-   install: STANDARD_EXEC_PREFIX/(null)
X-   programs: /usr/libexec/<OBJFORMAT>/:STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX
X-   libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX
X+   install: STANDARD_EXEC_PREFIX/
X+   programs: STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX
X+   libraries: STANDARD_STARTFILE_PREFIX
X */
X #undef	STANDARD_BINDIR_PREFIX		/* We don't need one for now. */
X #define	STANDARD_EXEC_PREFIX		PREFIX"/libexec/"
X@@ -46,20 +50,24 @@
X #define STANDARD_STARTFILE_PREFIX	PREFIX"/lib/"
X #define STARTFILE_PREFIX_SPEC		PREFIX"/lib/"
X 
X-/* For the native system compiler, we actually build libgcc in a profiled
X-   version.  So we should use it with -pg.  */
X+#if 0
X #define LIBGCC_SPEC		"%{shared: -lgcc_pic} \
X     %{!shared: %{!pg: -lgcc} %{pg: -lgcc_p}}"
X+#endif
X #define LIBSTDCXX_PROFILE	"-lstdc++_p"
X #define MATH_LIBRARY_PROFILE	"-lm_p"
X #define FORTRAN_LIBRARY_PROFILE	"-lg2c_p"
X 
X+#if 1
X+#define LIBGCC_SPEC		"-lgcc"
X+/* For the native system compiler, we actually build libgcc in a profiled
X+   version.  So we should use it with -pg.  */
X+#define LIBGCC_STATIC_LIB_SPEC	  "%{pg: -lgcc_p;:-lgcc}"
X+#define LIBGCC_EH_STATIC_LIB_SPEC "%{pg: -lgcc_eh_p;:-lgcc_eh}"
X+#else
X+#define LIBGCC_STATIC_LIB_SPEC "-lgcc"
X+#define LIBGCC_EH_STATIC_LIB_SPEC "-lgcc_eh"
X+#endif
X+
X /* FreeBSD is 4.4BSD derived */
X #define bsd4_4
X-
X-/* And now they want to replace ctype.h.... grr... [stupid, IMHO] */
X-#define xxxISDIGIT	isdigit
X-#define xxxISGRAPH	isgraph
X-#define xxxISLOWER	islower
X-#define xxxISSPACE	isspace
X-#define xxxTOUPPER	toupper
XIndex: gnu/usr.bin/cc/cpp/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/cpp/Makefile,v
Xretrieving revision 1.26
Xdiff -u -r1.26 Makefile
X--- gnu/usr.bin/cc/cpp/Makefile	21 Sep 2006 07:52:41 -0000	1.26
X+++ gnu/usr.bin/cc/cpp/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,14 +1,20 @@
X-# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.26 2006/09/21 07:52:41 ru Exp $
X+# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.24 2004/02/05 22:44:21 ru Exp $
X 
X .include "../Makefile.inc"
X .include "../Makefile.fe"
X 
X-.PATH: ${GCCDIR} ${GCCDIR}/doc
X+.PATH: ${GCCDIR}
X 
X PROG=	cpp
X SRCS=	gcc.c cppspec.c
X+NO_MAN=
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBBACKEND} ${LIBIBERTY}
X+LDADD=	${LIBBACKEND} ${LIBIBERTY}
X+
X+CLEANFILES= cpp.1
X+
X+cpp.1: cccp.1
X+	cat ${.ALLSRC} > ${.TARGET}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/doc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/doc/Makefile,v
Xretrieving revision 1.13
Xdiff -u -r1.13 Makefile
X--- gnu/usr.bin/cc/doc/Makefile	28 Jul 2004 05:27:20 -0000	1.13
X+++ gnu/usr.bin/cc/doc/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,6 +1,7 @@
X # $FreeBSD: src/gnu/usr.bin/cc/doc/Makefile,v 1.13 2004/07/28 05:27:20 kan Exp $
X 
X .include "../Makefile.inc"
X+.include "../Makefile.ver"
X 
X .PATH: ${GCCDIR}/doc
X 
X@@ -16,17 +17,28 @@
X     invoke.texi extend.texi md.texi objc.texi gcov.texi trouble.texi \
X     bugreport.texi service.texi contribute.texi compat.texi \
X     include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
X-    contrib.texi cppenv.texi cppopts.texi
X+    contrib.texi cppenv.texi cppopts.texi gcc-vers.texi
X 
X gccint.info: gccint.texi include/gcc-common.texi contribute.texi \
X     makefile.texi configterms.texi portability.texi interface.texi \
X     passes.texi c-tree.texi rtl.texi md.texi tm.texi hostconfig.texi \
X     fragments.texi configfiles.texi collect2.texi headerdirs.texi \
X     include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
X-    contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi
X+    contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi \
X+    gcc-vers.texi
X 
X cpp.info: cpp.texi include/fdl.texi cppenv.texi cppopts.texi
X 
X MAKEINFOFLAGS+= -I ${GCCDIR}/doc -I ${GCCDIR}/doc/include
X 
X+gcc-vers.texi:
X+	(echo "@set version-GCC $(BASEVER)"; \
X+	if [ "$(DEVPHASE)" = "experimental" ]; then \
X+		echo "@set DEVELOPMENT"; \
X+	else \
X+		echo "@clear DEVELOPMENT"; \
X+	fi) > ${.TARGET}
X+
X+CLEANFILES+=    gcc-vers.texi
X+
X .include <bsd.info.mk>
XIndex: gnu/usr.bin/cc/gcov/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/gcov/Makefile,v
Xretrieving revision 1.4
Xdiff -u -r1.4 Makefile
X--- gnu/usr.bin/cc/gcov/Makefile	28 Jul 2004 05:27:20 -0000	1.4
X+++ gnu/usr.bin/cc/gcov/Makefile	17 Dec 2006 06:49:27 -0000
X@@ -1,13 +1,20 @@
X # $FreeBSD: src/gnu/usr.bin/cc/gcov/Makefile,v 1.4 2004/07/28 05:27:20 kan Exp $
X 
X .include "../Makefile.inc"
X+.include "../Makefile.ver"
X 
X .PATH: ${GCCDIR} ${GCCDIR}/doc
X 
X PROG=	gcov
X-SRCS=	gcov.c version.c
X+SRCS=	gcov.c version.c errors.c
X+NO_MAN=
X 
X-DPADD=	${LIBCC_INT}
X-LDADD=	${LIBCC_INT}
X+DPADD=	${LIBIBERTY}
X+LDADD=	${LIBIBERTY}
X+
X+version.o:	version.c
X+	${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \
X+		-DDATESTAMP=\"\ ${DATESTAMP}\" \
X+		-DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC}
X 
X .include <bsd.prog.mk>
XIndex: gnu/usr.bin/cc/include/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/cc/include/Makefile,v
Xretrieving revision 1.8
Xdiff -u -r1.8 Makefile
X--- gnu/usr.bin/cc/include/Makefile	21 Dec 2004 08:46:50 -0000	1.8
X+++ gnu/usr.bin/cc/include/Makefile	24 Jan 2007 05:56:49 -0000
X@@ -5,7 +5,7 @@
X .PATH: ${GCCDIR}/config/${GCC_CPU}
X 
X .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
X-INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h
X+INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h mm_malloc.h
X .elif ${TARGET_ARCH} == "ia64"
X INCS=	ia64intrin.h
X .elif ${TARGET_ARCH} == "arm"
X@@ -14,7 +14,10 @@
X INCS=	ppc-asm.h altivec.h spe.h
X .endif
X 
X-NO_OBJ=
X+mm_malloc.h: pmm_malloc.h
X+	@rm -rf ${.TARGET}
X+	@cp ${.ALLSRC} ${.TARGET}
X+CLEANFILES+=	mm_malloc.h
X 
X .include <bsd.init.mk>
X .include <bsd.incs.mk>
XIndex: gnu/usr.bin/gdb/kgdb/kgdb.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/gnu/usr.bin/gdb/kgdb/kgdb.h,v
Xretrieving revision 1.4
Xdiff -u -r1.4 kgdb.h
X--- gnu/usr.bin/gdb/kgdb/kgdb.h	1 Mar 2007 13:55:15 -0000	1.4
X+++ gnu/usr.bin/gdb/kgdb/kgdb.h	3 Mar 2007 17:06:29 -0000
X@@ -32,7 +32,6 @@
X struct thread_info;
X 
X extern kvm_t *kvm;
X-extern int verbose;
X 
X struct kthr {
X 	struct kthr	*next;
XIndex: include/nsswitch.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/include/nsswitch.h,v
Xretrieving revision 1.4
Xdiff -u -r1.4 nsswitch.h
X--- include/nsswitch.h	28 Apr 2006 12:03:34 -0000	1.4
X+++ include/nsswitch.h	17 Dec 2006 06:49:27 -0000
X@@ -208,7 +208,7 @@
X typedef struct _ns_dbt {
X 	const char	*name;		/* name of database */
X 	ns_src		*srclist;	/* list of sources */
X-	int		 srclistsize;	/* size of srclist */
X+	unsigned int	 srclistsize;	/* size of srclist */
X } ns_dbt;
X 
X /*
XIndex: lib/libc/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/Makefile,v
Xretrieving revision 1.69
Xdiff -u -r1.69 Makefile
X--- lib/libc/Makefile	4 Mar 2007 12:25:03 -0000	1.69
X+++ lib/libc/Makefile	2 Apr 2007 15:14:43 -0000
X@@ -20,6 +20,11 @@
X INSTALL_PIC_ARCHIVE=
X PRECIOUSLIB=
X 
X+#
X+# Only link with static libgcc.a (no libgcc_eh.a).
X+#
X+LDFLAGS+= -v -nodefaultlibs -Wl,-Bstatic,-lgcc,-Bdynamic
X+
X # Define (empty) variables so that make doesn't give substitution
X # errors if the included makefiles don't change these:
X MDSRCS=
XIndex: lib/libc/arm/softfloat/softfloat.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/arm/softfloat/softfloat.h,v
Xretrieving revision 1.1
Xdiff -u -r1.1 softfloat.h
X--- lib/libc/arm/softfloat/softfloat.h	14 May 2004 12:04:30 -0000	1.1
X+++ lib/libc/arm/softfloat/softfloat.h	5 Apr 2007 02:54:17 -0000
X@@ -71,7 +71,9 @@
X Software IEC/IEEE floating-point underflow tininess-detection mode.
X -------------------------------------------------------------------------------
X */
X+#ifndef SOFTFLOAT_FOR_GCC
X extern int float_detect_tininess;
X+#endif
X enum {
X     float_tininess_after_rounding  = 0,
X     float_tininess_before_rounding = 1
XIndex: lib/libc/gen/arc4random.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/gen/arc4random.c,v
Xretrieving revision 1.11
Xdiff -u -r1.11 arc4random.c
X--- lib/libc/gen/arc4random.c	4 Oct 2006 01:17:23 -0000	1.11
X+++ lib/libc/gen/arc4random.c	17 Dec 2006 06:49:27 -0000
X@@ -118,7 +118,7 @@
X 	/* fd < 0?  Ah, what the heck. We'll just take whatever was on the
X 	 * stack... */
X 
X-	arc4_addrandom(as, (void *) &rdat, sizeof(rdat));
X+	arc4_addrandom(as, (u_char *) &rdat, sizeof(rdat));
X 
X 	/*
X 	 * Throw away the first N bytes of output, as suggested in the
XIndex: lib/libc/gmon/mcount.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/gmon/mcount.c,v
Xretrieving revision 1.22
Xdiff -u -r1.22 mcount.c
X--- lib/libc/gmon/mcount.c	9 Jan 2007 00:27:58 -0000	1.22
X+++ lib/libc/gmon/mcount.c	24 Jan 2007 01:52:56 -0000
X@@ -89,7 +89,8 @@
X #ifdef _KERNEL
X 	MCOUNT_ENTER(s);
X #else
X-	if (!atomic_cmpset_acq_int(&p->state, GMON_PROF_ON, GMON_PROF_BUSY))
X+	if (!atomic_cmpset_acq_int((u_int *)&p->state, GMON_PROF_ON,
X+	    GMON_PROF_BUSY))
X 		return;
X #endif
X 	frompci = frompc - p->lowpc;
X@@ -258,11 +259,11 @@
X #ifdef _KERNEL
X 	MCOUNT_EXIT(s);
X #else
X-	atomic_store_rel_int(&p->state, GMON_PROF_ON);
X+	atomic_store_rel_int((u_int *)&p->state, GMON_PROF_ON);
X #endif
X 	return;
X overflow:
X-	atomic_store_rel_int(&p->state, GMON_PROF_ERROR);
X+	atomic_store_rel_int((u_int *)&p->state, GMON_PROF_ERROR);
X #ifdef _KERNEL
X 	MCOUNT_EXIT(s);
X #endif
XIndex: lib/libc/locale/collate.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/locale/collate.c,v
Xretrieving revision 1.35
Xdiff -u -r1.35 collate.c
X--- lib/libc/locale/collate.c	27 Feb 2005 20:31:13 -0000	1.35
X+++ lib/libc/locale/collate.c	17 Dec 2006 06:49:27 -0000
X@@ -47,7 +47,7 @@
X int __collate_load_error = 1;
X int __collate_substitute_nontrivial;
X 
X-u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
X+char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
X struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
X struct __collate_st_chain_pri *__collate_chain_pri_table;
X 
X@@ -200,12 +200,12 @@
X 	return (_LDP_LOADED);
X }
X 
X-u_char *
X-__collate_substitute(const u_char *s)
X+char *
X+__collate_substitute(const char *s)
X {
X 	int dest_len, len, nlen;
X 	int delta = strlen(s);
X-	u_char *dest_str = NULL;
X+	char *dest_str = NULL;
X 
X 	if (s == NULL || *s == '\0')
X 		return (__collate_strdup(""));
X@@ -215,20 +215,21 @@
X 		__collate_err(EX_OSERR, __func__);
X 	len = 0;
X 	while (*s) {
X-		nlen = len + strlen(__collate_substitute_table[*s]);
X+		nlen = len + strlen(__collate_substitute_table[(u_char)*s]);
X 		if (dest_len <= nlen) {
X 			dest_str = reallocf(dest_str, dest_len = nlen + delta);
X 			if (dest_str == NULL)
X 				__collate_err(EX_OSERR, __func__);
X 		}
X-		(void)strcpy(dest_str + len, __collate_substitute_table[*s++]);
X+		(void)strcpy(dest_str + len,
X+		    __collate_substitute_table[(u_char)*s++]);
X 		len = nlen;
X 	}
X 	return (dest_str);
X }
X 
X void
X-__collate_lookup(const u_char *t, int *len, int *prim, int *sec)
X+__collate_lookup(const char *t, int *len, int *prim, int *sec)
X {
X 	struct __collate_st_chain_pri *p2;
X 
X@@ -243,14 +244,14 @@
X 			return;
X 		}
X 	}
X-	*prim = __collate_char_pri_table[*t].prim;
X-	*sec = __collate_char_pri_table[*t].sec;
X+	*prim = __collate_char_pri_table[(u_char)*t].prim;
X+	*sec = __collate_char_pri_table[(u_char)*t].sec;
X }
X 
X-u_char *
X-__collate_strdup(u_char *s)
X+char *
X+__collate_strdup(char *s)
X {
X-	u_char *t = strdup(s);
X+	char *t = strdup(s);
X 
X 	if (t == NULL)
X 		__collate_err(EX_OSERR, __func__);
XIndex: lib/libc/locale/collate.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/locale/collate.h,v
Xretrieving revision 1.15
Xdiff -u -r1.15 collate.h
X--- lib/libc/locale/collate.h	27 Feb 2005 20:31:13 -0000	1.15
X+++ lib/libc/locale/collate.h	17 Dec 2006 06:49:27 -0000
X@@ -43,23 +43,23 @@
X 	int prim, sec;
X };
X struct __collate_st_chain_pri {
X-	u_char str[STR_LEN];
X+	char str[STR_LEN];
X 	int prim, sec;
X };
X 
X extern int __collate_load_error;
X extern int __collate_substitute_nontrivial;
X #define __collate_substitute_table (*__collate_substitute_table_ptr)
X-extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
X+extern char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
X #define __collate_char_pri_table (*__collate_char_pri_table_ptr)
X extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
X extern struct __collate_st_chain_pri *__collate_chain_pri_table;
X 
X __BEGIN_DECLS
X-u_char	*__collate_strdup(u_char *);
X-u_char	*__collate_substitute(const u_char *);
X+char	*__collate_strdup(char *);
X+char	*__collate_substitute(const char *);
X int	__collate_load_tables(const char *);
X-void	__collate_lookup(const u_char *, int *, int *, int *);
X+void	__collate_lookup(const char *, int *, int *, int *);
X int	__collate_range_cmp(int, int);
X #ifdef COLLATE_DEBUG
X void	__collate_print_tables(void);
XIndex: lib/libc/resolv/Symbol.map
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/resolv/Symbol.map,v
Xretrieving revision 1.5
Xdiff -u -r1.5 Symbol.map
X--- lib/libc/resolv/Symbol.map	21 May 2006 11:29:26 -0000	1.5
X+++ lib/libc/resolv/Symbol.map	17 Dec 2006 06:49:27 -0000
X@@ -52,6 +52,7 @@
X 	sym_ntop;
X 	dn_count_labels;
X 	p_secstodate;
X+	__r_code_syms;
X 	__res_init;
X 	__res_randomid;
X 	__h_errno;
XIndex: lib/libc/resolv/res_debug.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/resolv/res_debug.c,v
Xretrieving revision 1.3
Xdiff -u -r1.3 res_debug.c
X--- lib/libc/resolv/res_debug.c	9 Jan 2007 00:28:04 -0000	1.3
X+++ lib/libc/resolv/res_debug.c	24 Jan 2007 01:53:05 -0000
X@@ -468,7 +468,7 @@
X /*
X  * Names of DNS rcodes.
X  */
X-static const struct res_sym __p_rcode_syms[] = {
X+const struct res_sym __p_rcode_syms[] = {
X 	{ns_r_noerror,	"NOERROR",		"no error"},
X 	{ns_r_formerr,	"FORMERR",		"format error"},
X 	{ns_r_servfail,	"SERVFAIL",		"server failed"},
XIndex: lib/libc/rpc/clnt_dg.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/rpc/clnt_dg.c,v
Xretrieving revision 1.19
Xdiff -u -r1.19 clnt_dg.c
X--- lib/libc/rpc/clnt_dg.c	4 Mar 2007 12:25:03 -0000	1.19
X+++ lib/libc/rpc/clnt_dg.c	14 Mar 2007 01:08:49 -0000
X@@ -389,7 +389,7 @@
X 	xid++;
X 	*(u_int32_t *)(void *)(cu->cu_outbuf) = htonl(xid);
X 
X-	if ((! XDR_PUTINT32(xdrs, &proc)) ||
X+	if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
X 	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
X 	    (! (*xargs)(xdrs, argsp))) {
X 		cu->cu_error.re_status = RPC_CANTENCODEARGS;
XIndex: lib/libc/rpc/clnt_raw.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/rpc/clnt_raw.c,v
Xretrieving revision 1.20
Xdiff -u -r1.20 clnt_raw.c
X--- lib/libc/rpc/clnt_raw.c	27 Feb 2006 22:10:58 -0000	1.20
X+++ lib/libc/rpc/clnt_raw.c	17 Dec 2006 06:49:27 -0000
X@@ -172,7 +172,7 @@
X 	XDR_SETPOS(xdrs, 0);
X 	clp->u.mashl_rpcmsg.rm_xid ++ ;
X 	if ((! XDR_PUTBYTES(xdrs, clp->u.mashl_callmsg, clp->mcnt)) ||
X-	    (! XDR_PUTINT32(xdrs, &proc)) ||
X+	    (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
X 	    (! AUTH_MARSHALL(h->cl_auth, xdrs)) ||
X 	    (! (*xargs)(xdrs, argsp))) {
X 		return (RPC_CANTENCODEARGS);
XIndex: lib/libc/rpc/clnt_vc.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/rpc/clnt_vc.c,v
Xretrieving revision 1.20
Xdiff -u -r1.20 clnt_vc.c
X--- lib/libc/rpc/clnt_vc.c	9 Sep 2006 22:18:57 -0000	1.20
X+++ lib/libc/rpc/clnt_vc.c	17 Dec 2006 06:49:27 -0000
X@@ -361,7 +361,7 @@
X 	x_id = ntohl(--(*msg_x_id));
X 
X 	if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) ||
X-	    (! XDR_PUTINT32(xdrs, &proc)) ||
X+	    (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
X 	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
X 	    (! (*xdr_args)(xdrs, args_ptr))) {
X 		if (ct->ct_error.re_status == RPC_SUCCESS)
XIndex: lib/libc/rpc/des_crypt.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/rpc/des_crypt.c,v
Xretrieving revision 1.8
Xdiff -u -r1.8 des_crypt.c
X--- lib/libc/rpc/des_crypt.c	16 Oct 2004 06:11:34 -0000	1.8
X+++ lib/libc/rpc/des_crypt.c	17 Dec 2006 06:49:27 -0000
X@@ -82,7 +82,7 @@
X 	struct desparams dp;
X 
X #ifdef BROKEN_DES
X-	dp.UDES.UDES_buf = buf;
X+	dp.UDES.UDES_buf = (u_char *)buf;
X 	dp.des_mode = ECB;
X #else
X 	dp.des_mode = CBC;
X@@ -107,7 +107,7 @@
X 	struct desparams dp;
X 
X #ifdef BROKEN_DES
X-	dp.UDES.UDES_buf = buf;
X+	dp.UDES.UDES_buf = (u_char *)buf;
X 	dp.des_mode = CBC;
X #else
X 	dp.des_mode = ECB;
XIndex: lib/libc/stdio/fgetwc.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/stdio/fgetwc.c,v
Xretrieving revision 1.12
Xdiff -u -r1.12 fgetwc.c
X--- lib/libc/stdio/fgetwc.c	20 Jul 2004 08:27:27 -0000	1.12
X+++ lib/libc/stdio/fgetwc.c	17 Dec 2006 06:49:27 -0000
X@@ -71,7 +71,8 @@
X 		return (wc);
X 	}
X 	do {
X-		nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate);
X+		nconv = __mbrtowc(&wc, (const char *)fp->_p, fp->_r,
X+		    &fp->_extra->mbstate);
X 		if (nconv == (size_t)-1)
X 			break;
X 		else if (nconv == (size_t)-2)
XIndex: lib/libc/stdio/fgetws.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/stdio/fgetws.c,v
Xretrieving revision 1.6
Xdiff -u -r1.6 fgetws.c
X--- lib/libc/stdio/fgetws.c	3 Oct 2004 15:48:32 -0000	1.6
X+++ lib/libc/stdio/fgetws.c	17 Dec 2006 06:49:27 -0000
X@@ -58,7 +58,7 @@
X 		goto error;
X 	wsp = ws;
X 	do {
X-		src = fp->_p;
X+		src = (const char *)fp->_p;
X 		nl = memchr(fp->_p, '\n', fp->_r);
X 		nconv = __mbsnrtowcs(wsp, &src,
X 		    nl != NULL ? (nl - fp->_p + 1) : fp->_r,
XIndex: lib/libc/stdio/mktemp.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/stdio/mktemp.c,v
Xretrieving revision 1.29
Xdiff -u -r1.29 mktemp.c
X--- lib/libc/stdio/mktemp.c	9 Jan 2007 00:28:07 -0000	1.29
X+++ lib/libc/stdio/mktemp.c	24 Jan 2007 01:53:11 -0000
X@@ -169,7 +169,7 @@
X 		for (trv = start;;) {
X 			if (*trv == '\0' || trv == suffp)
X 				return (0);
X-			pad = strchr(padchar, *trv);
X+			pad = strchr((const char *)padchar, *trv);
X 			if (pad == NULL || *++pad == '\0')
X 				*trv++ = padchar[0];
X 			else {
XIndex: lib/libc/stdio/vswprintf.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libc/stdio/vswprintf.c,v
Xretrieving revision 1.6
Xdiff -u -r1.6 vswprintf.c
X--- lib/libc/stdio/vswprintf.c	21 Feb 2005 19:41:44 -0000	1.6
X+++ lib/libc/stdio/vswprintf.c	17 Dec 2006 06:49:27 -0000
X@@ -74,7 +74,7 @@
X 		return (-1);
X 	}
X 	*f._p = '\0';
X-	mbp = f._bf._base;
X+	mbp = (char *)f._bf._base;
X 	/*
X 	 * XXX Undo the conversion from wide characters to multibyte that
X 	 * fputwc() did in __vfwprintf().
XIndex: lib/libpmc/pmclog.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libpmc/pmclog.c,v
Xretrieving revision 1.4
Xdiff -u -r1.4 pmclog.c
X--- lib/libpmc/pmclog.c	26 Mar 2006 12:20:53 -0000	1.4
X+++ lib/libpmc/pmclog.c	17 Dec 2006 06:49:27 -0000
X@@ -88,7 +88,7 @@
X 	int			ps_fd;		/* active fd or -1 */
X 	char			*ps_buffer;	/* scratch buffer if fd != -1 */
X 	char			*ps_data;	/* current parse pointer */
X-	size_t			ps_len;		/* length of buffered data */
X+	ssize_t			ps_len;		/* length of buffered data */
X };
X 
X #define	PMCLOG_HEADER_FROM_SAVED_STATE(PS)				\
XIndex: lib/libpthread/sys/lock.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libpthread/sys/lock.h,v
Xretrieving revision 1.7
Xdiff -u -r1.7 lock.h
X--- lib/libpthread/sys/lock.h	4 Nov 2003 20:01:38 -0000	1.7
X+++ lib/libpthread/sys/lock.h	17 Dec 2006 06:49:27 -0000
X@@ -53,8 +53,8 @@
X struct lockreq {
X 	struct lockuser	*lr_watcher;	/* only used for priority locks */
X 	struct lockuser	*lr_owner;	/* only used for priority locks */
X-	volatile int	lr_locked;	/* lock granted = 0, busy otherwise */
X-	volatile int	lr_active;	/* non-zero if the lock is last lock for thread */
X+	volatile u_int	lr_locked;	/* lock granted = 0, busy otherwise */
X+	volatile u_int	lr_active;	/* non-zero if the lock is last lock for thread */
X };
X 
X struct lockuser {
XIndex: lib/libpthread/thread/thr_private.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libpthread/thread/thr_private.h,v
Xretrieving revision 1.128
Xdiff -u -r1.128 thr_private.h
X--- lib/libpthread/thread/thr_private.h	12 Jan 2007 07:26:18 -0000	1.128
X+++ lib/libpthread/thread/thr_private.h	24 Jan 2007 01:53:39 -0000
X@@ -1104,7 +1104,7 @@
X /* Garbage collector lock. */
X SCLASS struct lock	_gc_lock;
X SCLASS int		_gc_check		SCLASS_PRESET(0);
X-SCLASS int		_gc_count		SCLASS_PRESET(0);
X+SCLASS u_int		_gc_count		SCLASS_PRESET(0);
X 
X SCLASS struct lock	_mutex_static_lock;
X SCLASS struct lock	_rwlock_static_lock;
XIndex: lib/libthread_db/arch/amd64/libpthread_md.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/lib/libthread_db/arch/amd64/libpthread_md.c,v
Xretrieving revision 1.3
Xdiff -u -r1.3 libpthread_md.c
X--- lib/libthread_db/arch/amd64/libpthread_md.c	1 Aug 2004 02:08:39 -0000	1.3
X+++ lib/libthread_db/arch/amd64/libpthread_md.c	17 Dec 2006 06:49:27 -0000
X@@ -29,6 +29,7 @@
X __FBSDID("$FreeBSD: src/lib/libthread_db/arch/amd64/libpthread_md.c,v 1.3 2004/08/01 02:08:39 davidxu Exp $");
X 
X #include <sys/procfs.h>
X+#include <string.h>
X #include <ucontext.h>
X 
X void
XIndex: sbin/fsdb/fsdb.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/fsdb/fsdb.c,v
Xretrieving revision 1.35
Xdiff -u -r1.35 fsdb.c
X--- sbin/fsdb/fsdb.c	31 Oct 2006 22:07:29 -0000	1.35
X+++ sbin/fsdb/fsdb.c	17 Dec 2006 06:49:27 -0000
X@@ -523,8 +523,10 @@
X 	    }
X 	    /* Look through direct data blocks. */
X 	    if (is_ufs2 ?
X-		find_blks64(curinode->dp2.di_db, NDADDR, wantedblk64) :
X-		find_blks32(curinode->dp1.di_db, NDADDR, wantedblk32))
X+		find_blks64((uint64_t *)curinode->dp2.di_db, NDADDR,
X+		    wantedblk64) :
X+		find_blks32((uint32_t *)curinode->dp1.di_db, NDADDR,
X+		    wantedblk32))
X 		goto end;
X 	    for (i = 0; i < NIADDR; i++) {
X 		/*
XIndex: sbin/gpt/label.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/gpt/label.c,v
Xretrieving revision 1.3
Xdiff -u -r1.3 label.c
X--- sbin/gpt/label.c	4 Oct 2006 18:20:25 -0000	1.3
X+++ sbin/gpt/label.c	17 Dec 2006 06:49:27 -0000
X@@ -162,7 +162,7 @@
X 		fclose(f);
X 	name[len] = '\0';
X 	/* Only keep the first line, excluding the newline character. */
X-	p = strchr(name, '\n');
X+	p = strchr((const char *)name, '\n');
X 	if (p != NULL)
X 		*p = '\0';
X }
X@@ -203,7 +203,7 @@
X 		case 'l':
X 			if (name != NULL)
X 				usage_label();
X-			name = strdup(optarg);
X+			name = (uint8_t *)strdup(optarg);
X 			break;
X 		case 's':
X 			if (size > 0)
XIndex: sbin/gpt/migrate.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/gpt/migrate.c,v
Xretrieving revision 1.16
Xdiff -u -r1.16 migrate.c
X--- sbin/gpt/migrate.c	1 Sep 2005 02:42:52 -0000	1.16
X+++ sbin/gpt/migrate.c	17 Dec 2006 06:49:27 -0000
X@@ -100,21 +100,22 @@
X 		case FS_SWAP: {
X 			uuid_t swap = GPT_ENT_TYPE_FREEBSD_SWAP;
X 			le_uuid_enc(&ent->ent_type, &swap);
X-			utf8_to_utf16("FreeBSD swap partition",
X+			utf8_to_utf16((const uint8_t *)"FreeBSD swap partition",
X 			    ent->ent_name, 36);
X 			break;
X 		}
X 		case FS_BSDFFS: {
X 			uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS;
X 			le_uuid_enc(&ent->ent_type, &ufs);
X-			utf8_to_utf16("FreeBSD UFS partition",
X+			utf8_to_utf16((const uint8_t *)"FreeBSD UFS partition",
X 			    ent->ent_name, 36);
X 			break;
X 		}
X 		case FS_VINUM: {
X 			uuid_t vinum = GPT_ENT_TYPE_FREEBSD_VINUM;
X 			le_uuid_enc(&ent->ent_type, &vinum);
X-			utf8_to_utf16("FreeBSD vinum partition",
X+			utf8_to_utf16(
X+			    (const uint8_t *)"FreeBSD vinum partition",
X 			    ent->ent_name, 36);
X 			break;
X 		}
X@@ -255,7 +256,8 @@
X 				le_uuid_enc(&ent->ent_type, &freebsd);
X 				ent->ent_lba_start = htole64((uint64_t)start);
X 				ent->ent_lba_end = htole64(start + size - 1LL);
X-				utf8_to_utf16("FreeBSD disklabel partition",
X+				utf8_to_utf16((const uint8_t *)
X+				    "FreeBSD disklabel partition",
X 				    ent->ent_name, 36);
X 				ent++;
X 			} else
X@@ -267,7 +269,7 @@
X 			le_uuid_enc(&ent->ent_type, &efi_slice);
X 			ent->ent_lba_start = htole64((uint64_t)start);
X 			ent->ent_lba_end = htole64(start + size - 1LL);
X-			utf8_to_utf16("EFI system partition",
X+			utf8_to_utf16((const uint8_t *)"EFI system partition",
X 			    ent->ent_name, 36);
X 			ent++;
X 			break;
XIndex: sbin/growfs/growfs.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/growfs/growfs.c,v
Xretrieving revision 1.25
Xdiff -u -r1.25 growfs.c
X--- sbin/growfs/growfs.c	17 Jul 2006 20:48:36 -0000	1.25
X+++ sbin/growfs/growfs.c	17 Dec 2006 06:49:27 -0000
X@@ -156,7 +156,7 @@
X static void	updrefs(int, ino_t, struct gfs_bpp *, int, int, unsigned int);
X static void	indirchk(ufs_lbn_t, ufs_lbn_t, ufs2_daddr_t, ufs_lbn_t,
X 		    struct gfs_bpp *, int, int, unsigned int);
X-static void	get_dev_size(int, int *);
X+static void	get_dev_size(int, u_int32_t *);
X 
X /* ************************************************************ growfs ***** */
X /*
X@@ -1924,7 +1924,7 @@
X  * e.g. from vinum volumes.
X  */
X static void
X-get_dev_size(int fd, int *size)
X+get_dev_size(int fd, u_int32_t *size)
X {
X    int sectorsize;
X    off_t mediasize;
X@@ -1977,7 +1977,7 @@
X 	struct disklabel	*lp;
X 	struct partition	*pp;
X 	int	i,fsi,fso;
X-    u_int32_t p_size;
X+	u_int32_t p_size;
X 	char	reply[5];
X #ifdef FSMAXSNAP
X 	int	j;
XIndex: sbin/newfs/mkfs.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/newfs/mkfs.c,v
Xretrieving revision 1.92
Xdiff -u -r1.92 mkfs.c
X--- sbin/newfs/mkfs.c	31 Oct 2006 21:52:27 -0000	1.92
X+++ sbin/newfs/mkfs.c	4 Apr 2007 03:42:57 -0000
X@@ -134,7 +134,7 @@
X 	if (Uflag)
X 		sblock.fs_flags |= FS_DOSOFTDEP;
X 	if (Lflag)
X-		strlcpy(sblock.fs_volname, volumelabel, MAXVOLLEN);
X+		strlcpy((char *)sblock.fs_volname, volumelabel, MAXVOLLEN);
X 	if (Jflag)
X 		sblock.fs_flags |= FS_GJOURNAL;
X 	if (lflag)
XIndex: sbin/newfs/newfs.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/newfs/newfs.c,v
Xretrieving revision 1.82
Xdiff -u -r1.82 newfs.c
X--- sbin/newfs/newfs.c	2 Mar 2007 20:07:59 -0000	1.82
X+++ sbin/newfs/newfs.c	4 Apr 2007 03:41:02 -0000
X@@ -134,7 +134,7 @@
X int	maxbpg;			/* maximum blocks per file in a cyl group */
X int	avgfilesize = AVFILESIZ;/* expected average file size */
X int	avgfilesperdir = AFPDIR;/* expected number of files per directory */
X-u_char	*volumelabel = NULL;	/* volume label for filesystem */
X+char	*volumelabel = NULL;	/* volume label for filesystem */
X struct uufsd disk;		/* libufs disk structure */
X 
X static char	device[MAXPATHLEN];
XIndex: sbin/newfs/newfs.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sbin/newfs/newfs.h,v
Xretrieving revision 1.18
Xdiff -u -r1.18 newfs.h
X--- sbin/newfs/newfs.h	31 Oct 2006 21:52:27 -0000	1.18
X+++ sbin/newfs/newfs.h	4 Apr 2007 03:41:23 -0000
X@@ -66,7 +66,7 @@
X extern int	maxbpg;		/* maximum blocks per file in a cyl group */
X extern int	avgfilesize;	/* expected average file size */
X extern int	avgfilesperdir;	/* expected number of files per directory */
X-extern u_char	*volumelabel;	/* volume label for filesystem */
X+extern char	*volumelabel;	/* volume label for filesystem */
X extern struct uufsd disk;	/* libufs disk structure */
X 
X void mkfs (struct partition *, char *);
XIndex: share/mk/bsd.sys.mk
X===================================================================
XRCS file: /usr/download/ncvs2/src/share/mk/bsd.sys.mk,v
Xretrieving revision 1.39
Xdiff -u -r1.39 bsd.sys.mk
X--- share/mk/bsd.sys.mk	4 Nov 2006 04:39:05 -0000	1.39
X+++ share/mk/bsd.sys.mk	3 Apr 2007 23:22:45 -0000
X@@ -8,6 +8,9 @@
X 
X # for GCC:  http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
X 
X+#XXXKAN: Enable when tree is in better shape
X+NO_WERROR	=	yes
X+
X .if !defined(NO_WARNS) && ${CC} != "icc"
X . if defined(CSTD)
X .  if ${CSTD} == "k&r"
X@@ -51,6 +54,8 @@
X # XXX always get it right.
X CWARNFLAGS	+=	-Wno-uninitialized
X .  endif
X+#XXXKAN: Remove before commit
X+#CWARNFLAGS	+=	-Wno-pointer-sign
X . endif
X 
X . if defined(FORMAT_AUDIT)
XIndex: sys/amd64/include/md_var.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/amd64/include/md_var.h,v
Xretrieving revision 1.80
Xdiff -u -r1.80 md_var.h
X--- sys/amd64/include/md_var.h	18 Jan 2007 05:46:32 -0000	1.80
X+++ sys/amd64/include/md_var.h	24 Jan 2007 01:54:49 -0000
X@@ -57,7 +57,9 @@
X extern	uint64_t *vm_page_dump;
X extern	int	vm_page_dump_size;
X 
X+#ifdef _SYS_PCPU_H_
X extern	struct pcpu __pcpu[];
X+#endif
X 
X typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
X struct	thread;
XIndex: sys/amd64/include/smp.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/amd64/include/smp.h,v
Xretrieving revision 1.89
Xdiff -u -r1.89 smp.h
X--- sys/amd64/include/smp.h	6 Mar 2007 17:16:46 -0000	1.89
X+++ sys/amd64/include/smp.h	14 Mar 2007 01:09:38 -0000
X@@ -23,6 +23,7 @@
X #include <machine/frame.h>
X #include <machine/intr_machdep.h>
X #include <machine/apicvar.h>
X+#include <machine/pcb.h>
X 
X /* global symbols in mpboot.S */
X extern char			mptramp_start[];
XIndex: sys/boot/i386/boot2/Makefile
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/boot/i386/boot2/Makefile,v
Xretrieving revision 1.59
Xdiff -u -r1.59 Makefile
X--- sys/boot/i386/boot2/Makefile	15 Jul 2005 12:22:14 -0000	1.59
X+++ sys/boot/i386/boot2/Makefile	17 Dec 2006 06:49:28 -0000
X@@ -20,7 +20,7 @@
X #BOOT2_UFS?=	UFS2_ONLY
X #BOOT2_UFS?=	UFS1_ONLY
X 
X-CFLAGS=	-Os \
X+CFLAGS=	-Os -march=i386 \
X 	-fno-guess-branch-probability \
X 	-fomit-frame-pointer \
X 	-fno-unit-at-a-time \
X@@ -36,7 +36,8 @@
X 	-I${.CURDIR}/../btx/lib -I. \
X 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
X 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
X-	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings
X+	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
X+	-Winline --param max-inline-insns-single=100
X 
X LDFLAGS=-static -N --gc-sections
X 
XIndex: sys/boot/i386/boot2/boot2.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/boot/i386/boot2/boot2.c,v
Xretrieving revision 1.83
Xdiff -u -r1.83 boot2.c
X--- sys/boot/i386/boot2/boot2.c	2 Nov 2006 17:28:38 -0000	1.83
X+++ sys/boot/i386/boot2/boot2.c	17 Dec 2006 06:49:28 -0000
X@@ -157,8 +157,8 @@
X     const char *s = src;
X     char *d = dst;
X 
X-    while (len--)
X-        *d++ = *s++;
X+    while (--len >= 0)
X+        d[len] = s[len];
X }
X 
X static inline int
X@@ -563,7 +563,6 @@
X printf(const char *fmt,...)
X {
X     va_list ap;
X-    char buf[10];
X     char *s;
X     unsigned u;
X     int c;
X@@ -582,12 +581,9 @@
X 		continue;
X 	    case 'u':
X 		u = va_arg(ap, unsigned);
X-		s = buf;
X 		do
X-		    *s++ = '0' + u % 10U;
X+		    putchar('0' + u % 10U);
X 		while (u /= 10U);
X-		while (--s >= buf)
X-		    putchar(*s);
X 		continue;
X 	    }
X 	}
XIndex: sys/boot/pc98/boot2/boot.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/boot/pc98/boot2/boot.c,v
Xretrieving revision 1.16
Xdiff -u -r1.16 boot.c
X--- sys/boot/pc98/boot2/boot.c	2 Nov 2006 17:28:38 -0000	1.16
X+++ sys/boot/pc98/boot2/boot.c	5 Apr 2007 18:41:37 -0000
X@@ -70,7 +70,7 @@
X static char kernel_config_namebuf[NAMEBUF_LEN + sizeof "config"];
X static char linebuf[NAMEBUF_LEN];
X static char namebuf[NAMEBUF_LEN];
X-static struct bootinfo bootinfo;
X+struct bootinfo bootinfo;
X int loadflags;
X 
X static void getbootdev(char *ptr, int *howto);
XIndex: sys/cam/cam.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/cam.c,v
Xretrieving revision 1.10
Xdiff -u -r1.10 cam.c
X--- sys/cam/cam.c	18 Apr 2006 21:53:39 -0000	1.10
X+++ sys/cam/cam.c	17 Dec 2006 06:49:28 -0000
X@@ -104,7 +104,7 @@
X #endif
X 
X void
X-cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen)
X+cam_strvis(char *dst, const char *src, int srclen, int dstlen)
X {
X 
X 	/* Trim leading/trailing spaces, nulls. */
X@@ -115,16 +115,17 @@
X 		srclen--;
X 
X 	while (srclen > 0 && dstlen > 1) {
X-		u_int8_t *cur_pos = dst;
X+		char *cur_pos = dst;
X+		u_int8_t ch = *src;
X 
X-		if (*src < 0x20 || *src >= 0x80) {
X+		if (*src < 0x20 || ch >= 0x80) {
X 			/* SCSI-II Specifies that these should never occur. */
X 			/* non-printable character */
X 			if (dstlen > 4) {
X 				*cur_pos++ = '\\';
X-				*cur_pos++ = ((*src & 0300) >> 6) + '0';
X-				*cur_pos++ = ((*src & 0070) >> 3) + '0';
X-				*cur_pos++ = ((*src & 0007) >> 0) + '0';
X+				*cur_pos++ = ((ch & 0300) >> 6) + '0';
X+				*cur_pos++ = ((ch & 0070) >> 3) + '0';
X+				*cur_pos++ = ((ch & 0007) >> 0) + '0';
X 			} else {
X 				*cur_pos++ = '?';
X 			}
X@@ -147,7 +148,7 @@
X  * wildcard '?' matches a single non-space character.
X  */
X int
X-cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len)
X+cam_strmatch(const char *str, const char *pattern, int str_len)
X {
X 
X 	while (*pattern != '\0'&& str_len > 0) {  
XIndex: sys/cam/cam.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/cam.h,v
Xretrieving revision 1.11
Xdiff -u -r1.11 cam.h
X--- sys/cam/cam.h	5 Jan 2005 22:34:34 -0000	1.11
X+++ sys/cam/cam.h	17 Dec 2006 06:49:28 -0000
X@@ -199,9 +199,9 @@
X caddr_t	cam_quirkmatch(caddr_t target, caddr_t quirk_table, int num_entries,
X 		       int entry_size, cam_quirkmatch_t *comp_func);
X 
X-void	cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen);
X+void	cam_strvis(char *dst, const char *src, int srclen, int dstlen);
X 
X-int	cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len);
X+int	cam_strmatch(const char *str, const char *pattern, int str_len);
X const struct cam_status_entry*
X 	cam_fetch_status_entry(cam_status status);
X #ifdef _KERNEL
XIndex: sys/cam/cam_periph.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/cam_periph.c,v
Xretrieving revision 1.64
Xdiff -u -r1.64 cam_periph.c
X--- sys/cam/cam_periph.c	5 Dec 2006 07:45:27 -0000	1.64
X+++ sys/cam/cam_periph.c	17 Dec 2006 06:49:28 -0000
X@@ -648,7 +648,7 @@
X 		mapinfo->bp[i]->b_saveaddr = mapinfo->bp[i]->b_data;
X 
X 		/* put our pointer in the data slot */
X-		mapinfo->bp[i]->b_data = *data_ptrs[i];
X+		mapinfo->bp[i]->b_data = (caddr_t)*data_ptrs[i];
X 
X 		/* set the transfer length, we know it's < DFLTPHYS */
X 		mapinfo->bp[i]->b_bufsize = lengths[i];
X@@ -676,7 +676,7 @@
X 		}
X 
X 		/* set our pointer to the new mapped area */
X-		*data_ptrs[i] = mapinfo->bp[i]->b_data;
X+		*data_ptrs[i] = (u_int8_t *)mapinfo->bp[i]->b_data;
X 
X 		mapinfo->num_bufs_used++;
X 	}
X@@ -1556,6 +1556,7 @@
X 	frozen = (status & CAM_DEV_QFRZN) != 0;
X 	status &= CAM_STATUS_MASK;
X 	openings = relsim_flags = 0;
X+	timeout = 0;
X 
X 	switch (status) {
X 	case CAM_REQ_CMP:
XIndex: sys/cam/scsi/scsi_cd.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/scsi/scsi_cd.c,v
Xretrieving revision 1.97
Xdiff -u -r1.97 scsi_cd.c
X--- sys/cam/scsi/scsi_cd.c	5 Dec 2006 07:45:27 -0000	1.97
X+++ sys/cam/scsi/scsi_cd.c	17 Dec 2006 06:49:28 -0000
X@@ -1522,7 +1522,7 @@
X 					/* lba */ bp->bio_offset /
X 					  softc->params.blksize,
X 					bp->bio_bcount / softc->params.blksize,
X-					/* data_ptr */ bp->bio_data,
X+					/* data_ptr */ (u_int8_t *)bp->bio_data,
X 					/* dxfer_len */ bp->bio_bcount,
X 					/* sense_len */ SSD_FULL_SIZE,
X 					/* timeout */ 30000);
XIndex: sys/cam/scsi/scsi_da.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/cam/scsi/scsi_da.c,v
Xretrieving revision 1.203
Xdiff -u -r1.203 scsi_da.c
X--- sys/cam/scsi/scsi_da.c	21 Feb 2007 07:45:01 -0000	1.203
X+++ sys/cam/scsi/scsi_da.c	3 Mar 2007 17:07:47 -0000
X@@ -45,7 +45,9 @@
X #include <sys/malloc.h>
X #include <sys/cons.h>
X 
X+#ifdef _KERNEL
X #include <machine/md_var.h>
X+#endif /* _KERNEL */
X 
X #include <vm/vm.h>
X #include <vm/pmap.h>
X@@ -1285,7 +1287,7 @@
X 						/*lba*/bp->bio_pblkno,
X 						/*block_count*/bp->bio_bcount /
X 						softc->params.secsize,
X-						/*data_ptr*/ bp->bio_data,
X+						/*data_ptr*/ (u_int8_t *)bp->bio_data,
X 						/*dxfer_len*/ bp->bio_bcount,
X 						/*sense_len*/SSD_FULL_SIZE,
X 						/*timeout*/da_default_timeout*1000);
XIndex: sys/conf/kern.mk
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/conf/kern.mk,v
Xretrieving revision 1.50
Xdiff -u -r1.50 kern.mk
X--- sys/conf/kern.mk	26 Nov 2006 23:16:46 -0000	1.50
X+++ sys/conf/kern.mk	17 Dec 2006 06:49:28 -0000
X@@ -12,7 +12,7 @@
X .else
X CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
X 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
X-		${_wundef} -fformat-extensions
X+		${_wundef} -Wno-pointer-sign -fformat-extensions
X .if !defined(NO_UNDEF)
X _wundef=	-Wundef
X .endif
XIndex: sys/conf/kern.pre.mk
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/conf/kern.pre.mk,v
Xretrieving revision 1.81
Xdiff -u -r1.81 kern.pre.mk
X--- sys/conf/kern.pre.mk	26 Oct 2006 15:16:43 -0000	1.81
X+++ sys/conf/kern.pre.mk	17 Dec 2006 06:49:28 -0000
X@@ -53,7 +53,7 @@
X NOSTDINC= -nostdinc
X .endif
X 
X-INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S
X+INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
X 
X # This hack lets us use the OpenBSD altq code without spamming a new
X # include path into contrib'ed source files.
X@@ -87,7 +87,7 @@
X CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
X CFLAGS+= --param inline-unit-growth=100
X CFLAGS+= --param large-function-growth=1000
X-WERROR?= -Werror
X+#WERROR?= -Werror
X .endif
X 
X # XXX LOCORE means "don't declare C stuff" not "for locore.s".
XIndex: sys/conf/kmod.mk
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/conf/kmod.mk,v
Xretrieving revision 1.217
Xdiff -u -r1.217 kmod.mk
X--- sys/conf/kmod.mk	21 Mar 2007 03:42:49 -0000	1.217
X+++ sys/conf/kmod.mk	31 Mar 2007 16:34:41 -0000
X@@ -79,7 +79,7 @@
X . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
X CFLAGS+=	-fno-strict-aliasing
X . endif
X-WERROR?=	-Werror
X+#WERROR?=	-Werror
X .endif
X CFLAGS+=	${WERROR}
X CFLAGS+=	-D_KERNEL
X@@ -93,7 +93,7 @@
X NOSTDINC=	-nostdinc
X .endif
X CFLAGS+=	${C_DIALECT}
X-CFLAGS:=	${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*}
X+CFLAGS:=	${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
X .if defined(KERNBUILDDIR)
X CFLAGS+=	-DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
X .endif
XIndex: sys/contrib/dev/acpica/exprep.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/contrib/dev/acpica/exprep.c,v
Xretrieving revision 1.1.1.25
Xdiff -u -r1.1.1.25 exprep.c
X--- sys/contrib/dev/acpica/exprep.c	22 Mar 2007 17:23:42 -0000	1.1.1.25
X+++ sys/contrib/dev/acpica/exprep.c	31 Mar 2007 16:34:42 -0000
X@@ -364,6 +364,7 @@
X         ACPI_ERROR ((AE_INFO,
X             "Unknown field access type %X",
X             Access));
X+    	*ReturnByteAlignment = 1;
X         return_UINT32 (0);
X     }
X 
XIndex: sys/dev/an/if_an.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/dev/an/if_an.c,v
Xretrieving revision 1.80
Xdiff -u -r1.80 if_an.c
X--- sys/dev/an/if_an.c	6 Nov 2006 13:41:50 -0000	1.80
X+++ sys/dev/an/if_an.c	17 Dec 2006 06:49:28 -0000
X@@ -1478,7 +1478,6 @@
X 	struct an_card_rid_desc an_rid_desc;
X 	struct an_command	cmd;
X 	struct an_reply		reply;
X-	char			*buf;
X 	u_int16_t		*ptr;
X 	u_int8_t		*ptr2;
X 	int			i, len;
X@@ -1554,8 +1553,6 @@
X 			return(EIO);
X 		}
X 
X-		ptr = (u_int16_t *)buf;
X-
X 		if (reply.an_status & AN_CMD_QUAL_MASK) {
X 			printf("an%d: failed to write RID 2 %x %x %x %x %x, %d\n", 
X 			    sc->an_unit, ltv->an_type, 
XIndex: sys/dev/usb/ufoma.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/dev/usb/ufoma.c,v
Xretrieving revision 1.2
Xdiff -u -r1.2 ufoma.c
X--- sys/dev/usb/ufoma.c	7 Sep 2006 00:06:41 -0000	1.2
X+++ sys/dev/usb/ufoma.c	17 Dec 2006 06:49:28 -0000
X@@ -256,8 +256,6 @@
X };
X 
X 
X-static devclass_t ucom_devclass;
X-
X DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0);
X MODULE_DEPEND(ufoma, usb, 1, 1, 1);
X MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
XIndex: sys/i386/include/smp.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/i386/include/smp.h,v
Xretrieving revision 1.88
Xdiff -u -r1.88 smp.h
X--- sys/i386/include/smp.h	6 Mar 2007 17:16:47 -0000	1.88
X+++ sys/i386/include/smp.h	14 Mar 2007 01:10:15 -0000
X@@ -23,6 +23,7 @@
X #include <machine/frame.h>
X #include <machine/intr_machdep.h>
X #include <machine/apicvar.h>
X+#include <machine/pcb.h>
X 
X /* global data in mpboot.s */
X extern int			bootMP_size;
XIndex: sys/kern/kern_linker.c
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/kern/kern_linker.c,v
Xretrieving revision 1.147
Xdiff -u -r1.147 kern_linker.c
X--- sys/kern/kern_linker.c	4 Mar 2007 22:36:46 -0000	1.147
X+++ sys/kern/kern_linker.c	14 Mar 2007 01:10:18 -0000
X@@ -795,7 +795,7 @@
X }
X 
X int
X-linker_ddb_search_symbol(caddr_t value, c_linker_sym_t *sym, long *diffp)
X+linker_ddb_search_symbol(caddr_t value, c_linker_sym_t *sym, u_long *diffp)
X {
X 	linker_file_t lf;
X 	c_linker_sym_t best, es;
XIndex: sys/sparc64/include/smp.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/sparc64/include/smp.h,v
Xretrieving revision 1.19
Xdiff -u -r1.19 smp.h
X--- sys/sparc64/include/smp.h	3 Nov 2005 21:08:20 -0000	1.19
X+++ sys/sparc64/include/smp.h	17 Dec 2006 06:49:28 -0000
X@@ -37,6 +37,7 @@
X 
X #include <machine/intr_machdep.h>
X #include <machine/tte.h>
X+#include <machine/pcb.h>
X 
X #define	IDR_BUSY	(1<<0)
X #define	IDR_NACK	(1<<1)
XIndex: sys/sys/linker.h
X===================================================================
XRCS file: /usr/download/ncvs2/src/sys/sys/linker.h,v
Xretrieving revision 1.46
Xdiff -u -r1.46 linker.h
X--- sys/sys/linker.h	20 Jun 2006 20:59:55 -0000	1.46
X+++ sys/sys/linker.h	17 Dec 2006 06:49:28 -0000
X@@ -153,7 +153,7 @@
X  */
X int linker_ddb_lookup(const char *_symstr, c_linker_sym_t *_sym);
X int linker_ddb_search_symbol(caddr_t _value, c_linker_sym_t *_sym,
X-			     long *_diffp);
X+			     u_long *_diffp);
X int linker_ddb_symbol_values(c_linker_sym_t _sym, linker_symval_t *_symval);
X 
X 
END-of-src.diff
exit