Index: Makefile.inc1 =================================================================== RCS file: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.565 diff -u -r1.565 Makefile.inc1 --- Makefile.inc1 27 Nov 2006 19:38:28 -0000 1.565 +++ Makefile.inc1 1 Dec 2006 02:45:33 -0000 @@ -999,21 +999,31 @@ # libraries: cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 _prereq_libs; \ ${MAKE} -f Makefile.inc1 _startup_libs; \ ${MAKE} -f Makefile.inc1 _prebuild_libs; \ ${MAKE} -f Makefile.inc1 _generic_libs; +# +# static _pic.a prerequisites for shared libgcc +# +_prereq_libs= lib/libc + # These dependencies are not automatically generated: # # gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all # shared libraries for ELF. # -_startup_libs= gnu/lib/csu gnu/lib/libgcc +_startup_libs= gnu/lib/csu .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) _startup_libs+= lib/csu/${MACHINE_ARCH}-elf .else _startup_libs+= lib/csu/${MACHINE_ARCH} .endif +_startup_libs+= gnu/lib/libgcc +_startup_libs+= lib/libc + +lib/libc__L: gnu/lib/libgcc__L _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ @@ -1068,6 +1078,20 @@ lib/libradius__L: lib/libmd__L .endif +.for _lib in ${_prereq_libs} +${_lib}__PL: .PHONY +.if exists(${.CURDIR}/${_lib}) + ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_lib}; \ + ${MAKE} DIRPRFX=${_lib}/ obj; \ + ${MAKE} DIRPRFX=${_lib}/ depend; \ + ${MAKE} -DWITHOUT_PROFILE -DNO_PIC -DFORCE_PIC_ARCHIVE \ + DIRPRFX=${_lib}/ all; \ + ${MAKE} -DWITHOUT_PROFILE -DNO_PIC -DFORCE_PIC_ARCHIVE \ + DIRPRFX=${_lib}/ install +.endif +.endfor + .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) @@ -1091,6 +1115,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} Index: bin/date/Makefile =================================================================== RCS file: /home/ncvs/src/bin/date/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- bin/date/Makefile 13 Jun 2003 07:04:01 -0000 1.11 +++ bin/date/Makefile 22 Sep 2006 03:40:17 -0000 @@ -6,4 +6,5 @@ DPADD= ${LIBUTIL} LDADD= -lutil +CFLAGS+= -v .include Index: bin/df/df.c =================================================================== RCS file: /home/ncvs/src/bin/df/df.c,v retrieving revision 1.66 diff -u -r1.66 df.c --- bin/df/df.c 20 Sep 2006 20:55:02 -0000 1.66 +++ bin/df/df.c 21 Sep 2006 14:45:42 -0000 @@ -381,7 +381,7 @@ static void prtstat(struct statfs *sfsp, struct maxwidths *mwp) { - static u_long blocksize; + static long blocksize; static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; @@ -458,7 +458,7 @@ static void update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static u_long blocksize = 0; + static long blocksize = 0; int dummy; if (blocksize == 0) Index: bin/ed/cbc.c =================================================================== RCS file: /home/ncvs/src/bin/ed/cbc.c,v retrieving revision 1.20 diff -u -r1.20 cbc.c --- bin/ed/cbc.c 6 Apr 2004 20:06:47 -0000 1.20 +++ bin/ed/cbc.c 15 Sep 2006 01:15:02 -0000 @@ -175,7 +175,7 @@ /* * copy it, nul-padded, into the key area */ - expand_des_key(msgbuf, p); + expand_des_key((char *)msgbuf, p); MEMZERO(p, _PASSWORD_LEN); set_des_key(&msgbuf); MEMZERO(msgbuf, sizeof msgbuf); Index: contrib/amd/hlfsd/homedir.c =================================================================== RCS file: /home/ncvs/src/contrib/amd/hlfsd/homedir.c,v retrieving revision 1.7 diff -u -r1.7 homedir.c --- contrib/amd/hlfsd/homedir.c 6 Jul 2004 13:16:46 -0000 1.7 +++ contrib/amd/hlfsd/homedir.c 15 Sep 2006 03:39:24 -0000 @@ -68,7 +68,7 @@ static uid2home_t *pwtab; static void delay(uid2home_t *, int); static void table_add(int, const char *, const char *); -static char mboxfile[MAXPATHLEN]; +char mboxfile[MAXPATHLEN]; static char *root_home; /* root's home directory */ /* GLOBAL FUNCTIONS */ Index: contrib/binutils/gas/config/tc-i386.c =================================================================== RCS file: /home/ncvs/src/contrib/binutils/gas/config/tc-i386.c,v retrieving revision 1.16 diff -u -r1.16 tc-i386.c --- contrib/binutils/gas/config/tc-i386.c 16 Jun 2004 06:55:47 -0000 1.16 +++ contrib/binutils/gas/config/tc-i386.c 22 Sep 2006 04:15:16 -0000 @@ -363,7 +363,7 @@ prefix), and doesn't work, unless the destination is in the bottom 64k of the code segment (The top 16 bits of eip are zeroed). */ -const relax_typeS md_relax_table[] = +static const relax_typeS md_relax_table[] = { /* The fields are: 1) most positive reach of this state, @@ -402,6 +402,8 @@ {0, 0, 4, 0} }; +const relax_typeS *md_relax_table_p = &md_relax_table[0]; + static const arch_entry cpu_arch[] = { {"i8086", Cpu086 }, {"i186", Cpu086|Cpu186 }, Index: contrib/binutils/gas/config/tc-i386.h =================================================================== RCS file: /home/ncvs/src/contrib/binutils/gas/config/tc-i386.h,v retrieving revision 1.11 diff -u -r1.11 tc-i386.h --- contrib/binutils/gas/config/tc-i386.h 16 Jun 2004 06:55:47 -0000 1.11 +++ contrib/binutils/gas/config/tc-i386.h 22 Sep 2006 04:12:22 -0000 @@ -448,8 +448,8 @@ #define md_operand(x) -extern const struct relax_type md_relax_table[]; -#define TC_GENERIC_RELAX_TABLE md_relax_table +extern const struct relax_type *md_relax_table_p; +#define TC_GENERIC_RELAX_TABLE md_relax_table_p extern int optimize_align_code; Index: contrib/csup/mux.c =================================================================== RCS file: /home/ncvs/src/contrib/csup/mux.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 mux.c --- contrib/csup/mux.c 3 Mar 2006 04:11:28 -0000 1.1.1.1 +++ contrib/csup/mux.c 14 Oct 2006 00:38:49 -0000 @@ -784,6 +784,7 @@ uint16_t hdrsize, size, len; int error, id, iovcnt, what; + what = 0; m = (struct mux *)arg; again: id = sender_waitforwork(m, &what); Index: contrib/csup/queue.h =================================================================== RCS file: /home/ncvs/src/contrib/csup/queue.h,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 queue.h --- contrib/csup/queue.h 3 Mar 2006 18:45:12 -0000 1.1.1.2 +++ contrib/csup/queue.h 15 Sep 2006 03:14:08 -0000 @@ -35,7 +35,7 @@ #ifndef _QUEUE_H_ #define _QUEUE_H_ -#undef __ofsetof +#undef __offsetof #define __offsetof(type, field) ((size_t)(&((type *)0)->field)) /* Index: contrib/gdb/gdb/i386fbsd-tdep.c =================================================================== RCS file: /home/ncvs/src/contrib/gdb/gdb/i386fbsd-tdep.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 i386fbsd-tdep.c --- contrib/gdb/gdb/i386fbsd-tdep.c 20 Jun 2004 18:17:51 -0000 1.1.1.1 +++ contrib/gdb/gdb/i386fbsd-tdep.c 15 Sep 2006 01:55:20 -0000 @@ -45,7 +45,7 @@ CORE_ADDR i386fbsd_sigtramp_end_addr = 0xbfbfdff0; /* From . */ -static int i386fbsd_sc_reg_offset[] = +int i386fbsd_sc_reg_offset[] = { 8 + 14 * 4, /* %eax */ 8 + 13 * 4, /* %ecx */ Index: contrib/openpam/lib/openpam_readline.c =================================================================== RCS file: /home/ncvs/src/contrib/openpam/lib/openpam_readline.c,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 openpam_readline.c --- contrib/openpam/lib/openpam_readline.c 17 Jun 2005 08:11:42 -0000 1.1.1.2 +++ contrib/openpam/lib/openpam_readline.c 13 Sep 2006 20:38:53 -0000 @@ -52,7 +52,7 @@ char * openpam_readline(FILE *f, int *lineno, size_t *lenp) { - unsigned char *line; + char *line; size_t len, size; int ch; @@ -63,7 +63,7 @@ #define line_putch(ch) do { \ if (len >= size - 1) { \ - unsigned char *tmp = realloc(line, size *= 2); \ + char *tmp = realloc(line, size *= 2); \ if (tmp == NULL) \ goto fail; \ line = tmp; \ Index: contrib/telnet/telnetd/ext.h =================================================================== RCS file: /home/ncvs/src/contrib/telnet/telnetd/ext.h,v retrieving revision 1.11 diff -u -r1.11 ext.h --- contrib/telnet/telnetd/ext.h 30 Nov 2001 22:28:07 -0000 1.11 +++ contrib/telnet/telnetd/ext.h 15 Sep 2006 01:00:57 -0000 @@ -175,7 +175,7 @@ wontoption(int); int output_data(const char *, ...) __printflike(1, 2); -void output_datalen(const char *, int); +void output_datalen(const unsigned char *, int); void startslave(char *, int, char *); #ifdef ENCRYPTION Index: contrib/telnet/telnetd/state.c =================================================================== RCS file: /home/ncvs/src/contrib/telnet/telnetd/state.c,v retrieving revision 1.14 diff -u -r1.14 state.c --- contrib/telnet/telnetd/state.c 4 May 2003 02:54:49 -0000 1.14 +++ contrib/telnet/telnetd/state.c 15 Sep 2006 01:02:35 -0000 @@ -1600,14 +1600,14 @@ va_start(args, format); if ((len = vasprintf(&buf, format, args)) == -1) return -1; - output_datalen(buf, len); + output_datalen((unsigned char *)buf, len); va_end(args); free(buf); return (len); } void -output_datalen(const char *buf, int len) +output_datalen(const unsigned char *buf, int len) { int remaining, copied; Index: contrib/telnet/telnetd/telnetd.c =================================================================== RCS file: /home/ncvs/src/contrib/telnet/telnetd/telnetd.c,v retrieving revision 1.29 diff -u -r1.29 telnetd.c --- contrib/telnet/telnetd/telnetd.c 26 Sep 2006 21:46:11 -0000 1.29 +++ contrib/telnet/telnetd/telnetd.c 27 Sep 2006 23:47:28 -0000 @@ -133,11 +133,12 @@ { u_long ultmp; struct sockaddr_storage from; - int on = 1, fromlen; + int on = 1; int ch; #if defined(IPPROTO_IP) && defined(IP_TOS) int tos = -1; #endif + socklen_t fromlen; char *ep; pfrontp = pbackp = ptyobuf; @@ -328,7 +329,8 @@ argv += optind; if (debug) { - int s, ns, foo, error; + int s, ns, error; + socklen_t foo; const char *service = "telnet"; struct addrinfo hints, *res; Index: contrib/telnet/telnetd/utility.c =================================================================== RCS file: /home/ncvs/src/contrib/telnet/telnetd/utility.c,v retrieving revision 1.13 diff -u -r1.13 utility.c --- contrib/telnet/telnetd/utility.c 4 May 2003 02:54:49 -0000 1.13 +++ contrib/telnet/telnetd/utility.c 15 Sep 2006 01:07:50 -0000 @@ -916,7 +916,7 @@ "MUTUAL" : "ONE-WAY"); { - char buf[512]; + unsigned char buf[512]; auth_printsub(&pointer[1], length - 1, buf, sizeof(buf)); output_data("%s", buf); } @@ -994,7 +994,7 @@ output_data(" %d (unknown)", pointer[2]); { - char buf[512]; + unsigned char buf[512]; encrypt_printsub(&pointer[1], length - 1, buf, sizeof(buf)); output_data("%s", buf); } Index: crypto/heimdal/lib/asn1/gen_glue.c =================================================================== RCS file: /home/ncvs/src/crypto/heimdal/lib/asn1/gen_glue.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 gen_glue.c --- crypto/heimdal/lib/asn1/gen_glue.c 9 Jan 2000 20:57:39 -0000 1.1.1.1 +++ crypto/heimdal/lib/asn1/gen_glue.c 14 Sep 2006 03:42:53 -0000 @@ -103,7 +103,9 @@ int tag = -1; fprintf (headerfile, - "extern struct units %s_units[];", + "#ifdef __PARSE_UNITS_H__\n" + "extern struct units %s_units[];\n" + "#endif /* __PARSE_UNITS_H__ */\n", s->gen_name); fprintf (codefile, Index: etc/mtree/BSD.include.dist =================================================================== RCS file: /home/ncvs/src/etc/mtree/BSD.include.dist,v retrieving revision 1.110 diff -u -r1.110 BSD.include.dist --- etc/mtree/BSD.include.dist 31 Oct 2006 22:22:29 -0000 1.110 +++ etc/mtree/BSD.include.dist 7 Nov 2006 01:56:50 -0000 @@ -14,15 +14,17 @@ bsnmp .. c++ - 3.4 - backward - .. + 4.1 + backward + .. bits .. debug .. ext .. + tr1 + .. .. .. cam Index: gnu/lib/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- gnu/lib/Makefile 17 Mar 2006 18:54:22 -0000 1.41 +++ gnu/lib/Makefile 25 Sep 2006 18:47:59 -0000 @@ -14,8 +14,4 @@ SUBDIR+= libobjc .endif -.if ${MK_FORTRAN} != "no" -SUBDIR+= libg2c -.endif - .include Index: gnu/lib/csu/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/csu/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- gnu/lib/csu/Makefile 10 Sep 2004 06:48:04 -0000 1.24 +++ gnu/lib/csu/Makefile 25 Sep 2006 18:47:39 -0000 @@ -1,12 +1,13 @@ # $FreeBSD: src/gnu/lib/csu/Makefile,v 1.24 2004/09/10 06:48:04 ru Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc +GCCLIB= ${.CURDIR}/../../../contrib/gcclibs CCDIR= ${.CURDIR}/../../usr.bin/cc .include "${CCDIR}/Makefile.tgt" .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} -SRCS= crtstuff.c tconfig.h tm.h +SRCS= crtstuff.c tconfig.h tm.h options.h OBJS= crtbegin.o crtend.o SOBJS= crtbegin.So crtend.So CSTD?= gnu89 @@ -14,7 +15,7 @@ CFLAGS+= -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-zero-initialized-in-bss \ -fno-omit-frame-pointer -fno-unit-at-a-time -CFLAGS+= -I${GCCDIR}/config -I${GCCDIR} -I. \ +CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} MKDEP= -DCRT_BEGIN @@ -58,8 +59,8 @@ ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${.ALLSRC:N*.h} -CLEANFILES+= tm.h tconfig.h -tm.h tconfig.h: ${CCDIR}/cc_tools/Makefile +CLEANFILES+= tm.h tconfig.h options.h optionlist cs-tconfig.h cs-tm.h +tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} realinstall: Index: gnu/lib/libgcc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libgcc/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- gnu/lib/libgcc/Makefile 12 Oct 2006 16:43:15 -0000 1.56 +++ gnu/lib/libgcc/Makefile 14 Nov 2006 00:54:45 -0000 @@ -4,40 +4,23 @@ .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" GCCDIR= ${.CURDIR}/../../../contrib/gcc +GCCLIB= ${.CURDIR}/../../../contrib/gcclibs .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} -# allow to be overridden for the a.out case -.if !defined(LIB) || ${LIB} != "gcc_r" -LIB= gcc -.endif - -#SHLIB_MAJOR= 1 - -# We need to install libgcc_pic.a as well, for use by shared libs. -INSTALL_PIC_ARCHIVE= - -# -# XXX This is a hack, but it seems to work. -# libgcc2.a is meant to be compiled by *this* version of gcc. -# -# Normally, this does not make any difference, since we only have gcc, but -# when bootstrapping from gcc-2.6.3, we have to use the freshly built 2.7.2 -# compiler for some of the libgcc2.c __attribute__ stuff. -# -# We now depend on a bootstrap pass (normally in `make world') to build -# and install the new version of gcc before we get here. This makes -# finding the new version (XCC) easy but may break finding the old version -# (CC). -# -XCC= ${CC} -XCXX= ${CXX} +LIB= gcc +SHLIB_NAME= libgcc_s.so.1 +SHLIBDIR= /lib -CFLAGS+= -fexceptions CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \ - -DFINE_GRAINED_LIBRARIES -CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK -CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \ - -I${GCCDIR}/config -I${GCCDIR} -I. + -DHAVE_GTHR_DEFAULT \ + -I${GCCLIB}/include \ + -I${GCCDIR}/config -I${GCCDIR} -I. \ + -I${.CURDIR}/../../usr.bin/cc/cc_tools + +# Flags to add when compiling functions than can trap with divide by zero +# Flags to add when compiling static objects +LDFLAGS+= -v -nodefaultlibs +#LDADD+= -lc_pic OBJS= # added to below in various ways depending on TARGET_ARCH @@ -46,27 +29,47 @@ # When upgrading GCC, get the following defintions straight from Makefile.in # # Library members defined in libgcc2.c. -LIB2FUNCS = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \ +LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \ _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \ _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi \ _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf _clear_cache \ _enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \ _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \ _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \ - _popcountsi2 _popcountdi2 _paritysi2 _paritydi2 + _popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \ + _powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 \ + _divxc3 _divtc3 + +LIB2ADD = $(LIB2FUNCS_EXTRA) +LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA) + +# Additional sources to handle exceptions; overridden by targets as needed. +LIB2ADDEH = unwind-dw2.c unwind-dw2-fde.c unwind-sjlj.c gthr-gnat.c unwind-c.c +LIB2ADDEHSTATIC = $(LIB2ADDEH) +LIB2ADDEHSHARED = $(LIB2ADDEH) + +# List of extra C and assembler files to add to static and shared libgcc2. +# Assembler files should have names ending in `.asm'. +LIB2FUNCS_EXTRA = + +# List of extra C and assembler files to add to static libgcc2. +# Assembler files should have names ending in `.asm'. +LIB2FUNCS_STATIC_EXTRA = # Defined in libgcc2.c, included only in the static library. +# KAN: Excluded _sf_to_tf and _df_to_tf as TPBIT_FUNCS are not +# built on any of our platforms. LIB2FUNCS_ST = _eprintf __gcc_bcmp FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \ _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \ _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \ - _sf_to_df _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf + _sf_to_df _thenan_sf _sf_to_usi _usi_to_sf DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \ _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \ _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \ - _df_to_sf _df_to_tf _thenan_df _df_to_usi _usi_to_df + _df_to_sf _thenan_df _df_to_usi _usi_to_df TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \ _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \ @@ -77,81 +80,47 @@ # unwinder info. LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4 -LIB2ADD = $(LIB2FUNCS_EXTRA) -LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA) - -# Additional sources to handle exceptions; overridden by targets as needed. -LIB2ADDEH = unwind-dw2.c unwind-dw2-fde.c unwind-sjlj.c gthr-gnat.c unwind-c.c - #----------------------------------------------------------------------- # # Platform specific bits. -# When upgrading GCC, get the following defintions from config//t-* +# When upgrading GCC, get the following definitions from config//t-* # - -.if ${TARGET_ARCH} == "alpha" -# from config/alpha/t-alpha -LIB2FUNCS_EXTRA = qrnnd.asm -.endif - .if ${TARGET_ARCH} == "arm" # from config/arm/t-strongarm-elf CFLAGS+= -Dinhibit_libc -fno-inline LIB1ASMSRC = lib1funcs.asm -LIB1ASMFUNCS = _dvmd_tls _bb_init_func -OBJS+= dp-bit.o fp-bit.o -# We want fine grained libraries, so use the new code to build the -# floating point emulation libraries. -XXX fix this: NEED_FP_EMULATION set to "yes" with different rules per platform +LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func +# Not now +#LIB1ASMFUNCS+= _call_via_rX _interwork_call_via_rX \ +# _lshrdi3 _ashrdi3 _ashldi3 \ +# _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ +# _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ +# _fixsfsi _fixunssfsi _floatdidf _floatdisf .endif .if ${TARGET_ARCH} == "ia64" # from config/ia64/t-ia64 -LIB1ASMSRC = lib1funcs.asm -LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \ - __divdi3 __moddi3 __udivdi3 __umoddi3 \ - __divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \ - __nonlocal_goto __restore_stack_nonlocal __trampoline __compat -LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c gthr-gnat.c +LIB1ASMSRC = lib1funcs.asm +LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \ + __divdi3 __moddi3 __udivdi3 __umoddi3 \ + __divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \ + __nonlocal_goto __restore_stack_nonlocal __trampoline \ + _fixtfdi _fixunstfdi _floatditf +LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c .endif .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm -LIB2FUNCS_EXTRA = tramp.asm -# This one can't end up in shared libgcc +LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c LIB2FUNCS_STATIC_EXTRA = eabi.asm -# We want fine grained libraries, so use the new code to build the -# floating point emulation libraries. -OBJS+= dp-bit.o fp-bit.o .endif .if ${TARGET_ARCH} == "sparc64" # from config/sparc/t-elf -# We want fine grained libraries, so use the new code to build the -# floating point emulation libraries. -LIB1ASMSRC = lb1spc.asm +LIB1ASMSRC = lb1spc.asm LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 -OBJS+= dp-bit.o fp-bit.o .endif -dp-bit.o: config/fp-bit.c - ${XCC} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} - -dp-bit.So: config/fp-bit.c - ${XCC} ${PICFLAG} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} - -dp-bit.po: config/fp-bit.c - ${XCC} -p -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} - -fp-bit.o: config/fp-bit.c - ${XCC} -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} - -fp-bit.So: config/fp-bit.c - ${XCC} ${PICFLAG} -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} - -fp-bit.po: config/fp-bit.c - ${XCC} -p -DFLOAT=1 -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} - #----------------------------------------------------------------------- # Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are @@ -163,64 +132,195 @@ .endfor .endif -ASM_T= ${LIB1ASMFUNCS:S/$/.o/} -ASM_P= ${LIB1ASMFUNCS:S/$/.po/} -ASM_S= ${LIB1ASMFUNCS:S/$/.So/} - -SYMS= ${LIB2FUNCS} \ - ${LIB2_DIVMOD_FUNCS} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" -SYMS+= ${FPBIT_FUNCS} ${DPBIT_FUNCS} -.endif -SYMS_ST= ${LIB2FUNCS_ST} \ - ${LIB2ADD_ST} -OBJS+= ${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/} -OBJS_T= ${SYMS:S/$/.o/} ${SYMS_ST:S/$/.o/} -OBJS_P= ${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/} -OBJS_S= ${SYMS:S/$/.So/} -STATICOBJS= ${SYMS_ST:S/$/.o/} -SRCS= ${LIB2ADD} ${LIB2ADDEH} - -COMMONHDRS= tm.h tconfig.h -SRCS+= ${COMMONHDRS} -CLEANFILES+= ${COMMONHDRS} +COMMONHDRS= tm.h tconfig.h options.h unwind.h gthr-default.h -${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile - ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} +#----------------------------------------------------------------------- +# +# Helpful shortcuts for compiler invocations. +# +HIDE = -fvisibility=hidden -DHIDE_EXPORTS +CC_T = ${CC} -c ${CFLAGS} ${HIDE} -fPIC +CC_P = ${CC} -c ${CFLAGS} ${HIDE} -p -fPIC +CC_S = ${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED -${OBJS} beforedepend: ${COMMONHDRS} +#----------------------------------------------------------------------- +# +# Functions from libgcc2.c +# +STD_CFLAGS = +DIV_CFLAGS = -fexceptions -fnon-call-exceptions -${OBJS_T}: libgcc2.c - ${XCC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} +STD_FUNCS = ${LIB2FUNCS} +DIV_FUNCS = ${LIB2_DIVMOD_FUNCS} -.if !defined(NO_PIC) -${OBJS_S}: libgcc2.c - ${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} -.endif +STD_CFILE = libgcc2.c +DIV_CFILE = libgcc2.c -.if ${MK_PROFILE} != "no" -${OBJS_P}: libgcc2.c - ${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} +OBJ_GRPS = STD DIV + +#----------------------------------------------------------------------- +# +# Floating point emulation functions +# +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || \ + ${TARGET_ARCH} == "sparc64" + +FPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DFLOAT +DPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES + +FPBIT_CFILE = config/fp-bit.c +DPBIT_CFILE = config/fp-bit.c + +OBJ_GRPS += FPBIT DPBIT .endif +#----------------------------------------------------------------------- +# +# Generic build rules for object groups defined above +# +.for T in ${OBJ_GRPS} +${T}_OBJS_T = ${${T}_FUNCS:S/$/.o/} +${T}_OBJS_P = ${${T}_FUNCS:S/$/.po/} +${T}_OBJS_S = ${${T}_FUNCS:S/$/.So/} +OBJS += ${${T}_FUNCS:S/$/.o/} + +${${T}_OBJS_T}: ${${T}_CFILE} + ${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} +${${T}_OBJS_P}: ${${T}_CFILE} + ${CC_P} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} +${${T}_OBJS_S}: ${${T}_CFILE} + ${CC_S} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} +.endfor + +#----------------------------------------------------------------------- +# +# Objects that should be in static library only. +# +#SYMS_ST = ${LIB2FUNCS_ST} ${LIB2ADD_ST} +STAT_OBJS_T = ${SYMS_ST:S/$/.o/} +STAT_OBJS_P = ${SYMS_ST:S/$/.po/} +STATICOBJS = ${SYMS_ST:S/$/.o/} + +${STAT_OBJS_T}: ${STD_CFILE} + ${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} +${STAT_OBJS_P}: ${STD_CFILE} + ${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} + +#----------------------------------------------------------------------- +# +# Assembler files. +# .if defined(LIB1ASMSRC) -.for _lib1asmsrc in ${LIB1ASMSRC} -${ASM_T}: ${_lib1asmsrc} - ${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \ +ASM_T = ${LIB1ASMFUNCS:S/$/.o/} +ASM_P = ${LIB1ASMFUNCS:S/$/.po/} +ASM_S = ${LIB1ASMFUNCS:S/$/.So/} +ASM_V = ${LIB1ASMFUNCS:S/$/.vis/} +OBJS += ${LIB1ASMFUNCS:S/$/.o/} + +${ASM_T}: ${LIB1ASMSRC} ${.PREFIX}.vis + ${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \ + -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis} +${ASM_P}: ${LIB1ASMSRC} ${.PREFIX}.vis + ${CC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \ + -o ${.TARGET} -include ${.PREFIX}.vis ${.ALLSRC:N*.h:N*.vis} +${ASM_S}: ${LIB1ASMSRC} + ${CC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \ -o ${.TARGET} ${.ALLSRC:N*.h} +${ASM_V}: ${LIB1ASMSRC} + ${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \ + -o ${.PREFIX}.vo ${.ALLSRC:N*.h} + ( nm -pg ${.PREFIX}.vo | \ + awk 'NF == 3 && $$2 !~ /^[UN]$$/ { print "\t.hidden ", $$3 }'\ + ) > ${.TARGET} -.if !defined(NO_PIC) -${ASM_S}: ${_lib1asmsrc} - ${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \ - -o ${.TARGET} ${.ALLSRC:N*.h} +CLEANFILES += ${ASM_V} ${ASM_V:R:S/$/.vo/} .endif +#----------------------------------------------------------------------- +# +# Exception handling / unwinding support. +# +EH_OBJS_T = ${LIB2ADDEHSTATIC:R:S/$/.o/} +EH_OBJS_P = ${LIB2ADDEHSTATIC:R:S/$/.po/} +EH_OBJS_S = ${LIB2ADDEHSHARED:R:S/$/.So/} +SOBJS += ${EH_OBJS_S} + +.for _src in ${LIB2ADDEHSTATIC} +${_src:R:S/$/.o/}: ${_src} + ${CC_T} -fexceptions -o ${.TARGET} ${.IMPSRC} +${_src:R:S/$/.po/}: ${_src} + ${CC_P} -fexceptions -o ${.TARGET} ${.IMPSRC} +.endfor +.for _src in ${LIB2ADDEHSHARED} +${_src:R:S/$/.So/}: ${_src} + ${CC_S} -fexceptions -o ${.TARGET} ${.IMPSRC} +.endfor + + +#----------------------------------------------------------------------- +# +# Generated headers +# +${OBJS} ${SOBJS} beforedepend: ${COMMONHDRS} + +${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile + ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} + +CLEANFILES += ${COMMONHDRS} +CLEANFILES += cs-*.h option* + +#----------------------------------------------------------------------- +# +# Build additional static libgcc_eh[_p].a librarries. +# +SHLIB_MKMAP = ${GCCDIR}/mkmap-symver.awk +SHLIB_MKMAP_OPTS = +SHLIB_MAPFILES = ${GCCDIR}/libgcc-std.ver +VERSION_MAP = libgcc.map + +libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS} ${OBJS:R:S/$/.So/} + ( nm -pg ${SOBJS};echo %% ; \ + cat ${SHLIB_MAPFILES} \ + | sed -e '/^[ ]*#/d' \ + -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' \ + | ${CC} ${CFLAGS} -E -xassembler-with-cpp -; \ + ) | awk -f ${SHLIB_MKMAP} ${SHLIB_MKMAP_OPTS} > ${.TARGET} + +CLEANFILES += libgcc.map + +#----------------------------------------------------------------------- +# +# Build additional static libgcc_eh[_p].a librarries. +# +lib${LIB}_eh.a: ${EH_OBJS_T} + @${ECHO} building static ${LIB}_eh library + @rm -f ${.TARGET} + @${AR} cq ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` + ${RANLIB} ${.TARGET} + +all: lib${LIB}_eh.a + .if ${MK_PROFILE} != "no" -${ASM_P}: ${_lib1asmsrc} - ${XCC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \ - -o ${.TARGET} ${.ALLSRC:N*.h} +lib${LIB}_eh_p.a: ${EH_OBJS_P} + @${ECHO} building profiled ${LIB}_eh library + @rm -f ${.TARGET} + @${AR} cq ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` + ${RANLIB} ${.TARGET} +all: lib${LIB}_eh_p.a .endif -.endfor + +_libinstall: _lib-eh-install + +_lib-eh-install: + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} lib${LIB}_eh.a ${DESTDIR}${LIBDIR} +.if ${MK_PROFILE} != "no" + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} lib${LIB}_eh_p.a ${DESTDIR}${LIBDIR} .endif +CLEANFILES+= lib${LIB}_eh.a lib${LIB}_eh_p.a ${EH_OBJS_T} ${EH_OBJS_P} + .include + +.SUFFIXES: .vis .vo Index: gnu/lib/libgcov/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libgcov/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- gnu/lib/libgcov/Makefile 18 Mar 2006 21:37:04 -0000 1.4 +++ gnu/lib/libgcov/Makefile 25 Sep 2006 19:12:48 -0000 @@ -5,6 +5,7 @@ .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" GCCDIR= ${.CURDIR}/../../../contrib/gcc +GCCLIB= ${.CURDIR}/../../../contrib/gcclibs .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} LIB= gcov @@ -12,18 +13,22 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \ - -I${GCCDIR}/config -I${GCCDIR} -I. + -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. # # Library members defined in libgcov.c. -SYMS= _gcov _gcov_merge_add _gcov_merge_delta _gcov_merge_single +# Defined in libgcov.c, included only in gcov library +SYMS = _gcov _gcov_merge_add _gcov_merge_single _gcov_merge_delta \ + _gcov_fork _gcov_execl _gcov_execlp _gcov_execle \ + _gcov_execv _gcov_execvp _gcov_execve \ + _gcov_interval_profiler _gcov_pow2_profiler _gcov_one_value_profiler OBJS= ${SYMS:S/$/.o/} OBJS_T= ${SYMS:S/$/.o/} OBJS_P= ${SYMS:S/$/.po/} OBJS_S= ${SYMS:S/$/.So/} -COMMONHDRS= tm.h tconfig.h gcov-iov.h -CLEANFILES+= ${COMMONHDRS} +COMMONHDRS= tm.h tconfig.h gcov-iov.h options.h +CLEANFILES+= ${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} @@ -39,7 +44,7 @@ .endif .if ${MK_PROFILE} != "no" -${OBJS_P}: libgcc2.c +${OBJS_P}: libgcov.c ${CC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} .endif Index: gnu/lib/libobjc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libobjc/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- gnu/lib/libobjc/Makefile 16 Mar 2006 15:18:15 -0000 1.29 +++ gnu/lib/libobjc/Makefile 25 Sep 2006 18:51:11 -0000 @@ -2,39 +2,44 @@ OBJCDIR=${.CURDIR}/../../../contrib/libobjc GCCDIR= ${.CURDIR}/../../../contrib/gcc +GCCLIB= ${.CURDIR}/../../../contrib/gcclibs .PATH: ${OBJCDIR}/objc ${OBJCDIR} LIB= objc SHLIB_MAJOR= 2 -SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \ - nil_method.c objects.c sarray.c selector.c sendmsg.c \ - thr.c thr-posix.c \ - NXConstStr.m Object.m Protocol.m linking.m +SRCS= archive.c class.c encoding.c gc.c hash.c init.c linking.m misc.c \ + nil_method.c NXConstStr.m Object.m objects.c Protocol.m sarray.c \ + selector.c sendmsg.c thr.c thr-objc.c exception.c hash_compat.c INCS= encoding.h hash.h objc-api.h objc-list.h objc.h runtime.h \ sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h INCSDIR=${INCLUDEDIR}/objc -OBJCFLAGS= -fgnu-runtime ${CFLAGS} CFLAGS+= -DHAVE_GTHR_DEFAULT -DIN_GCC -DIN_TARGET_LIBS CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools -CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} +CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} CFLAGS+= -I${GCCDIR}/config -I${GCCDIR} -CFLAGS+= -frandom-seed=RepeatabilityConsideredGood - -GENHDRS= runtime-info.h tconfig.h tm.h -CLEANFILES+= ${GENHDRS} -SRCS+= ${GENHDRS} +CFLAGS+= -I${GCCLIB}/include +CFLAGS+= -fexceptions -frandom-seed=RepeatabilityConsideredGood +OBJCFLAGS= -fgnu-runtime ${CFLAGS} -${OBJS}: ${GENHDRS} +GENHDRS= runtime-info.h runtime-info.h: `${CC} --print-prog-name=cc1obj` -print-objc-runtime-info \ < /dev/null > ${.TARGET} -tconfig.h tm.h : ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile +.for H in tconfig.h tm.h config.h options.h gthr-default.h unwind.h +$H: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} +GENHDRS+= $H +.endfor + +CLEANFILES+= ${GENHDRS} cs-* optionlist +SRCS+= ${GENHDRS} + +${OBJS}: ${GENHDRS} .include Index: gnu/lib/libstdc++/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libstdc++/Makefile,v retrieving revision 1.58 diff -u -r1.58 Makefile --- gnu/lib/libstdc++/Makefile 5 Oct 2006 20:55:37 -0000 1.58 +++ gnu/lib/libstdc++/Makefile 6 Oct 2006 01:50:33 -0000 @@ -1,21 +1,23 @@ # $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.58 2006/10/05 20:55:37 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc +GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ SUPDIR= ${SRCDIR}/libsupc++ .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \ - ${SRCDIR}/config/locale/generic ${SRCDIR}/include \ - ${SUPDIR} ${GCCDIR} + ${SRCDIR}/config/locale/darwin ${SRCDIR}/config/locale/generic \ + ${SRCDIR}/include ${SUPDIR} ${GCCDIR} ${GCCLIB}/libiberty LIB= stdc++ -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 6 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H .if ${MACHINE_ARCH} == "arm" CFLAGS+= -D_GLIBCXX_SJLJ_EXCEPTIONS=1 .endif CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include +CFLAGS+= -I${GCCLIB}/include -I${SRCDIR}/include -I. CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ -Wno-deprecated @@ -24,15 +26,16 @@ LDADD= -lm # libstdc++ sources -SRCS+= allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc debug_list.cc \ +SRCS+= bitmap_allocator.cc pool_allocator.cc mt_allocator.cc codecvt.cc \ + compatibility.cc complex_io.cc ctype.cc debug.cc debug_list.cc \ functexcept.cc globals_locale.cc globals_io.cc ios.cc ios_failure.cc \ - ios_init.cc ios_locale.cc limits.cc debug_list.cc list.cc locale.cc \ - locale_init.cc locale_facets.cc localename.cc stdexcept.cc \ - strstream.cc tree.cc allocator-inst.cc concept-inst.cc fstream-inst.cc \ - ext-inst.cc io-inst.cc istream-inst.cc locale-inst.cc \ + ios_init.cc ios_locale.cc limits.cc list.cc locale.cc locale_init.cc \ + locale_facets.cc localename.cc stdexcept.cc strstream.cc tree.cc \ + allocator-inst.cc concept-inst.cc fstream-inst.cc ext-inst.cc \ + ios-inst.cc iostream-inst.cc istream-inst.cc istream.cc locale-inst.cc \ locale-misc-inst.cc misc-inst.cc ostream-inst.cc sstream-inst.cc \ - streambuf-inst.cc string-inst.cc valarray-inst.cc wlocale-inst.cc \ - wstring-inst.cc + streambuf-inst.cc streambuf.cc string-inst.cc valarray-inst.cc \ + wlocale-inst.cc wstring-inst.cc # target sources SRCS+= atomicity.cc codecvt_members.cc collate_members.cc ctype_members.cc \ @@ -43,11 +46,11 @@ SRCS+= basic_file_stdio.cc c_locale.cc # C parts of math -SRCS+= signbitf.c signbitl.c stubs.c +SRCS+= stubs.c # Embedded copy of libsupc++ -SRCS+= del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc \ - eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc \ +SRCS+= del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \ + eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \ eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \ eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \ new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \ @@ -79,8 +82,8 @@ CLEANFILES+= atomicity.cc INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \ - TARGETHDRS THRHDRS DEBUGHDRS -CXXINCLUDEDIR= ${INCLUDEDIR}/c++/3.4 + TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS +CXXINCLUDEDIR= ${INCLUDEDIR}/c++/4.1 STDHDRS= std_algorithm.h std_bitset.h std_complex.h std_deque.h \ std_fstream.h std_functional.h std_iomanip.h std_ios.h \ @@ -109,8 +112,8 @@ stl_iterator_base_types.h stl_list.h stl_map.h stl_multimap.h \ stl_multiset.h stl_numeric.h stl_pair.h stl_queue.h \ stl_raw_storage_iter.h stl_relops.h stl_set.h stl_stack.h \ - stl_tempbuf.h stl_threads.h stl_tree.h stl_uninitialized.h \ - stl_vector.h streambuf.tcc stringfwd.h type_traits.h \ + stl_tempbuf.h stl_tree.h stl_uninitialized.h \ + stl_vector.h streambuf.tcc stringfwd.h \ valarray_array.h valarray_array.tcc valarray_before.h \ valarray_after.h vector.tcc BITSHDRS:= ${BITSHDRS:S;^;${SRCDIR}/include/bits/;} @@ -125,15 +128,27 @@ BKWHDRS:= ${BKWHDRS:S;^;${SRCDIR}/include/backward/;} BKWHDRSDIR= ${CXXINCLUDEDIR}/backward -EXTHDRS= algorithm bitmap_allocator.h debug_allocator.h \ - enc_filebuf.h stdio_filebuf.h stdio_sync_filebuf.h functional \ - hash_map hash_set iterator malloc_allocator.h memory \ - mt_allocator.h new_allocator.h numeric pod_char_traits.h \ - pool_allocator.h rb_tree rope ropeimpl.h slist hash_fun.h \ - hashtable.h +EXTHDRS= algorithm array_allocator.h bitmap_allocator.h \ + codecvt_specializations.h debug_allocator.h functional \ + hash_fun.h hash_map hash_set hashtable.h iterator \ + malloc_allocator.h memory mt_allocator.h new_allocator.h \ + numeric pod_char_traits.h pool_allocator.h rb_tree rope \ + rc_string_base.h ropeimpl.h slist stdio_filebuf.h \ + stdio_sync_filebuf.h sso_string_base.h typelist.h vstring.h \ + vstring.tcc vstring_fwd.h vstring_util.h + EXTHDRS:= ${EXTHDRS:S;^;${SRCDIR}/include/ext/;} EXTHDRSDIR= ${CXXINCLUDEDIR}/ext +TR1HDRS= array bind_iterate.h bind_repeat.h boost_shared_ptr.h \ + functional functional_iterate.h hashtable memory mu_iterate.h \ + ref_fwd.h ref_wrap_iterate.h repeat.h tuple tuple_iterate.h \ + type_traits type_traits_fwd.h unordered_map unordered_set \ + utility + +TR1HDRS:= ${TR1HDRS:S;^;${SRCDIR}/include/tr1/;} +TR1HDRSDIR= ${CXXINCLUDEDIR}/tr1 + # This is the common subset of files that all three "C" header models use. BASEHDRS= std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \ std_ciso646.h std_climits.h std_clocale.h std_cmath.h \ @@ -150,21 +165,22 @@ BASEXHDRS= ${SRCDIR}/include/c_std/cmath.tcc BASEXHDRSDIR= ${CXXINCLUDEDIR}/bits -DEBUGHDRS= bitset debug.h deque formatter.h hash_map hash_map.h \ - hash_multimap.h hash_multiset.h hash_set hash_set.h list \ - map map.h multimap.h multiset.h safe_base.h safe_iterator.h \ - safe_iterator.tcc safe_sequence.h set set.h string vector +DEBUGHDRS= bitset debug.h deque formatter.h functions.h hash_map \ + hash_map.h hash_multimap.h hash_multiset.h hash_set hash_set.h \ + list macros.h map map.h multimap.h multiset.h safe_base.h \ + safe_iterator.h safe_iterator.tcc safe_sequence.h set set.h \ + string vector DEBUGHDRS:= ${DEBUGHDRS:S;^;${SRCDIR}/include/debug/;} DEBUGHDRSDIR= ${CXXINCLUDEDIR}/debug -TARGETHDRS= allocator/new_allocator_base.h \ +TARGETHDRS= abi/compatibility.h \ + allocator/new_allocator_base.h \ io/basic_file_stdio.h \ io/c_io_stdio.h \ locale/generic/c_locale.h \ locale/generic/c++locale_internal.h \ locale/generic/messages_members.h \ locale/generic/time_members.h \ - locale/generic/codecvt_specializations.h \ os/bsd/freebsd/ctype_base.h \ os/bsd/freebsd/ctype_inline.h \ os/bsd/freebsd/ctype_noninline.h \ @@ -177,7 +193,7 @@ TARGETHDRSNAME_new_allocator_base.h= c++allocator.h TARGETHDRSDIR= ${CXXINCLUDEDIR}/bits -MARCHHDRS= atomic_word.h +MARCHHDRS= atomic_word.h cpu_defines.h cxxabi_tweaks.h .for h in ${MARCHHDRS} .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/${h}) TARGETHDRS+= ${SRCDIR}/config/cpu/${MARCHDIR}/${h} @@ -186,12 +202,13 @@ .endif .endfor -THRHDRS= gthr.h gthr-single.h gthr-posix.h gthr-default.h +THRHDRS= gthr.h gthr-single.h gthr-posix.h gthr-tpf.h gthr-default.h THRHDRSDIR= ${CXXINCLUDEDIR}/bits uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] gthr.h: ${GCCDIR}/gthr.h - sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \ + sed -e '/^#pragma/b' \ + -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \ -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's,^#include "\(.*\)",#include ,g' \ < ${.ALLSRC} > ${.TARGET} @@ -208,6 +225,13 @@ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ < ${.ALLSRC} > ${.TARGET} +gthr-tpf.h: ${GCCDIR}/gthr-posix.h + sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ + -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ + -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ + -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ + < ${.ALLSRC} > ${.TARGET} + gthr-default.h: ${GCCDIR}/gthr-posix.h sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ @@ -218,6 +242,12 @@ CLEANFILES+= ${THRHDRS} +unwind.h: ${GCCDIR}/unwind-generic.h + ln -sf ${.ALLSRC} ${.TARGET} + +SRCS+= unwind.h +CLEANFILES+= unwind.h + c++config.h: ${.CURDIR}/config.h ${SRCDIR}/include/bits/c++config cat ${SRCDIR}/include/bits/c++config > ${.TARGET} && \ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \ @@ -228,4 +258,13 @@ echo "#endif // _CXXCONFIG_" >> ${.TARGET} CLEANFILES+= c++config.h +# Symbol versioning. + +VERSION_MAP= libstdc++.map + +${VERSION_MAP}: ${SRCDIR}/config/linker-map.gnu + ln -sf ${.ALLSRC} ${.TARGET} + +CLEANFILES+= ${VERSION_MAP} + .include Index: gnu/lib/libstdc++/config.h =================================================================== RCS file: /home/ncvs/src/gnu/lib/libstdc++/config.h,v retrieving revision 1.14 diff -u -r1.14 config.h --- gnu/lib/libstdc++/config.h 22 Sep 2006 15:08:07 -0000 1.14 +++ gnu/lib/libstdc++/config.h 26 Sep 2006 19:36:24 -0000 @@ -1,180 +1,10 @@ -/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.14 2006/09/22 15:08:07 kan Exp $ */ +/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.14 2006/09/22 15:08:07 kan Exp$ */ #ifndef __ISO_C_VISIBLE #include #endif /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -// acconfig.h symbols and macros for libstdc++ v3 -*- C++ -*- - -// Defines libstdc++ version. -/* #undef PACKAGE */ -/* #undef VERSION */ - -// Needed for gettext. -/* #undef ENABLE_NLS */ -/* #undef HAVE_CATGETS */ -/* #undef HAVE_GETTEXT */ -/* #undef HAVE_STPCPY */ - -// Include I/O support for 'long long' and 'unsigned long long'. -#define _GLIBCXX_USE_LONG_LONG 1 - -// Include support for 'long double'. -/* #undef _GLIBCXX_USE_LONG_DOUBLE */ - -// Define if C99 math functions (like fpclassify) should be exposed. -#define _GLIBCXX_USE_C99_MATH 1 - -// Define if C99 features such as lldiv_t, llabs, lldiv should be exposed. -#define _GLIBCXX_USE_C99 1 - -// Define if code specialized for wchar_t should be used. -#define _GLIBCXX_USE_WCHAR_T 1 - -// Define if using setrlimit to limit memory usage during 'make check'. -#define _GLIBCXX_MEM_LIMITS 1 - -// Define to use concept checking code from the boost libraries. -/* #undef _GLIBCXX_CONCEPT_CHECKS */ - -// Define to use symbol versioning in the shared library. -/* #undef _GLIBCXX_SYMVER */ - -// Define symbol versioning in assember directives. If symbol -// versioning is beigng used, and the assembler supports this kind of -// thing, then use it. -// NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4. -#if _GLIBCXX_SYMVER - #define _GLIBCXX_ASM_SYMVER(cur, old, version) \ - asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version); -#else - #define _GLIBCXX_ASM_SYMVER(cur, old, version) -#endif - -// Define if LFS support is available. -/* #undef _GLIBCXX_USE_LFS */ - -// Define if a fully dynamic basic_string is wanted. -/* #undef _GLIBCXX_FULLY_DYNAMIC_STRING */ - -// Define if NLS translations are to be used. -/* #undef _GLIBCXX_USE_NLS */ - -// Define if gthr-default.h exists (meaning that threading support is enabled). -#define HAVE_GTHR_DEFAULT 1 - -// Define if the atan2f function exists. -#define HAVE_ATAN2F 1 - -// Define if the atan2l function exists. -/* #undef HAVE_ATAN2L */ - -// Define if the tanl function exists. -/* #undef HAVE_TANL */ - -// Define if the copysignf function exists. -#define HAVE_COPYSIGNF 1 - -// Define if getpagesize exists. -#define HAVE_GETPAGESIZE 1 - -// Define if setenv exists. -#define HAVE_SETENV 1 - -// Define if sigsetjmp exists. -#define HAVE_SIGSETJMP 1 - -// Define if mbstate_t exists in wchar.h. -#define HAVE_MBSTATE_T 1 - -// Define if you have the modff function. -#define HAVE_MODFF 1 - -// Define if you have the modfl function. -/* #undef HAVE_MODFL */ - -// Define if you have the expf function. -#define HAVE_EXPF 1 - -// Define if you have the expl function. -/* #undef HAVE_EXPL */ - -// Define if you have the hypot function. -#define HAVE_HYPOT 1 - -// Define if you have the hypotf function. -#define HAVE_HYPOTF 1 - -// Define if you have the hypotl function. -/* #undef HAVE_HYPOTL */ - -// Define if the compiler/host combination has __builtin_abs -#define HAVE___BUILTIN_ABS 1 - -// Define if the compiler/host combination has __builtin_labs -#define HAVE___BUILTIN_LABS 1 - -// Define if the compiler/host combination has __builtin_cos -#define HAVE___BUILTIN_COS 1 - -// Define if the compiler/host combination has __builtin_cosf -#define HAVE___BUILTIN_COSF 1 - -// Define if the compiler/host combination has __builtin_cosl -#define HAVE___BUILTIN_COSL 1 - -// Define if the compiler/host combination has __builtin_fabs -#define HAVE___BUILTIN_FABS 1 - -// Define if the compiler/host combination has __builtin_fabsf -#define HAVE___BUILTIN_FABSF 1 - -// Define if the compiler/host combination has __builtin_fabsl -#define HAVE___BUILTIN_FABSL 1 - -// Define if the compiler/host combination has __builtin_sin -#define HAVE___BUILTIN_SIN 1 - -// Define if the compiler/host combination has __builtin_sinf -#define HAVE___BUILTIN_SINF 1 - -// Define if the compiler/host combination has __builtin_sinl -#define HAVE___BUILTIN_SINL 1 - -// Define if the compiler/host combination has __builtin_sqrt -#define HAVE___BUILTIN_SQRT 1 - -// Define if the compiler/host combination has __builtin_sqrtf -#define HAVE___BUILTIN_SQRTF 1 - -// Define if the compiler/host combination has __builtin_sqrtl -#define HAVE___BUILTIN_SQRTL 1 - -// Define if poll is available in . -#define HAVE_POLL 1 - -// Define if S_ISREG (Posix) is available in . -#define HAVE_S_ISREG 1 - -// Define if S_IFREG is available in . -/* #undef HAVE_S_IFREG */ - -// Define if writev is available in . -#define HAVE_WRITEV 1 - -// Define if int64_t is available in . -#define HAVE_INT64_T 1 - -// Define if LC_MESSAGES is available in . -#define HAVE_LC_MESSAGES 1 - -// Define if exists. -#define HAVE_FLOAT_H 1 - -// Define if modf is present in -/* #undef HAVE_MODF */ - /* Define to 1 if you have the `acosf' function. */ #define HAVE_ACOSF 1 @@ -200,15 +30,15 @@ /* Define to 1 if you have the `atanl' function. */ /* #undef HAVE_ATANL */ -/* Define to 1 if you have the `btowc' function. */ -#define HAVE_BTOWC 1 - /* Define to 1 if you have the `ceilf' function. */ #define HAVE_CEILF 1 /* Define to 1 if you have the `ceill' function. */ #define HAVE_CEILL 1 +/* Define to 1 if you have the header file. */ +#define HAVE_COMPLEX_H 1 + /* Define to 1 if you have the `copysign' function. */ #define HAVE_COPYSIGN 1 @@ -245,12 +75,6 @@ /* Define to 1 if you have the `fabsl' function. */ #define HAVE_FABSL 1 -/* Define to 1 if you have the `fgetwc' function. */ -#define HAVE_FGETWC 1 - -/* Define to 1 if you have the `fgetws' function. */ -#define HAVE_FGETWS 1 - /* Define to 1 if you have the `finite' function. */ #define HAVE_FINITE 1 @@ -278,12 +102,6 @@ /* Define to 1 if you have the `fpclass' function. */ /* #undef HAVE_FPCLASS */ -/* Define to 1 if you have the `fputwc' function. */ -#define HAVE_FPUTWC 1 - -/* Define to 1 if you have the `fputws' function. */ -#define HAVE_FPUTWS 1 - /* Define to 1 if you have the header file. */ /* #undef HAVE_FP_H */ @@ -293,26 +111,15 @@ /* Define to 1 if you have the `frexpl' function. */ #define HAVE_FREXPL 1 -/* Define to 1 if you have the `fwide' function. */ -#define HAVE_FWIDE 1 - -/* Define to 1 if you have the `fwprintf' function. */ -#define HAVE_FWPRINTF 1 - -/* Define to 1 if you have the `fwscanf' function. */ -#define HAVE_FWSCANF 1 - /* Define to 1 if you have the header file. */ /* #undef HAVE_GCONV_H */ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 -/* Define to 1 if you have the `getwc' function. */ -#define HAVE_GETWC 1 - -/* Define to 1 if you have the `getwchar' function. */ -#define HAVE_GETWCHAR 1 +/* Define if gthr-default.h exists (meaning that threading support is + enabled). */ +#define HAVE_GTHR_DEFAULT 1 /* Define to 1 if you have the `hypot' function. */ #define HAVE_HYPOT 1 @@ -324,17 +131,20 @@ /* #undef HAVE_HYPOTL */ /* Define to 1 if you have the `iconv' function. */ -#define HAVE_ICONV 1 +/* #undef HAVE_ICONV */ /* Define to 1 if you have the `iconv_close' function. */ -#define HAVE_ICONV_CLOSE 1 +/* #undef HAVE_ICONV_CLOSE */ /* Define to 1 if you have the `iconv_open' function. */ -#define HAVE_ICONV_OPEN 1 +/* #undef HAVE_ICONV_OPEN */ /* Define to 1 if you have the header file. */ #define HAVE_IEEEFP_H 1 +/* Define if int64_t is available in . */ +#define HAVE_INT64_T 1 + /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -356,9 +166,12 @@ /* Define to 1 if you have the `isnanl' function. */ /* #undef HAVE_ISNANL */ -/* Define to 1 if you have the `iswblank' function. */ +/* Defined if iswblank exists. */ #define HAVE_ISWBLANK 1 +/* Define if LC_MESSAGES is available in . */ +#define HAVE_LC_MESSAGES 1 + /* Define to 1 if you have the `ldexpf' function. */ #define HAVE_LDEXPF 1 @@ -407,17 +220,8 @@ /* Define to 1 if you have the header file. */ #define HAVE_MACHINE_PARAM_H 1 -/* Define to 1 if you have the `mbrlen' function. */ -#define HAVE_MBRLEN 1 - -/* Define to 1 if you have the `mbrtowc' function. */ -#define HAVE_MBRTOWC 1 - -/* Define to 1 if you have the `mbsinit' function. */ -#define HAVE_MBSINIT 1 - -/* Define to 1 if you have the `mbsrtowcs' function. */ -#define HAVE_MBSRTOWCS 1 +/* Define if mbstate_t exists in wchar.h. */ +#define HAVE_MBSTATE_T 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -425,6 +229,9 @@ /* Define to 1 if you have a working `mmap' system call. */ #define HAVE_MMAP 1 +/* Define to 1 if you have the `modf' function. */ +#define HAVE_MODF 1 + /* Define to 1 if you have the `modff' function. */ #define HAVE_MODFF 1 @@ -437,18 +244,15 @@ /* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 +/* Define if poll is available in . */ +#define HAVE_POLL 1 + /* Define to 1 if you have the `powf' function. */ #define HAVE_POWF 1 /* Define to 1 if you have the `powl' function. */ /* #undef HAVE_POWL */ -/* Define to 1 if you have the `putwc' function. */ -#define HAVE_PUTWC 1 - -/* Define to 1 if you have the `putwchar' function. */ -#define HAVE_PUTWCHAR 1 - /* Define to 1 if you have the `qfpclass' function. */ /* #undef HAVE_QFPCLASS */ @@ -503,18 +307,15 @@ /* Define to 1 if you have the `strtold' function. */ #define HAVE_STRTOLD 1 -/* Define to 1 if you have the `swprintf' function. */ -#define HAVE_SWPRINTF 1 - -/* Define to 1 if you have the `swscanf' function. */ -#define HAVE_SWSCANF 1 - /* Define to 1 if you have the header file. */ #define HAVE_SYS_FILIO_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_IOCTL_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IPC_H 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_ISA_DEFS_H */ @@ -527,6 +328,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_RESOURCE_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SEM_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 @@ -539,6 +343,12 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_UIO_H 1 +/* Define if S_IFREG is available in . */ +/* #undef HAVE_S_IFREG */ + +/* Define if S_IFREG is available in . */ +#define HAVE_S_ISREG 1 + /* Define to 1 if you have the `tanf' function. */ #define HAVE_TANF 1 @@ -551,136 +361,38 @@ /* Define to 1 if you have the `tanl' function. */ /* #undef HAVE_TANL */ -/* Define to 1 if you have the `ungetwc' function. */ -#define HAVE_UNGETWC 1 +#ifndef __sparc64__ +/* Define to 1 if the target supports thread-local storage. */ +#define HAVE_TLS 1 +#endif /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define to 1 if you have the `vfwprintf' function. */ -#define HAVE_VFWPRINTF 1 - #if __ISO_C_VISIBLE >= 1999 -/* Define to 1 if you have the `vfwscanf' function. */ +/* Defined if vfwscanf exists. */ #define HAVE_VFWSCANF 1 -#endif - -/* Define to 1 if you have the `vswprintf' function. */ -#define HAVE_VSWPRINTF 1 -#if __ISO_C_VISIBLE >= 1999 -/* Define to 1 if you have the `vswscanf' function. */ +/* Defined if vswscanf exists. */ #define HAVE_VSWSCANF 1 -#endif -/* Define to 1 if you have the `vwprintf' function. */ -#define HAVE_VWPRINTF 1 - -#if __ISO_C_VISIBLE >= 1999 -/* Define to 1 if you have the `vwscanf' function. */ +/* Defined if vwscanf exists. */ #define HAVE_VWSCANF 1 -#endif +#endif /* __ISO_C_VISIBLE >= 1999 */ /* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 -/* Define to 1 if you have the `wcrtomb' function. */ -#define HAVE_WCRTOMB 1 - -/* Define to 1 if you have the `wcscat' function. */ -#define HAVE_WCSCAT 1 - -/* Define to 1 if you have the `wcschr' function. */ -#define HAVE_WCSCHR 1 - -/* Define to 1 if you have the `wcscmp' function. */ -#define HAVE_WCSCMP 1 - -/* Define to 1 if you have the `wcscoll' function. */ -#define HAVE_WCSCOLL 1 - -/* Define to 1 if you have the `wcscpy' function. */ -#define HAVE_WCSCPY 1 - -/* Define to 1 if you have the `wcscspn' function. */ -#define HAVE_WCSCSPN 1 - -/* Define to 1 if you have the `wcsftime' function. */ -#define HAVE_WCSFTIME 1 - -/* Define to 1 if you have the `wcslen' function. */ -#define HAVE_WCSLEN 1 - -/* Define to 1 if you have the `wcsncat' function. */ -#define HAVE_WCSNCAT 1 - -/* Define to 1 if you have the `wcsncmp' function. */ -#define HAVE_WCSNCMP 1 - -/* Define to 1 if you have the `wcsncpy' function. */ -#define HAVE_WCSNCPY 1 - -/* Define to 1 if you have the `wcspbrk' function. */ -#define HAVE_WCSPBRK 1 - -/* Define to 1 if you have the `wcsrchr' function. */ -#define HAVE_WCSRCHR 1 - -/* Define to 1 if you have the `wcsrtombs' function. */ -#define HAVE_WCSRTOMBS 1 - -/* Define to 1 if you have the `wcsspn' function. */ -#define HAVE_WCSSPN 1 - -/* Define to 1 if you have the `wcsstr' function. */ -#define HAVE_WCSSTR 1 - -/* Define to 1 if you have the `wcstod' function. */ -#define HAVE_WCSTOD 1 - #if __ISO_C_VISIBLE >= 1999 -/* Define to 1 if you have the `wcstof' function. */ +/* Defined if wcstof exists. */ #define HAVE_WCSTOF 1 -#endif - -/* Define to 1 if you have the `wcstok' function. */ -#define HAVE_WCSTOK 1 - -/* Define to 1 if you have the `wcstol' function. */ -#define HAVE_WCSTOL 1 - -/* Define to 1 if you have the `wcstoul' function. */ -#define HAVE_WCSTOUL 1 - -/* Define to 1 if you have the `wcsxfrm' function. */ -#define HAVE_WCSXFRM 1 - -/* Define to 1 if you have the `wctob' function. */ -#define HAVE_WCTOB 1 +#endif /* __ISO_C_VISIBLE >= 1999 */ /* Define to 1 if you have the header file. */ #define HAVE_WCTYPE_H 1 -/* Define to 1 if you have the `wmemchr' function. */ -#define HAVE_WMEMCHR 1 - -/* Define to 1 if you have the `wmemcmp' function. */ -#define HAVE_WMEMCMP 1 - -/* Define to 1 if you have the `wmemcpy' function. */ -#define HAVE_WMEMCPY 1 - -/* Define to 1 if you have the `wmemmove' function. */ -#define HAVE_WMEMMOVE 1 - -/* Define to 1 if you have the `wmemset' function. */ -#define HAVE_WMEMSET 1 - -/* Define to 1 if you have the `wprintf' function. */ -#define HAVE_WPRINTF 1 - -/* Define to 1 if you have the `wscanf' function. */ -#define HAVE_WSCANF 1 +/* Define if writev is available in . */ +#define HAVE_WRITEV 1 /* Define to 1 if you have the `_acosf' function. */ /* #undef HAVE__ACOSF */ @@ -817,6 +529,9 @@ /* Define to 1 if you have the `_logl' function. */ /* #undef HAVE__LOGL */ +/* Define to 1 if you have the `_modf' function. */ +/* #undef HAVE__MODF */ + /* Define to 1 if you have the `_modff' function. */ /* #undef HAVE__MODFF */ @@ -871,6 +586,48 @@ /* Define to 1 if you have the `_tanl' function. */ /* #undef HAVE__TANL */ +/* Define if the compiler/host combination has __builtin_abs. */ +#define HAVE___BUILTIN_ABS 1 + +/* Define if the compiler/host combination has __builtin_cos. */ +#define HAVE___BUILTIN_COS 1 + +/* Define if the compiler/host combination has __builtin_cosf. */ +#define HAVE___BUILTIN_COSF 1 + +/* Define if the compiler/host combination has __builtin_cosl. */ +#define HAVE___BUILTIN_COSL 1 + +/* Define if the compiler/host combination has __builtin_fabs. */ +#define HAVE___BUILTIN_FABS 1 + +/* Define if the compiler/host combination has __builtin_fabsf. */ +#define HAVE___BUILTIN_FABSF 1 + +/* Define if the compiler/host combination has __builtin_fabsl. */ +#define HAVE___BUILTIN_FABSL 1 + +/* Define if the compiler/host combination has __builtin_labs. */ +#define HAVE___BUILTIN_LABS 1 + +/* Define if the compiler/host combination has __builtin_sin. */ +#define HAVE___BUILTIN_SIN 1 + +/* Define if the compiler/host combination has __builtin_sinf. */ +#define HAVE___BUILTIN_SINF 1 + +/* Define if the compiler/host combination has __builtin_sinl. */ +#define HAVE___BUILTIN_SINL 1 + +/* Define if the compiler/host combination has __builtin_sqrt. */ +#define HAVE___BUILTIN_SQRT 1 + +/* Define if the compiler/host combination has __builtin_sqrtf. */ +#define HAVE___BUILTIN_SQRTF 1 + +/* Define if the compiler/host combination has __builtin_sqrtl. */ +#define HAVE___BUILTIN_SQRTL 1 + /* Define to 1 if you have the `__signbit' function. */ #define HAVE___SIGNBIT 1 @@ -880,6 +637,9 @@ /* Define to 1 if you have the `__signbitl' function. */ #define HAVE___SIGNBITL 1 +/* Name of package */ +/* #undef PACKAGE */ + /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" @@ -898,59 +658,64 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Version number of package */ +/* #undef VERSION */ + +/* Define to use concept checking code from the boost libraries. */ +/* #undef _GLIBCXX_CONCEPT_CHECKS */ + +/* Define if a fully dynamic basic_string is wanted. */ +/* #undef _GLIBCXX_FULLY_DYNAMIC_STRING */ + /* Define to 1 if a full hosted library is built, or 0 if freestanding. */ #define _GLIBCXX_HOSTED 1 -/* Define if the compiler is configured for setjmp/longjmp exceptions. */ -/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */ -// -// Systems that have certain non-standard functions prefixed with an -// underscore, we'll handle those here. Must come after config.h.in. -// -#if defined (HAVE__ISNAN) && ! defined (HAVE_ISNAN) -# define HAVE_ISNAN 1 -# define isnan _isnan +#if !defined(__LP64__) +/* Define if ptrdiff_t is int. */ +#define _GLIBCXX_PTRDIFF_T_IS_INT 1 #endif -#if defined (HAVE__ISNANF) && ! defined (HAVE_ISNANF) -# define HAVE_ISNANF 1 -# define isnanf _isnanf -#endif +/* Define if using setrlimit to set resource limits during "make check" */ +#define _GLIBCXX_RES_LIMITS 1 -#if defined (HAVE__ISNANL) && ! defined (HAVE_ISNANL) -# define HAVE_ISNANL 1 -# define isnanl _isnanl +/* Define if size_t is unsigned int. */ +#if !defined(__LP64__) +#define _GLIBCXX_SIZE_T_IS_UINT 1 #endif -#if defined (HAVE__ISINF) && ! defined (HAVE_ISINF) -# define HAVE_ISINF 1 -# define isinf _isinf -#endif +/* Define if the compiler is configured for setjmp/longjmp exceptions. */ +/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */ -#if defined (HAVE__ISINFF) && ! defined (HAVE_ISINFF) -# define HAVE_ISINFF 1 -# define isinff _isinff -#endif +/* Define to use GNU symbol versioning in the shared library. */ +#define _GLIBCXX_SYMVER 1 -#if defined (HAVE__ISINFL) && ! defined (HAVE_ISINFL) -# define HAVE_ISINFL 1 -# define isinfl _isinfl -#endif +/* Define if C99 functions or macros from , , , + , and can be used or exposed. */ +/* #undef _GLIBCXX_USE_C99 */ + +/* Define if C99 functions in should be used in . Using + compiler builtins for these functions requires corresponding C99 library + functions to be present. */ +/* #undef _GLIBCXX_USE_C99_COMPLEX */ -#if defined (HAVE__COPYSIGN) && ! defined (HAVE_COPYSIGN) -# define HAVE_COPYSIGN 1 -# define copysign _copysign -#endif +/* Define if C99 functions or macros in should be imported in + in namespace std. */ +#define _GLIBCXX_USE_C99_MATH 1 -#if defined (HAVE__COPYSIGNL) && ! defined (HAVE_COPYSIGNL) -# define HAVE_COPYSIGNL 1 -# define copysignl _copysignl -#endif +/* Define if iconv and related functions exist and are usable. */ +#define _GLIBCXX_USE_ICONV 1 -#if defined (HAVE__COSF) && ! defined (HAVE_COSF) -# define HAVE_COSF 1 -# define cosf _cosf -#endif +/* Define if LFS support is available. */ +/* #undef _GLIBCXX_USE_LFS */ + +/* Define if code specialized for long long should be used. */ +#define _GLIBCXX_USE_LONG_LONG 1 + +/* Define if NLS translations are to be used. */ +/* #undef _GLIBCXX_USE_NLS */ + +/* Define if code specialized for wchar_t should be used. */ +#define _GLIBCXX_USE_WCHAR_T 1 #if defined (HAVE__ACOSF) && ! defined (HAVE_ACOSF) # define HAVE_ACOSF 1 @@ -972,6 +737,16 @@ # define asinl _asinl #endif +#if defined (HAVE__ATAN2F) && ! defined (HAVE_ATAN2F) +# define HAVE_ATAN2F 1 +# define atan2f _atan2f +#endif + +#if defined (HAVE__ATAN2L) && ! defined (HAVE_ATAN2L) +# define HAVE_ATAN2L 1 +# define atan2l _atan2l +#endif + #if defined (HAVE__ATANF) && ! defined (HAVE_ATANF) # define HAVE_ATANF 1 # define atanf _atanf @@ -984,27 +759,32 @@ #if defined (HAVE__CEILF) && ! defined (HAVE_CEILF) # define HAVE_CEILF 1 -# define aceil _ceilf +# define ceilf _ceilf #endif #if defined (HAVE__CEILL) && ! defined (HAVE_CEILL) # define HAVE_CEILL 1 -# define aceil _ceill +# define ceill _ceill #endif -#if defined (HAVE__COSHF) && ! defined (HAVE_COSHF) -# define HAVE_COSHF 1 -# define coshf _coshf +#if defined (HAVE__COPYSIGN) && ! defined (HAVE_COPYSIGN) +# define HAVE_COPYSIGN 1 +# define copysign _copysign #endif -#if defined (HAVE__COSL) && ! defined (HAVE_COSL) -# define HAVE_COSL 1 -# define cosl _cosl +#if defined (HAVE__COPYSIGNL) && ! defined (HAVE_COPYSIGNL) +# define HAVE_COPYSIGNL 1 +# define copysignl _copysignl #endif -#if defined (HAVE__LOGF) && ! defined (HAVE_LOGF) -# define HAVE_LOGF 1 -# define logf _logf +#if defined (HAVE__COSF) && ! defined (HAVE_COSF) +# define HAVE_COSF 1 +# define cosf _cosf +#endif + +#if defined (HAVE__COSHF) && ! defined (HAVE_COSHF) +# define HAVE_COSHF 1 +# define coshf _coshf #endif #if defined (HAVE__COSHL) && ! defined (HAVE_COSHL) @@ -1012,6 +792,11 @@ # define coshl _coshl #endif +#if defined (HAVE__COSL) && ! defined (HAVE_COSL) +# define HAVE_COSL 1 +# define cosl _cosl +#endif + #if defined (HAVE__EXPF) && ! defined (HAVE_EXPF) # define HAVE_EXPF 1 # define expf _expf @@ -1032,6 +817,21 @@ # define fabsl _fabsl #endif +#if defined (HAVE__FINITE) && ! defined (HAVE_FINITE) +# define HAVE_FINITE 1 +# define finite _finite +#endif + +#if defined (HAVE__FINITEF) && ! defined (HAVE_FINITEF) +# define HAVE_FINITEF 1 +# define finitef _finitef +#endif + +#if defined (HAVE__FINITEL) && ! defined (HAVE_FINITEL) +# define HAVE_FINITEL 1 +# define finitel _finitel +#endif + #if defined (HAVE__FLOORF) && ! defined (HAVE_FLOORF) # define HAVE_FLOORF 1 # define floorf _floorf @@ -1052,6 +852,11 @@ # define fmodl _fmodl #endif +#if defined (HAVE__FPCLASS) && ! defined (HAVE_FPCLASS) +# define HAVE_FPCLASS 1 +# define fpclass _fpclass +#endif + #if defined (HAVE__FREXPF) && ! defined (HAVE_FREXPF) # define HAVE_FREXPF 1 # define frexpf _frexpf @@ -1062,6 +867,51 @@ # define frexpl _frexpl #endif +#if defined (HAVE__HYPOT) && ! defined (HAVE_HYPOT) +# define HAVE_HYPOT 1 +# define hypot _hypot +#endif + +#if defined (HAVE__HYPOTF) && ! defined (HAVE_HYPOTF) +# define HAVE_HYPOTF 1 +# define hypotf _hypotf +#endif + +#if defined (HAVE__HYPOTL) && ! defined (HAVE_HYPOTL) +# define HAVE_HYPOTL 1 +# define hypotl _hypotl +#endif + +#if defined (HAVE__ISINF) && ! defined (HAVE_ISINF) +# define HAVE_ISINF 1 +# define isinf _isinf +#endif + +#if defined (HAVE__ISINFF) && ! defined (HAVE_ISINFF) +# define HAVE_ISINFF 1 +# define isinff _isinff +#endif + +#if defined (HAVE__ISINFL) && ! defined (HAVE_ISINFL) +# define HAVE_ISINFL 1 +# define isinfl _isinfl +#endif + +#if defined (HAVE__ISNAN) && ! defined (HAVE_ISNAN) +# define HAVE_ISNAN 1 +# define isnan _isnan +#endif + +#if defined (HAVE__ISNANF) && ! defined (HAVE_ISNANF) +# define HAVE_ISNANF 1 +# define isnanf _isnanf +#endif + +#if defined (HAVE__ISNANL) && ! defined (HAVE_ISNANL) +# define HAVE_ISNANL 1 +# define isnanl _isnanl +#endif + #if defined (HAVE__LDEXPF) && ! defined (HAVE_LDEXPF) # define HAVE_LDEXPF 1 # define ldexpf _ldexpf @@ -1077,29 +927,64 @@ # define log10f _log10f #endif +#if defined (HAVE__LOG10L) && ! defined (HAVE_LOG10L) +# define HAVE_LOG10L 1 +# define log10l _log10l +#endif + +#if defined (HAVE__LOGF) && ! defined (HAVE_LOGF) +# define HAVE_LOGF 1 +# define logf _logf +#endif + #if defined (HAVE__LOGL) && ! defined (HAVE_LOGL) # define HAVE_LOGL 1 # define logl _logl #endif +#if defined (HAVE__MODF) && ! defined (HAVE_MODF) +# define HAVE_MODF 1 +# define modf _modf +#endif + +#if defined (HAVE__MODFF) && ! defined (HAVE_MODFF) +# define HAVE_MODFF 1 +# define modff _modff +#endif + +#if defined (HAVE__MODFL) && ! defined (HAVE_MODFL) +# define HAVE_MODFL 1 +# define modfl _modfl +#endif + #if defined (HAVE__POWF) && ! defined (HAVE_POWF) # define HAVE_POWF 1 # define powf _powf #endif -#if defined (HAVE__LOG10L) && ! defined (HAVE_LOG10L) -# define HAVE_LOG10L 1 -# define log10l _log10l +#if defined (HAVE__POWL) && ! defined (HAVE_POWL) +# define HAVE_POWL 1 +# define powl _powl #endif -#if defined (HAVE__MODF) && ! defined (HAVE_MODF) -# define HAVE_MODF 1 -# define modf _modf +#if defined (HAVE__QFPCLASS) && ! defined (HAVE_QFPCLASS) +# define HAVE_QFPCLASS 1 +# define qfpclass _qfpclass +#endif + +#if defined (HAVE__SINCOS) && ! defined (HAVE_SINCOS) +# define HAVE_SINCOS 1 +# define sincos _sincos +#endif + +#if defined (HAVE__SINCOSF) && ! defined (HAVE_SINCOSF) +# define HAVE_SINCOSF 1 +# define sincosf _sincosf #endif -#if defined (HAVE__MODL) && ! defined (HAVE_MODL) -# define HAVE_MODL 1 -# define modl _modl +#if defined (HAVE__SINCOSL) && ! defined (HAVE_SINCOSL) +# define HAVE_SINCOSL 1 +# define sincosl _sincosl #endif #if defined (HAVE__SINF) && ! defined (HAVE_SINF) @@ -1107,16 +992,16 @@ # define sinf _sinf #endif -#if defined (HAVE__POWL) && ! defined (HAVE_POWL) -# define HAVE_POWL 1 -# define powl _powl -#endif - #if defined (HAVE__SINHF) && ! defined (HAVE_SINHF) # define HAVE_SINHF 1 # define sinhf _sinhf #endif +#if defined (HAVE__SINHL) && ! defined (HAVE_SINHL) +# define HAVE_SINHL 1 +# define sinhl _sinhl +#endif + #if defined (HAVE__SINL) && ! defined (HAVE_SINL) # define HAVE_SINL 1 # define sinl _sinl @@ -1127,88 +1012,37 @@ # define sqrtf _sqrtf #endif -#if defined (HAVE__SINHL) && ! defined (HAVE_SINHL) -# define HAVE_SINHL 1 -# define sinhl _sinhl -#endif - -#if defined (HAVE__TANF) && ! defined (HAVE_TANF) -# define HAVE_TANF 1 -# define tanf _tanf -#endif - #if defined (HAVE__SQRTL) && ! defined (HAVE_SQRTL) # define HAVE_SQRTL 1 # define sqrtl _sqrtl #endif -#if defined (HAVE__TANHF) && ! defined (HAVE_TANHF) -# define HAVE_TANHF 1 -# define tanhf _tanhf -#endif - -#if defined (HAVE__TANL) && ! defined (HAVE_TANL) -# define HAVE_TANF 1 -# define tanf _tanf -#endif - #if defined (HAVE__STRTOF) && ! defined (HAVE_STRTOF) # define HAVE_STRTOF 1 # define strtof _strtof #endif -#if defined (HAVE__TANHL) && ! defined (HAVE_TANHL) -# define HAVE_TANHL 1 -# define tanhl _tanhl -#endif - #if defined (HAVE__STRTOLD) && ! defined (HAVE_STRTOLD) # define HAVE_STRTOLD 1 # define strtold _strtold #endif -#if defined (HAVE__SINCOS) && ! defined (HAVE_SINCOS) -# define HAVE_SINCOS 1 -# define sincos _sincos -#endif - -#if defined (HAVE__SINCOSF) && ! defined (HAVE_SINCOSF) -# define HAVE_SINCOSF 1 -# define sincosf _sincosf -#endif - -#if defined (HAVE__SINCOSL) && ! defined (HAVE_SINCOSL) -# define HAVE_SINCOSL 1 -# define sincosl _sincosl -#endif - -#if defined (HAVE__FINITE) && ! defined (HAVE_FINITE) -# define HAVE_FINITE 1 -# define finite _finite -#endif - -#if defined (HAVE__FINITEF) && ! defined (HAVE_FINITEF) -# define HAVE_FINITEF 1 -# define finitef _finitef -#endif - -#if defined (HAVE__FINITEL) && ! defined (HAVE_FINITEL) -# define HAVE_FINITEL 1 -# define finitel _finitel +#if defined (HAVE__TANF) && ! defined (HAVE_TANF) +# define HAVE_TANF 1 +# define tanf _tanf #endif -#if defined (HAVE__QFINITE) && ! defined (HAVE_QFINITE) -# define HAVE_QFINITE 1 -# define qfinite _qfinite +#if defined (HAVE__TANHF) && ! defined (HAVE_TANHF) +# define HAVE_TANHF 1 +# define tanhf _tanhf #endif -#if defined (HAVE__FPCLASS) && ! defined (HAVE_FPCLASS) -# define HAVE_FPCLASS 1 -# define fpclass _fpclass +#if defined (HAVE__TANHL) && ! defined (HAVE_TANHL) +# define HAVE_TANHL 1 +# define tanhl _tanhl #endif -#if defined (HAVE__QFPCLASS) && ! defined (HAVE_QFPCLASS) -# define HAVE_QFPCLASS 1 -# define qfpclass _qfpclass +#if defined (HAVE__TANL) && ! defined (HAVE_TANL) +# define HAVE_TANL 1 +# define tanl _tanl #endif - Index: gnu/lib/libsupc++/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libsupc++/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- gnu/lib/libsupc++/Makefile 19 Aug 2006 00:52:54 -0000 1.8 +++ gnu/lib/libsupc++/Makefile 25 Sep 2006 18:56:42 -0000 @@ -1,14 +1,15 @@ # $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.8 2006/08/19 00:52:54 kan Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc +GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${.CURDIR}/../../../contrib/libstdc++/libsupc++ -.PATH: ${SRCDIR} ${GCCDIR} +.PATH: ${SRCDIR} ${GCCLIB}/libiberty # Static only. LIB= supc++ -SRCS+= del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc \ - eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc \ +SRCS+= del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \ + eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \ eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \ eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \ new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \ @@ -18,12 +19,19 @@ SRCS+= cp-demangle.c CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H -CFLAGS+= -I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++ +CFLAGS+= -I${GCCLIB}/include -I${SRCDIR} -I${GCCDIR} +CFLAGS+= -I${.CURDIR}/../libstdc++ -I. CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections HDRS= exception new typeinfo cxxabi.h exception_defines.h INCS= ${HDRS:S;^;${SRCDIR}/;} -INCSDIR=${INCLUDEDIR}/c++/3.4 +INCSDIR=${INCLUDEDIR}/c++/4.1 + +unwind.h: ${GCCDIR}/unwind-generic.h + ln -sf ${.ALLSRC} ${.TARGET} + +SRCS+= unwind.h +CLEANFILES+= unwind.h .include Index: gnu/usr.bin/cc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- gnu/usr.bin/cc/Makefile 21 Mar 2006 08:59:36 -0000 1.40 +++ gnu/usr.bin/cc/Makefile 25 Sep 2006 16:56:19 -0000 @@ -5,7 +5,7 @@ # The order of some of these are rather important. Some depend on previous # subdirs. -SUBDIR= cc_tools cc_int cc cc1 include protoize doc +SUBDIR= cc_tools libiberty libcpp libbackend cc cc1 include doc #protoize .if ${MK_CPP} != "no" SUBDIR+= cpp @@ -13,19 +13,12 @@ .if ${MK_CXX} != "no" SUBDIR+= cc1plus c++ c++filt -#.if ${MK_COLLECT2} != "no" -#SUBDIR+= collect2 -#.endif .endif .if ${MK_OBJC} != "no" SUBDIR+= cc1obj .endif -.if ${MK_FORTRAN} != "no" -SUBDIR+= f77 f771 f77doc -.endif - .if ${MK_GCOV} != "no" SUBDIR+= gcov .endif Index: gnu/usr.bin/cc/Makefile.fe =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/Makefile.fe,v retrieving revision 1.3 diff -u -r1.3 Makefile.fe --- gnu/usr.bin/cc/Makefile.fe 28 Jul 2004 05:27:19 -0000 1.3 +++ gnu/usr.bin/cc/Makefile.fe 25 Sep 2006 18:20:05 -0000 @@ -2,14 +2,15 @@ # Front-end-only bits -version!= sed -n /version_string/p ${GCCDIR}/version.c | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' +.include "Makefile.ver" # # These were previously defined in gcc.c. Just copy previous values from # there. We ifdef most of them out for FREEBSD_NATIVE builds anyway. # gcc.c won't compile without them though. DRIVER_DEFINES = \ - -DDEFAULT_TARGET_VERSION=\"$(version)\" \ - -DDEFAULT_TARGET_MACHINE=\"$(target)\" \ + -DDEFAULT_TARGET_VERSION=\"$(BASEVER)\" \ + -DDEFAULT_TARGET_MACHINE=\"$(target)\" \ + -DENABLE_SHARED_LIBGCC CFLAGS+= ${DRIVER_DEFINES} Index: gnu/usr.bin/cc/Makefile.inc =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/Makefile.inc,v retrieving revision 1.64 diff -u -r1.64 Makefile.inc --- gnu/usr.bin/cc/Makefile.inc 18 Sep 2006 17:08:31 -0000 1.64 +++ gnu/usr.bin/cc/Makefile.inc 25 Sep 2006 17:52:18 -0000 @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.64 2006/09/18 17:08:31 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.63 2002/06/04 19:45:08 obrien Exp $ .include "../Makefile.inc" @@ -7,15 +7,12 @@ __CC_MAKEFILE_INC__= ${MFILE} GCCDIR= ${.CURDIR}/../../../../contrib/gcc +GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs .include "Makefile.tgt" # Machine description. -.if ${TARGET_ARCH} == "arm" -MD_FILE= ../cc_tools/arm-diked.md -.else MD_FILE= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md -.endif target= ${TARGET_ARCH}-undermydesk-freebsd CFLAGS+= -DIN_GCC -DHAVE_CONFIG_H @@ -44,10 +41,24 @@ # correctly. CFLAGS+= -I${GCCDIR} -I${GCCDIR}/config -.if exists(${.OBJDIR}/../cc_int) -LIBCC_INT= ${.OBJDIR}/../cc_int/libcc_int.a +CFLAGS+= -I${GCCLIB}/include -I${GCCLIB}/libcpp/include + +.if exists(${.OBJDIR}/../libbackend) +LIBBACKEND= ${.OBJDIR}/../libbackend/libbackend.a +.else +LIBBACKEND= ${.CURDIR}/../libbackend/libbackend.a +.endif + +.if exists(${.OBJDIR}/../libiberty) +LIBIBERTY= ${.OBJDIR}/../libiberty/libiberty.a +.else +LIBIBERTY= ${.CURDIR}/../libiberty/libiberty.a +.endif + +.if exists(${.OBJDIR}/../libcpp) +LIBCPP= ${.OBJDIR}/../libcpp/libcpp.a .else -LIBCC_INT= ${.CURDIR}/../cc_int/libcc_int.a +LIBCPP= ${.CURDIR}/../libcpp/libcpp.a .endif .endif # !__CC_MAKEFILE_INC__ Index: gnu/usr.bin/cc/Makefile.tgt =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/Makefile.tgt,v retrieving revision 1.10 diff -u -r1.10 Makefile.tgt --- gnu/usr.bin/cc/Makefile.tgt 15 Sep 2006 05:21:06 -0000 1.10 +++ gnu/usr.bin/cc/Makefile.tgt 11 Sep 2006 14:31:12 -0000 @@ -1,15 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.10 2006/09/15 05:21:06 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8 2004/07/28 05:27:19 kan Exp $ TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == "alpha" -GCC_CPU= alpha -.elif ${TARGET_ARCH} == "arm" +.if ${TARGET_ARCH} == "arm" GCC_CPU= arm -# TARGET_CPU_DEFAULT= TARGET_CPU_xscale -.if defined(TARGET_BIG_ENDIAN) -CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END -.endif .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" GCC_CPU= i386 .elif ${TARGET_ARCH} == "ia64" Index: gnu/usr.bin/cc/c++/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/c++/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- gnu/usr.bin/cc/c++/Makefile 21 Dec 2004 08:46:58 -0000 1.23 +++ gnu/usr.bin/cc/c++/Makefile 25 Sep 2006 15:38:01 -0000 @@ -11,7 +11,7 @@ LINKS+= ${BINDIR}/c++ ${BINDIR}/CC NO_MAN= -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} +DPADD= ${LIBBACKEND} ${LIBIBERTY} +LDADD= ${LIBBACKEND} ${LIBIBERTY} .include Index: gnu/usr.bin/cc/c++filt/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/c++filt/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- gnu/usr.bin/cc/c++filt/Makefile 21 Dec 2004 08:46:58 -0000 1.20 +++ gnu/usr.bin/cc/c++filt/Makefile 25 Sep 2006 18:12:48 -0000 @@ -2,15 +2,15 @@ .include "../Makefile.inc" -.PATH: ${GCCDIR} +.PATH: ${GCCLIB}/libiberty PROG= c++filt SRCS= cp-demangle.c NO_MAN= -CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\" +CFLAGS+= -DSTANDALONE_DEMANGLER -DVERSION=\"$(version)\" -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} +DPADD= ${LIBIBERTY} +LDADD= ${LIBIBERTY} .include Index: gnu/usr.bin/cc/cc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- gnu/usr.bin/cc/cc/Makefile 21 Sep 2006 07:52:40 -0000 1.32 +++ gnu/usr.bin/cc/cc/Makefile 25 Sep 2006 15:38:53 -0000 @@ -1,19 +1,20 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.32 2006/09/21 07:52:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.31 2004/12/21 09:59:41 ru Exp $ .include "../Makefile.inc" .include "../Makefile.fe" -.PATH: ${GCCDIR} ${GCCDIR}/doc +.PATH: ${GCCDIR} PROG= cc -MAN= gcc.1 +#MAN= gcc.1 +NO_MAN= SRCS= gcc.c gccspec.c NO_SHARED?=yes LINKS= ${BINDIR}/cc ${BINDIR}/gcc MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} +DPADD= ${LIBBACKEND} ${LIBIBERTY} +LDADD= ${LIBBACKEND} ${LIBIBERTY} .include Index: gnu/usr.bin/cc/cc1/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v retrieving revision 1.34 diff -u -r1.34 Makefile --- gnu/usr.bin/cc/cc1/Makefile 21 Dec 2004 09:59:41 -0000 1.34 +++ gnu/usr.bin/cc/cc1/Makefile 25 Sep 2006 15:39:19 -0000 @@ -3,31 +3,24 @@ .include "../Makefile.inc" .PATH: ${GCCDIR} - + PROG= cc1 -SRCS= main.c c-parse+%DIKED.c c-lang.c stub-objc.c +SRCS= main.c c-parser.c c-lang.c BINDIR= /usr/libexec NO_MAN= NO_SHARED?=yes -CFLAGS+= -I. - -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} - -#----------------------------------------------------------------------- -# C parser -c-parse+%DIKED.c: c-parse.c - sed -e "s/malloc/xmalloc/g" \ - -e "s/realloc/xrealloc/g" \ - ${.ALLSRC} > ${.TARGET} - -c-parse.y: c-parse.in - sed -e "/^@@ifobjc.*/,/^@@end_ifobjc.*/d" \ - -e "/^@@ifc.*/d" -e "/^@@end_ifc.*/d" \ - ${.ALLSRC} > ${.TARGET} - -CLEANFILES= c-parse+%DIKED.c c-parse.c c-parse.y -CLEANFILES+= y.tab.h # we don't use it, but the system YACC rules are naive +OBJS+= ${PROG}-checksum.o +DPADD= ${LIBBACKEND} ${LIBCPP} ${LIBIBERTY} +LDADD= ${LIBBACKEND} ${LIBCPP} ${LIBIBERTY} + +DOBJS+= ${SRCS:N*.h:R:S/$/.o/g} +${PROG}-dummy: ${DOBJS} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD} +CLEANFILES+= ${PROG}-dummy + +${PROG}-checksum.c: ${PROG}-dummy + ../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET} +CLEANFILES+= ${PROG}-checksum.c .include Index: gnu/usr.bin/cc/cc1obj/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1obj/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- gnu/usr.bin/cc/cc1obj/Makefile 21 Dec 2004 09:59:41 -0000 1.27 +++ gnu/usr.bin/cc/cc1obj/Makefile 25 Sep 2006 15:40:16 -0000 @@ -5,31 +5,24 @@ .PATH: ${GCCDIR}/objc ${GCCDIR} PROG= cc1obj -SRCS= main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c +SRCS= main.c c-parser.c objc-act.c objc-lang.c c-decl.c BINDIR= /usr/libexec NO_MAN= NO_SHARED?=yes CFLAGS+= -I${GCCDIR}/objc -I. -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} - -#----------------------------------------------------------------------- -# objc parser -objc-parse+DIKED.c: objc-parse.c - sed -e "s/malloc/xmalloc/g" \ - -e "s/realloc/xrealloc/g" \ - ${.ALLSRC} > ${.TARGET} - -objc-parse.y: c-parse.in - sed -e "/^@@ifc.*/,/^@@end_ifc.*/d" \ - -e "/^@@ifobjc.*/d" -e "/^@@end_ifobjc.*/d" \ - ${.ALLSRC} > ${.TARGET} - -CLEANFILES= objc-parse+DIKED.c objc-parse.c objc-parse.y -CLEANFILES+= y.tab.h # we don't use it, but the system YACC rules are naive - -#----------------------------------------------------------------------- +OBJS+= ${PROG}-checksum.o +DPADD= ${LIBBACKEND} ${LIBCPP} ${LIBIBERTY} +LDADD= ${LIBBACKEND} ${LIBCPP} ${LIBIBERTY} + +DOBJS+= ${SRCS:N*.h:R:S/$/.o/g} +${PROG}-dummy: ${DOBJS} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD} +CLEANFILES+= ${PROG}-dummy + +${PROG}-checksum.c: ${PROG}-dummy + ../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET} +CLEANFILES+= ${PROG}-checksum.c .include Index: gnu/usr.bin/cc/cc1plus/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1plus/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- gnu/usr.bin/cc/cc1plus/Makefile 21 Dec 2004 09:59:41 -0000 1.38 +++ gnu/usr.bin/cc/cc1plus/Makefile 30 Sep 2006 02:04:41 -0000 @@ -9,7 +9,8 @@ SRCS+= main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \ decl.c decl2.c error.c except.c expr.c dump.c friend.c init.c lex.c \ mangle.c method.c name-lookup.c parser.c pt.c ptree.c repo.c rtti.c \ - search.c semantics.c tree.c typeck.c typeck2.c optimize.c + search.c semantics.c tree.c typeck.c typeck2.c optimize.c \ + cp-objcp-common.c cp-gimplify.c tree-mudflap.c BINDIR= /usr/libexec NO_MAN= @@ -17,15 +18,24 @@ CFLAGS+= -I${GCCDIR}/cp -I. -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} +OBJS+= ${PROG}-checksum.o +DPADD= ${LIBBACKEND} ${LIBCPP} ${LIBIBERTY} +LDADD= ${LIBBACKEND} ${LIBCPP} ${LIBIBERTY} #----------------------------------------------------------------------- # C++ parser cfns.h: cfns.gperf gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ ${.ALLSRC} > ${.TARGET} - CLEANFILES= cfns.h +DOBJS+= ${SRCS:N*.h:R:S/$/.o/g} +${PROG}-dummy: ${DOBJS} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD} +CLEANFILES+= ${PROG}-dummy + +${PROG}-checksum.c: ${PROG}-dummy + ../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET} +CLEANFILES+= ${PROG}-checksum.c + .include Index: gnu/usr.bin/cc/cc_tools/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc_tools/Makefile,v retrieving revision 1.84 diff -u -r1.84 Makefile --- gnu/usr.bin/cc/cc_tools/Makefile 18 Sep 2006 17:08:32 -0000 1.84 +++ gnu/usr.bin/cc/cc_tools/Makefile 6 Dec 2006 16:14:27 -0000 @@ -1,210 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.84 2006/09/18 17:08:32 imp Exp $ - .include -# -# This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk -# is such a !@#!*#% nightmare because of how it reprograms the dependencies, -# suffix rules, SRCS, etc. It's easiest to cheat by using bsd.prog.mk and -# SRCS to get dependencies. -# - -# -# ../Makefile.inc will put an absolute path to our objdir in CFLAGS. -# Prevent mkdep from using it, so that we don't have to give rules for -# aliases of generated headers. -# CFLAGS+= -I. .include "../Makefile.inc" -.PATH: ${GCCDIR} ${GCCDIR}/f - -CFLAGS+= -DGENERATOR_FILE - -# -#----------------------------------------------------------------------- -# Build 'pocket' libiberty exclusively for build tools use. - -LIBIBERTY_SRCS= choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \ - dyn-string.c fibheap.c getpwd.c getruntime.c hashtab.c hex.c \ - lbasename.c make-temp-file.c md5.c obstack.c partition.c pex-unix.c \ - physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c -LIBIBERTY_OBJS= ${LIBIBERTY_SRCS:R:S/$/.o/g} - -SRCS+= ${LIBIBERTY_SRCS} - -LIBIBERTY=libiberty.a -${LIBIBERTY}: ${LIBIBERTY_OBJS} - @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q` - ${RANLIB} ${.TARGET} -CLEANFILES+= ${LIBIBERTY} - -# -#----------------------------------------------------------------------- -# options -OPTION_FILES=${GCCDIR}/f/lang.opt ${GCCDIR}/c.opt ${GCCDIR}/common.opt - -.ORDER: options.h options.c -options.h options.c: opts.sh ${OPTION_FILES} - /bin/sh ${GCCDIR}/opts.sh mv options.c options.h ${OPTION_FILES} - -GENSRCS+= options.c options.h -CLEANFILES+= options.c options.h - -#----------------------------------------------------------------------- -# insn-* gunk - -.for F in attr codes config flags constants -insn-$F.h: gen$F ${MD_FILE} - ./gen$F ${MD_FILE} > insn-$F.h -GENSRCS+= insn-$F.h -.endfor - -.for F in conditions -insn-$F.c: gen$F ${MD_FILE} - ./gen$F ${MD_FILE} > insn-$F.c -GENSRCS+= insn-$F.c -.endfor - -GENSRCS+= gen-time-stamp -gen-time-stamp: genattr genattrtab genconditions genconstants genemit \ - genextract gengtype genopinit genoutput genpeep genrecog - touch ${.TARGET} - -.for F in attr codes config emit extract flags opinit output peep recog -gen$F: gen$F.o rtl.o print-rtl.o bitmap.o gensupport.o ggc-none.o \ - read-rtl.o insn-conditions.o min-insn-modes.o errors.o ${LIBIBERTY} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - -GENSRCS+= gen$F.c -CLEANFILES+= gen$F -.endfor - -# -# genattrtab needs more complex build rule -# -genattrtab : genattrtab.o rtl.o print-rtl.o bitmap.o gensupport.o ggc-none.o \ - read-rtl.o insn-conditions.o genautomata.o varray.o min-insn-modes.o \ - errors.o ${LIBIBERTY} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm - -GENSRCS+= genattrtab.c -CLEANFILES+= genattrtab - -# -# genconstants and genconditions cannot depend on insn-conditions.o -# they should be liked with dummy-conditions.o stubs instead -# -.for F in constants conditions -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} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - -GENSRCS+= gen$F.c -CLEANFILES+= gen$F -.endfor - -.for F in modes check genrtl preds -gen$F: gen$F.o errors.o ${LIBIBERTY} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - -GENSRCS+= gen$F.c -CLEANFILES+= gen$F -.endfor - -.ORDER: genrtl.c genrtl.h -genrtl.c genrtl.h: gengenrtl - ./gengenrtl > genrtl.c - ./gengenrtl -h > genrtl.h +CFLAGS+= -g +CFLAGS+= -DGENERATOR_FILE -DAVE_CONFIG_H -GENSRCS+= genrtl.c genrtl.h +# Override LIBIBERTY set by Makefile.inc, We use our own for +# build tools. +LIBIBERTY= libiberty.a -SRCS+= bitmap.c dummy-conditions.c errors.c genautomata.c gensupport.c \ - ggc-none.c print-rtl.c read-rtl.c rtl.c varray.c - -#----------------------------------------------------------------------- -# insn modes stuff. - -.ORDER: insn-modes.c insn-modes.h -insn-modes.h: genmodes - ./genmodes -h > insn-modes.h - -insn-modes.c: genmodes - ./genmodes > insn-modes.c - -min-insn-modes.c: genmodes - ./genmodes -m > min-insn-modes.c - -GENSRCS+= insn-modes.c min-insn-modes.c insn-modes.h - -#----------------------------------------------------------------------- -# Common parser stuff. - -tree-check.h: gencheck - ./gencheck > ${.TARGET} -GENSRCS+= tree-check.h - -#----------------------------------------------------------------------- -# Predicates stuff. - -tm-preds.h: genpreds - ./genpreds > ${.TARGET} -GENSRCS+= tm-preds.h - -#----------------------------------------------------------------------- -# Gengtype - -gengtype-lex.c : gengtype-lex.l - ${LEX} -t ${.ALLSRC} | \ - sed 's/^\(char msg\[\];\)/yyconst \1/' > ${.TARGET} - -.ORDER: gengtype-yacc.c gengtype-yacc.h -gengtype-yacc.c gengtype-yacc.h: gengtype-yacc.y - ${YACC} -d -o gengtype-yacc.c ${.ALLSRC} - -GENSRCS+= gengtype-yacc+%DIKED.c gengtype-yacc.h gengtype-lex.c -CLEANFILES+= gengtype-yacc.c - -gengtype-yacc+%DIKED.c: gengtype-yacc.c - cat ${.ALLSRC} > ${.TARGET} - sed -e "s/xmalloc/malloc/g" \ - -e "s/xrealloc/realloc/g" \ - -e "s/malloc/xmalloc/g" \ - -e "s/realloc/xrealloc/g" \ - ${.ALLSRC} > ${.TARGET} - -gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o ${LIBIBERTY} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - -GENSRCS+= gengtype.c -CLEANFILES+= gengtype - -gengtype-lex.o: gengtype-yacc.h - -.ORDER: gtype-desc.c gtype-desc.h -gtype-desc.c gtype-desc.h: gtype-time-stamp - @true - -GENSRCS+= gtype-time-stamp -gtype-time-stamp: gengtype ${GTFILES} - ./gengtype - touch ${.TARGET} - -GENSRCS+= gtype-desc.c gtype-desc.h -CLEANFILES+= gt-*.h gtype-*.h - -# -#----------------------------------------------------------------------- -# Fortran build tools - -.if ${MK_FORTRAN} != "no" -gen-time-stamp: fini -fini: fini.o ${LIBIBERTY} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -SRCS+= fini.c -CLEANFILES+= fini -.endif +.PATH: ${GCCDIR} ${GCCLIB}/libiberty #----------------------------------------------------------------------- # Determine content of variables used by the target/host config files @@ -212,102 +19,93 @@ # # The list of headers to go into tm.h # +TARGET_INC+= options.h .if ${TARGET_ARCH} == "amd64" -TARGET_INC= i386/biarch64.h +TARGET_INC+= i386/biarch64.h .endif -.if ${TARGET_ARCH} != "arm" TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h -.endif .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h TARGET_INC+= ${GCC_CPU}/att.h .endif -.if ${TARGET_ARCH} != "alpha" TARGET_INC+= dbxelf.h TARGET_INC+= elfos.h -.endif TARGET_INC+= freebsd-native.h TARGET_INC+= freebsd-spec.h TARGET_INC+= freebsd.h -.if ${TARGET_ARCH} == "alpha" -TARGET_INC+= ${GCC_CPU}/elf.h -.endif .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h) TARGET_INC+= ${GCC_CPU}/sysv4.h .endif .endif -.if ${TARGET_ARCH} == "arm" -TARGET_INC+= ${GCC_CPU}/elf.h -TARGET_INC+= ${GCC_CPU}/aout.h -TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h -. if defined(TARGET_BIG_ENDIAN) -CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END -. endif -.endif -.if ${TARGET_ARCH} == "arm" -TARGET_INC+= freebsd-diked.h -.else -TARGET_INC+= ${GCC_CPU}/freebsd.h -.endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h +TARGET_INC+= ${GCC_CPU}/freebsd.h TARGET_INC+= ${GCC_CPU}/freebsd64.h TARGET_INC+= freebsd64-fix.h -.endif -.if ${TARGET_ARCH} == "powepc" -TARGET_INC+= altivec-defs.h +.else +TARGET_INC+= ${GCC_CPU}/freebsd.h .endif TARGET_INC+= defaults.h -# -# Use TARGET_INC as a template and build a list of target specific -# include files for gengtype to scan -# -GCONFIG_H= ${.CURDIR}/auto-host.h - .for H in ${TARGET_INC} .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR} .if exists($D/$H) -GCONFIG_H+= $D/$H +TARGET_INC_FILES+= $D/$H .endif .endfor .endfor # -# Define some variables to make blocks copied from Makefile.in happy +# gtyp includes. # srcdir= ${GCCDIR} -HASHTAB_H= ${GCCDIR}/hashtab.h -SPLAY_TREE_H= ${GCCDIR}/splay-tree.h -out_file= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.c -GTFILES_SRCDIR= ${GCCDIR} +CPPLIB_H= ${GCCLIB}/libcpp/include/line-map.h \ + ${GCCLIB}/libcpp/include/cpplib.h +SYMTAB_H= ${GCCLIB}/libcpp/include/symtab.h +CPP_ID_DATA_H= ${CPPLIB_H} ${GCCLIB}/libcpp/include/cpp-id-data.h +HASHTAB_H= ${GCCLIB}/include/hashtab.h +SPLAY_TREE_H= ${GCCLIB}/include/splay-tree.h +out_file= ${srcdir}/config/${GCC_CPU}/${GCC_CPU}.c +tm_file_list= ${TARGET_INC_FILES} +host_xm_file_list= ${.CURDIR}/auto-host.h ${GCCLIB}/include/ansidecl.h +GTFILES_SRCDIR= ${srcdir} -# # Copied unchanged from gcc/Makefile.in -# -GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \ - $(GCONFIG_H) $(HASHTAB_H) $(SPLAY_TREE_H) \ - $(srcdir)/bitmap.h $(srcdir)/coverage.c $(srcdir)/function.h $(srcdir)/rtl.h \ - $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/libfuncs.h $(srcdir)/hashtable.h \ - $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h \ +GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h \ + $(CPP_ID_DATA_H) $(host_xm_file_list) \ + $(tm_file_list) $(HASHTAB_H) $(SPLAY_TREE_H) $(srcdir)/bitmap.h \ + $(srcdir)/coverage.c $(srcdir)/function.h $(srcdir)/rtl.h \ + $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/libfuncs.h $(SYMTAB_H) \ + $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h $(srcdir)/hwint.h \ + $(srcdir)/ipa-reference.h \ $(srcdir)/cselib.h $(srcdir)/basic-block.h $(srcdir)/cgraph.h \ - $(srcdir)/c-common.h $(srcdir)/c-tree.h \ + $(srcdir)/c-common.h $(srcdir)/c-tree.h $(srcdir)/reload.h \ $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \ + $(srcdir)/ipa-prop.c $(srcdir)/ipa-cp.c $(srcdir)/cgraphunit.c \ $(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \ - $(srcdir)/dojump.c \ + $(srcdir)/dojump.c $(srcdir)/tree-profile.c \ $(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \ - $(srcdir)/fold-const.c $(srcdir)/function.c \ + $(srcdir)/function.c $(srcdir)/except.h \ $(srcdir)/gcse.c $(srcdir)/integrate.c $(srcdir)/lists.c $(srcdir)/optabs.c \ - $(srcdir)/profile.c $(srcdir)/ra-build.c $(srcdir)/regclass.c \ - $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c $(srcdir)/langhooks.c \ - $(srcdir)/sdbout.c $(srcdir)/stmt.c $(srcdir)/stor-layout.c \ + $(srcdir)/profile.c $(srcdir)/regclass.c \ + $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c \ + $(srcdir)/sdbout.c $(srcdir)/stor-layout.c \ $(srcdir)/stringpool.c $(srcdir)/tree.c $(srcdir)/varasm.c \ - $(out_file) + $(srcdir)/tree-mudflap.c $(srcdir)/tree-flow.h \ + $(srcdir)/c-objc-common.c $(srcdir)/c-common.c $(srcdir)/c-parser.c \ + $(srcdir)/tree-ssanames.c $(srcdir)/tree-eh.c $(srcdir)/tree-ssa-address.c \ + $(srcdir)/tree-phinodes.c $(srcdir)/tree-cfg.c \ + $(srcdir)/tree-dfa.c $(srcdir)/tree-ssa-propagate.c \ + $(srcdir)/tree-iterator.c $(srcdir)/gimplify.c \ + $(srcdir)/tree-chrec.h $(srcdir)/tree-vect-generic.c \ + $(srcdir)/tree-ssa-operands.h $(srcdir)/tree-ssa-operands.c \ + $(srcdir)/tree-profile.c $(srcdir)/tree-nested.c \ + $(srcdir)/ipa-reference.c $(srcdir)/tree-ssa-structalias.h \ + $(srcdir)/tree-ssa-structalias.c \ + $(srcdir)/targhooks.c $(out_file) -# -# Build a list of frontend directories to look into -# +# The list of frontend directories to look into GTFILES_LANG_DIR_NAMES= .if ${MK_CXX} != "no" @@ -318,13 +116,7 @@ GTFILES_LANG_DIR_NAMES+= objc .endif -.if ${MK_FORTRAN} != "no" -GTFILES_LANG_DIR_NAMES+= f -.endif - -# -# Build a list of language specific files for gengtype -# +# The list of language specific files for gengtype .for L in ${GTFILES_LANG_DIR_NAMES} c .if exists(${GCCDIR}/$L-config-lang.in) # Source the language config file @@ -339,167 +131,340 @@ .endfor GTFILES+= ${GTFILES_FILES} -#----------------------------------------------------------------------- -# the host/target compiler config. +# +# Tree definition files. +# +TREE_DEF_FILES= + +.if ${MK_CXX} != "no" +TREE_DEF_FILES+= cp/cp-tree.def +.endif -COMMONHDRS= bconfig.h config.h configargs.h gencheck.h multilib.h \ - specs.h safe-ctype.h tconfig.h tm.h tm_p.h gcov-iov.h \ - gtyp-gen.h -GENSRCS+= ${COMMONHDRS} +.if ${MK_OBJC} != "no" +TREE_DEF_FILES+= objc/objc-tree.def +.endif -MFILE?= ${.CURDIR}/Makefile -${COMMONHDRS}: ${MFILE} +# +# Option files. +# +OPT_FILES= c.opt common.opt -configargs.h: - echo 'static const char configuration_arguments[] =' > ${.TARGET} - echo ' "FreeBSD/${TARGET_ARCH} system compiler";' >> ${.TARGET} - echo 'static const char thread_model[] = "posix";' >> ${.TARGET} - echo 'static const struct {' >> ${.TARGET} - echo ' const char *name, *value;' >> ${.TARGET} - echo '} configure_default_options[] = {' >> ${.TARGET} - echo ' { "NULL", "NULL" } };' >> ${.TARGET} +.if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt) +OPT_FILES+= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt +.endif -tconfig.h: - echo '#ifndef GCC_TCONFIG_H' > ${.TARGET} - echo '#define GCC_TCONFIG_H' >> ${.TARGET} - echo '#ifdef IN_GCC' >> ${.TARGET} - echo '# include "ansidecl.h"' >> ${.TARGET} - echo '#endif' >> ${.TARGET} - echo '#define USED_FOR_TARGET' >> ${.TARGET} - echo '#endif /* GCC_TCONFIG_H */' >> ${.TARGET} +.if exists(${.CURDIR}/${GCC_CPU}-freebsd.opt) +OPT_FILES+= ${.CURDIR}/${GCC_CPU}-freebsd.opt +.endif + +.if ${TARGET_ARCH} == "powerpc" +OPT_FILES+= ${GCCDIR}/config/${GCC_CPU}/sysv4.opt +.endif +.if ${TARGET_ARCH} == "sparc64" +OPT_FILES+= ${GCCDIR}/config/${GCC_CPU}/long-double-switch.opt +.endif + +.if exists(${.CURDIR}/freebsd.opt) +OPT_FILES+= ${.CURDIR}/freebsd.opt +.endif + +#----------------------------------------------------------------------- +# Build rules for header files and generator tools + +# Host config +config.h: + TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \ + HEADERS="auto-host.h ansidecl.h" \ + DEFINES="" \ + /bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET} + +GENSRCS+= config.h +CLEANFILES+= cs-config.h + +# Build config bconfig.h: - echo '#ifndef GCC_BCONFIG_H' > ${.TARGET} - echo '#define GCC_BCONFIG_H' >> ${.TARGET} - echo '#include "auto-host.h"' >> ${.TARGET} + TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \ + HEADERS="auto-host.h ansidecl.h" \ + DEFINES="" \ + /bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET} .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def) echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET} .endif - echo '#ifdef IN_GCC' >> ${.TARGET} - echo '# include "ansidecl.h"' >> ${.TARGET} - echo '#endif' >> ${.TARGET} - echo '#endif /* GCC_BCONFIG_H */' >> ${.TARGET} -gencheck.h: - echo '#include "cp/cp-tree.def"' > ${.TARGET} - echo '#include "objc/objc-tree.def"' >> ${.TARGET} +GENSRCS+= bconfig.h +CLEANFILES+= cs-bconfig.h -multilib.h: - echo 'static const char *const multilib_raw[] = { \ - "aout maout;", "elf !maout;", NULL };' > ${.TARGET} - echo 'static const char *const multilib_matches_raw[] = { \ - "maout maout;", "melf melf;", NULL };' >> ${.TARGET} - echo 'static const char *multilib_extra = "";' >> ${.TARGET} - echo 'static const char *multilib_options = "";'>> ${.TARGET} - echo 'static const char *const multilib_exclusions_raw[] = { \ - NULL };' >> ${.TARGET} - -specs.h: - echo '#include "cp/lang-specs.h"' > ${.TARGET} - echo '#include "f/lang-specs.h"' >> ${.TARGET} - echo '#include "objc/lang-specs.h"' >> ${.TARGET} - -config.h: bconfig.h - echo '#include ' > ${.TARGET} +# tconfig.h +tconfig.h: + TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \ + HEADERS="auto-host.h ansidecl.h" \ + DEFINES="USED_FOR_TARGET" \ + /bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET} + +GENSRCS+= tconfig.h +CLEANFILES+= cs-tconfig.h +# Options +optionlist: ${OPT_FILES} + awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET} + +options.h: optionlist + awk -f ${GCCDIR}/opt-functions.awk \ + -f ${GCCDIR}/opth-gen.awk \ + < ${.ALLSRC} > ${.TARGET} + +options.c: optionlist + awk -f ${GCCDIR}/opt-functions.awk \ + -f ${GCCDIR}/optc-gen.awk \ + -v header_name="config.h system.h coretypes.h tm.h" \ + < ${.ALLSRC} > ${.TARGET} +GENSRCS+= optionlist options.h options.c +# Target machine config tm.h: - echo '#ifndef GCC_TM_H' > ${.TARGET} - echo '#define GCC_TM_H' >> ${.TARGET} -.if defined(TARGET_CPU_DEFAULT) - echo "#define TARGET_CPU_DEFAULT (${TARGET_CPU_DEFAULT})" >> ${.TARGET} -.endif - echo '#ifdef IN_GCC' >> ${.TARGET} -.for H in ${TARGET_INC} - echo '#include "$H"' >> ${.TARGET} -.endfor - echo '#if !defined GENERATOR_FILE && !defined USED_FOR_TARGET' >> ${.TARGET} - echo '# include "insn-constants.h"' >> ${.TARGET} - echo '# include "insn-flags.h"' >> ${.TARGET} - echo '#endif' >> ${.TARGET} - echo '#endif' >> ${.TARGET} + TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \ + HEADERS="${TARGET_INC}" \ + DEFINES="" \ + /bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET} .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def) echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET} .endif - echo '#endif /* GCC_TM_H */' >> ${.TARGET} +GENSRCS+= tm.h +CLEANFILES+= cs-tm.h + +# Target machine protos/preds. tm_p.h: - echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"' >> ${.TARGET} - echo '#include "tm-preds.h"' >> ${.TARGET} + TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \ + HEADERS="${GCC_CPU}/${GCC_CPU}-protos.h tm-preds.h" \ + DEFINES="" \ + /bin/sh ${GCCDIR}/mkconfig.sh tm_p.h + +GENSRCS+= tm_p.h +CLEANFILES+= cs-tm_p.h -safe-ctype.h: - echo '#include ' > ${.TARGET} -.for Z in TOUPPER TOLOWER ISDIGIT ISXDIGIT ISUPPER ISLOWER ISALPHA ISALNUM \ - ISSPACE ISPUNCT ISGRAPH ISBLANK ISPRINT ISCNTRL - echo '#define ${Z} ${Z:L}' >> ${.TARGET} -.endfor - echo "#define ISIDST(x) \ - ((x) == '_' || isalpha(x))" >> ${.TARGET} - echo "#define ISIDNUM(x) \ - (isdigit(x) || ISIDST(x))" >> ${.TARGET} - echo "#define IS_VSPACE(x) \ - ((x) == '\n' || (x) == '\r')" >> ${.TARGET} - echo "#define IS_NVSPACE(x) \ - (!IS_VSPACE(x) && (isspace(x) || (x) == '\0'))" >> ${.TARGET} - echo "#define IS_SPACE_OR_NUL(x) \ - (isspace(x) || (x) == '\0')" >> ${.TARGET} +# gencheck +gencheck.h: +.for F in ${TREE_DEF_FILES} + echo "#include \"$F\"" >> ${.TARGET} +.endfor + +GENSRCS+= gencheck.h -gtyp-gen.h: + +# Source header for gtyp generator. +gtyp-gen.h: ${GTFILES} echo "/* This file is machine generated. Do not edit. */" > ${.TARGET} - echo "static const char *srcdir = " >> ${.TARGET} + echo "static const char * const srcdir = " >> ${.TARGET} echo "\"$(GTFILES_SRCDIR)\";" >> ${.TARGET} - echo "static const char *lang_files[] = {" >> ${.TARGET} + echo "static const char * const lang_files[] = {" >> ${.TARGET} .for F in ${GTFILES_FILES} echo "\"$F\", " >> ${.TARGET} .endfor echo "NULL};" >> ${.TARGET} - echo "static const char *langs_for_lang_files[] = {" >> ${.TARGET} + echo "static const char * const langs_for_lang_files[] = {">> ${.TARGET} .for F in ${GTFILES_LANGS} echo "\"$F\", " >> ${.TARGET} .endfor echo "NULL};" >> ${.TARGET} - echo "static const char *all_files[] = {" >> ${.TARGET} + echo "static const char * const all_files[] = {" >> ${.TARGET} .for F in ${GTFILES} echo "\"$F\", " >> ${.TARGET} .endfor echo "NULL};" >> ${.TARGET} - echo "static const char *lang_dir_names[] = { \"c\", " >> ${.TARGET} -.for F in ${GTFILES_LANG_DIR_NAMES} + echo "static const char * const lang_dir_names[] = {" >> ${.TARGET} +.for F in c ${GTFILES_LANG_DIR_NAMES} echo "\"$F\", " >> ${.TARGET} .endfor echo "NULL};" >> ${.TARGET} +GENSRCS+= gtyp-gen.h + +# Version header for gcov gcov-iov.h: - echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET} + echo "#define GCOV_VERSION ((gcov_unsigned_t)0x34303170)" >> ${.TARGET} + +GENSRCS+= gcov-iov.h + +# Multilib config file +multilib.h: + echo 'static const char *const multilib_raw[] = { \ + "aout maout;", "elf !maout;", NULL };' > ${.TARGET} + echo 'static const char *const multilib_matches_raw[] = { \ + "maout maout;", "melf melf;", NULL };' >> ${.TARGET} + echo 'static const char *multilib_extra = "";' >> ${.TARGET} + echo 'static const char *multilib_options = "";'>> ${.TARGET} + echo 'static const char *const multilib_exclusions_raw[] = { \ + NULL };' >> ${.TARGET} + +GENSRCS+= multilib.h + +configargs.h: + echo 'static const char configuration_arguments[] =' > ${.TARGET} + echo ' "FreeBSD/${TARGET_ARCH} system compiler";' >> ${.TARGET} + echo 'static const char thread_model[] = "posix";' >> ${.TARGET} + echo 'static const struct {' >> ${.TARGET} + echo ' const char *name, *value;' >> ${.TARGET} + echo '} configure_default_options[] = {' >> ${.TARGET} + echo ' { "NULL", "NULL" } };' >> ${.TARGET} + +GENSRCS+= configargs.h + +# Language spec files +specs.h: + echo '#include "cp/lang-specs.h"' > ${.TARGET} + echo '#include "objc/lang-specs.h"' >> ${.TARGET} + +GENSRCS+= specs.h + +# Linked headers +gthr-default.h: ${GCCDIR}/gthr-posix.h + ln -sf ${.ALLSRC} ${.TARGET} + +GENSRCS+= gthr-default.h + +unwind.h: ${GCCDIR}/unwind-generic.h + ln -sf ${.ALLSRC} ${.TARGET} + +GENSRCS+= unwind.h + +# +# gtype gunk +# +gengtype-lex.c: gengtype-lex.l + flex -ogengtype-lex.c ${.ALLSRC} + +gengtype-yacc.h: gengtype-yacc.y + yacc -d -o gengtype-yacc.c ${.ALLSRC} + +gengtype-yacc.c: gengtype-yacc.h + +gengtype-yacc+%DIKED.c: gengtype-yacc.c + cat ${.ALLSRC} > ${.TARGET} + sed -e "s/xmalloc/malloc/g" \ + -e "s/xrealloc/realloc/g" \ + -e "s/malloc/xmalloc/g" \ + -e "s/realloc/xrealloc/g" \ + ${.ALLSRC} > ${.TARGET} + +GENSRCS+= gengtype-lex.c gengtype-yacc.h gengtype-yacc+%DIKED.c +CLEANFILES+= gengtype-yacc.c + +gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o errors.o \ + ${LIBIBERTY} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} + +gtype-desc.h: gengtype + ./gengtype + touch ${.TARGET} + +gtype-desc.c: gtype-desc.h + +GENSRCS+= gtype-desc.c gtype-desc.h +CLEANFILES+= gt-*.h gtype-*.h + +# +# Generator tools. +# +.for F in check checksum genrtl modes +gen$F: gen$F.o errors.o ${LIBIBERTY} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} +.endfor + +.for F in conditions constants preds +gen$F: gen$F.o gensupport.o dummy-conditions.o rtl.o read-rtl.o ggc-none.o \ + min-insn-modes.o errors.o ${LIBIBERTY} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} +.endfor + +.for F in attr codes config flags extract emit opinit output peep recog +gen$F: gen$F.o gensupport.o insn-conditions.o rtl.o read-rtl.o ggc-none.o \ + min-insn-modes.o errors.o print-rtl.o ${LIBIBERTY} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} +.endfor + +genattrtab: genattrtab.o genautomata.o gensupport.o insn-conditions.o \ + rtl.o read-rtl.o ggc-none.o min-insn-modes.o errors.o print-rtl.o \ + varray.o ${LIBIBERTY} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm + +# +# Generated header files. +# +.for F in attr codes config constants flags +insn-$F.h: gen$F + ./gen$F ${MD_FILE} > ${.TARGET} +GENSRCS+= insn-$F.h +.endfor + +# Header files with irregular names. +genrtl.h: gengenrtl + ./gengenrtl -h > ${.TARGET} +GENSRCS+= genrtl.h + +tm-preds.h: genpreds + ./genpreds -h ${MD_FILE} > ${.TARGET} +GENSRCS+= tm-preds.h + +tree-check.h: gencheck + ./gencheck > ${.TARGET} +GENSRCS+= tree-check.h + +insn-modes.h: genmodes + ./genmodes -h > ${.TARGET} +GENSRCS+= insn-modes.h + +# +# Generated source files. +# +.for F in attrtab conditions extract emit opinit output peep preds recog +insn-$F.c: gen$F + ./gen$F ${MD_FILE} > ${.TARGET} +GENSRCS+= insn-$F.c +.endfor + +# Source files with irregular names. +insn-modes.c: genmodes + ./genmodes > ${.TARGET} +GENSRCS+= insn-modes.c + +min-insn-modes.c: genmodes + ./genmodes -m > ${.TARGET} +GENSRCS+= min-insn-modes.c + +genrtl.c: gengenrtl + ./gengenrtl > ${.TARGET} +GENSRCS+= genrtl.c -.if ${TARGET_ARCH} == "arm" -freebsd-diked.h: ${GCCDIR}/../../gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff - cp ${GCCDIR}/config/arm/freebsd.h freebsd.h - patch freebsd.h ${.ALLSRC} - mv freebsd.h ${.TARGET} -COMMONHDRS+= freebsd-diked.h -CLEANFILES+= freebsd.h.orig - -# Make sure freebsd-diked.h is built when tm.h is built for csu's sake -tm.h: freebsd-diked.h - -${MD_FILE}: ${MFILE} - cp ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md . - ln -sf ${GCCDIR}/config/${GCC_CPU}/fpa.md . - ln -sf ${GCCDIR}/config/${GCC_CPU}/cirrus.md . - ln -sf ${GCCDIR}/config/${GCC_CPU}/iwmmxt.md . - patch ${GCC_CPU}.md ${.CURDIR}/arm.md.diff - mv ${GCC_CPU}.md ${.TARGET} -CLEANFILES+= arm-diked.md ${GCC_CPU}.md.orig fpa.md cirrus.md iwmmxt.md -.endif #----------------------------------------------------------------------- -# General things. +# Build tools. -SRCS+= ${GENSRCS} -CLEANFILES+= ${GENSRCS} +GNTOOLS+= genattr genattrtab gencodes gencheck genchecksum genconditions \ + genconfig genconstants genemit genextract genflags gengenrtl \ + gengtype genmodes genopinit genoutput genpeep genpreds genrecog -all: ${SRCS} +all: ${GNTOOLS} ${GENSRCS} -.include +# +#----------------------------------------------------------------------- +# Build 'pocket' libiberty exclusively for build tools use. + +LIBIBERTY_SRCS= choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \ + dyn-string.c fibheap.c fopen_unlocked.c getpwd.c getruntime.c \ + hashtab.c hex.c lbasename.c make-temp-file.c md5.c obstack.c \ + partition.c pex-unix.c physmem.c safe-ctype.c splay-tree.c xexit.c \ + xmalloc.c xmemdup.c xstrdup.c xstrerror.c +LIBIBERTY_OBJS= ${LIBIBERTY_SRCS:R:S/$/.o/g} + +SRCS+= ${LIBIBERTY_SRCS} + +${LIBIBERTY_OBJS}: config.h + +${LIBIBERTY}: ${LIBIBERTY_OBJS} + @rm -f ${.TARGET} + @${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q` + ${RANLIB} ${.TARGET} +CLEANFILES+= ${LIBIBERTY} ${LIBIBERTY_OBJS} #----------------------------------------------------------------------- # Fixups. @@ -507,47 +472,25 @@ # Set OBJS the same as bsd.prog.mk would do if we defined PROG. We can't # define PROG because we have multiple programs. # -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} -CLEANFILES+= ${OBJS} +SRCS= dummy-conditions.c errors.c genattr.c genattrtab.c \ + genautomata.c gencheck.c genchecksum.c gencodes.c \ + genconditions.c genconfig.c genconstants.c genemit.c \ + genextract.c genflags.c gengenrtl.c gengtype.c genmodes.c \ + genopinit.c genoutput.c genpeep.c genpreds.c genrecog.c \ + gensupport.c ggc-none.c print-rtl.c read-rtl.c rtl.c varray.c -.if !exists(${DEPENDFILE}) -# Fudge pre-dependfile dependencies of objects in much the same way as -# bsd.prog.mk would do if we defined PROG. +SRCS+= ${GENSRCS} + +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} -${OBJS}: ${COMMONHDRS} +GENOBJS+= ${GENSRCS:N*.h:R:S/$/.o/g} -dummy-conditions.o: -gencheck.o: -genmodes.o: - -genpreds.o: insn-modes.h -genconstants.o: insn-modes.h genrtl.h -gengtype.o: insn-modes.h genrtl.h gtyp-gen.h -rtl.o: insn-modes.h gtype-desc.h genrtl.h -bitmap.o: insn-modes.h gtype-desc.h genrtl.h -ggc-none.o: gtype-desc.h -gensupport.o: insn-modes.h genrtl.h -varray.o: gtype-desc.h -genautomata.o: insn-modes.h genrtl.h -genconditions.o: insn-modes.h genrtl.h -gencodes.o: insn-modes.h genrtl.h -genconfig.o: insn-modes.h genrtl.h -print-rtl.o: insn-modes.h genrtl.h tm-preds.h tree-check.h -read-rtl.o: insn-modes.h genrtl.h -genattr.o: insn-modes.h genrtl.h -genemit.o: insn-modes.h genrtl.h -genflags.o: insn-modes.h genrtl.h -genopinit.o: insn-modes.h genrtl.h -genoutput.o: insn-modes.h genrtl.h -genpeep.o: insn-modes.h genrtl.h -genrecog.o: insn-modes.h genrtl.h -genextract.o: genrtl.h insn-config.h -genattrtab.o: insn-modes.h gtype-desc.h genrtl.h -genrtl.o: insn-modes.h genrtl.h gtype-desc.h - -insn-conditions.o: insn-constants.h tm-preds.h -insn-modes.o: insn-modes.h -min-insn-modes.o: insn-modes.h -gtype-desc.o: insn-modes.h insn-config.h insn-codes.h tree-check.h +CLEANFILES+= ${GENSRCS} ${GENOBJS} ${GNTOOLS} +#----------------------------------------------------------------------- +# Manual dependencies. +.if !exists(${DEPENDFILE}) +.include "Makefile.dep" .endif + +.include Index: gnu/usr.bin/cc/cc_tools/auto-host.h =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v retrieving revision 1.19 diff -u -r1.19 auto-host.h --- gnu/usr.bin/cc/cc_tools/auto-host.h 22 Jul 2006 14:12:02 -0000 1.19 +++ gnu/usr.bin/cc/cc_tools/auto-host.h 8 Oct 2006 02:09:44 -0000 @@ -1,591 +1,1378 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.19 2006/07/22 14:12:02 obrien Exp $ */ - -#ifndef __FreeBSD_version -#include -#include -#endif - /* auto-host.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ -/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ -#define BYTEORDER _BYTE_ORDER - /* Define as the number of bits in a byte, if \`limits.h' doesn't. */ +#ifndef USED_FOR_TARGET /* #undef CHAR_BIT */ +#endif + /* Define 0/1 to force the choice for exception handling model. */ +#ifndef USED_FOR_TARGET /* #undef CONFIG_SJLJ_EXCEPTIONS */ +#endif + /* Define to enable the use of a default assembler. */ +#ifndef USED_FOR_TARGET /* #undef DEFAULT_ASSEMBLER */ +#endif + /* Define to enable the use of a default linker. */ +#ifndef USED_FOR_TARGET /* #undef DEFAULT_LINKER */ +#endif + /* Define if you want to use __cxa_atexit, rather than atexit, to register C++ destructors for local statics and global objects. This is essential for fully standards-compliant handling of destructors, but requires __cxa_atexit in libc. */ +#ifndef USED_FOR_TARGET #define DEFAULT_USE_CXA_ATEXIT 1 +#endif -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -/* #undef ENABLE_NLS */ -#ifdef WANT_COMPILER_INVARIANTS -/* #warning WANT_COMPILER_INVARIANTS turned on */ +/* Define if you want assertions enabled. This is a cheap check. */ +#ifndef USED_FOR_TARGET +#define ENABLE_ASSERT_CHECKING 1 +#endif + /* Define if you want more run-time sanity checks. This one gets a grab bag of miscellaneous but relatively cheap checks. */ -#define ENABLE_CHECKING 1 +#ifndef USED_FOR_TARGET +/* #undef ENABLE_CHECKING */ +#endif + /* Define if you want fold checked that it never destructs its argument. This is quite expensive. */ -#define ENABLE_FOLD_CHECKING 1 +#ifndef USED_FOR_TARGET +/* #undef ENABLE_FOLD_CHECKING */ +#endif + /* Define if you want the garbage collector to operate in maximally paranoid mode, validating the entire heap and collecting garbage at every opportunity. This is extremely expensive. */ -#define ENABLE_GC_ALWAYS_COLLECT 1 +#ifndef USED_FOR_TARGET +/* #undef ENABLE_GC_ALWAYS_COLLECT */ +#endif + /* Define if you want the garbage collector to do object poisoning and other memory allocation checks. This is quite expensive. */ -#define ENABLE_GC_CHECKING 1 +#ifndef USED_FOR_TARGET +/* #undef ENABLE_GC_CHECKING */ +#endif + + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#ifndef USED_FOR_TARGET +/* #undef ENABLE_NLS */ +#endif + /* Define if you want all operations on RTL (the basic data structure of the optimizer and back end) to be checked for dynamic type safety at runtime. This is quite expensive. */ -#define ENABLE_RTL_CHECKING 1 +#ifndef USED_FOR_TARGET +/* #undef ENABLE_RTL_CHECKING */ +#endif + /* Define if you want RTL flag accesses to be checked against the RTL codes that are supported for each access macro. This is relatively cheap. */ -#define ENABLE_RTL_FLAG_CHECKING 1 +#ifndef USED_FOR_TARGET +/* #undef ENABLE_RTL_FLAG_CHECKING */ +#endif + + +/* Define if you want runtime assertions enabled. This is a cheap check. */ +#define ENABLE_RUNTIME_CHECKING 1 /* Define if you want all operations on trees (the basic data structure of the front ends) to be checked for dynamic type safety at runtime. This is - moderately expensive. */ -#define ENABLE_TREE_CHECKING 1 + moderately expensive. The tree browser debugging routines will also be + enabled by this option. */ +#ifndef USED_FOR_TARGET +/* #undef ENABLE_TREE_CHECKING */ +#endif + /* Define if you want to run subprograms and generated programs through valgrind (a memory checker). This is extremely expensive. */ +#ifndef USED_FOR_TARGET /* #undef ENABLE_VALGRIND_CHECKING */ +#endif -#endif /* WANT_COMPILER_INVARIANTS */ -/* Define to 1 if installation paths should be looked up in Windows32 - Registry. Ignored on non windows32 hosts. */ +/* Define to 1 if installation paths should be looked up in the Windows + Registry. Ignored on non-Windows hosts. */ +#ifndef USED_FOR_TARGET /* #undef ENABLE_WIN32_REGISTRY */ +#endif + + +/* Define to the name of a file containing a list of extra machine modes for + this architecture. */ +#ifndef USED_FOR_TARGET +/* #undef EXTRA_MODES_FILE */ +#endif + /* Define to enable detailed memory allocation stats gathering. */ +#ifndef USED_FOR_TARGET /* #undef GATHER_STATISTICS */ +#endif + /* Define to the type of elements in the array set by `getgroups'. Usually this is either `int' or `gid_t'. */ +#ifndef USED_FOR_TARGET #define GETGROUPS_T gid_t +#endif + + +/* Define if the zone collector is in use */ +#ifndef USED_FOR_TARGET +/* #undef GGC_ZONE */ +#endif + /* Define to 1 if you have the `alphasort' function. */ +#ifndef USED_FOR_TARGET #define HAVE_ALPHASORT 1 +#endif + /* Define if your assembler supports dwarf2 .file/.loc directives, and preserves file table indices exactly as given. */ +#ifndef USED_FOR_TARGET #define HAVE_AS_DWARF2_DEBUG_LINE 1 +#endif + /* Define if your assembler supports explicit relocations. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_AS_EXPLICIT_RELOCS */ +#endif + + +/* Define if your assembler supports fprnd. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_AS_FPRND */ +#endif + /* Define if your assembler supports the --gdwarf2 option. */ +#ifndef USED_FOR_TARGET #define HAVE_AS_GDWARF2_DEBUG_FLAG 1 +#endif + /* Define true if the assembler supports '.long foo@GOTOFF'. */ +#ifndef USED_FOR_TARGET #define HAVE_AS_GOTOFF_IN_DATA 1 +#endif + /* Define if your assembler supports the --gstabs option. */ +#ifndef USED_FOR_TARGET #define HAVE_AS_GSTABS_DEBUG_FLAG 1 +#endif + /* Define if your assembler supports the Sun syntax for cmov. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_AS_IX86_CMOV_SUN_SYNTAX */ +#endif + + +/* Define if your assembler supports the lituse_jsrdirect relocation. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_AS_JSRDIRECT_RELOCS */ +#endif + /* Define if your assembler supports .sleb128 and .uleb128. */ +#ifndef USED_FOR_TARGET #define HAVE_AS_LEB128 1 +#endif + /* Define if your assembler supports ltoffx and ldxmov relocations. */ -/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */ +#ifndef USED_FOR_TARGET +#define HAVE_AS_LTOFFX_LDXMOV_RELOCS 1 +#endif + /* Define if your assembler supports mfcr field. */ -/* #undef HAVE_AS_MFCRF */ +#ifndef USED_FOR_TARGET +#define HAVE_AS_MFCRF 1 +#endif + /* Define if your assembler supports the -no-mul-bug-abort option. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION */ +#endif + /* Define if your assembler supports offsetable %lo(). */ -/* #undef HAVE_AS_OFFSETABLE_LO10 */ +#ifndef USED_FOR_TARGET +#define HAVE_AS_OFFSETABLE_LO10 1 +#endif + + +/* Define if your assembler supports popcntb field. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_AS_POPCNTB */ +#endif + /* Define if your assembler supports .register. */ -/* #undef HAVE_AS_REGISTER_PSEUDO_OP */ +#ifndef USED_FOR_TARGET +#define HAVE_AS_REGISTER_PSEUDO_OP 1 +#endif + + +/* Define if your assembler supports R_PPC_REL16 relocs. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_AS_REL16 */ +#endif + /* Define if your assembler supports -relax option. */ -/* #undef HAVE_AS_RELAX_OPTION */ +#ifndef USED_FOR_TARGET +# ifdef __sparc64__ +# define HAVE_AS_RELAX_OPTION 1 +# endif +#endif + /* Define if your assembler and linker support unaligned PC relative relocs. */ -/* #undef HAVE_AS_SPARC_UA_PCREL */ +#ifndef USED_FOR_TARGET +#define HAVE_AS_SPARC_UA_PCREL 1 +#endif + /* Define if your assembler and linker support unaligned PC relative relocs against hidden symbols. */ -/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */ +#ifndef USED_FOR_TARGET +#define HAVE_AS_SPARC_UA_PCREL_HIDDEN 1 +#endif + /* Define if your assembler supports thread-local storage. */ +#ifndef USED_FOR_TARGET #define HAVE_AS_TLS 1 +#endif + /* Define to 1 if you have the `atoll' function. */ -#if __FreeBSD_version >= 500027 +#ifndef USED_FOR_TARGET #define HAVE_ATOLL 1 #endif + /* Define to 1 if you have the `atoq' function. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_ATOQ */ +#endif + + +/* Define to 1 if you have the `clearerr_unlocked' function. */ +#ifndef USED_FOR_TARGET +#define HAVE_CLEARERR_UNLOCKED 1 +#endif + /* Define to 1 if you have the `clock' function. */ +#ifndef USED_FOR_TARGET #define HAVE_CLOCK 1 +#endif + /* Define if defines clock_t. */ +#ifndef USED_FOR_TARGET #define HAVE_CLOCK_T 1 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define 0/1 if your assembler and linker support COMDAT groups. */ +#ifndef USED_FOR_TARGET +#define HAVE_COMDAT_GROUP 0 +#endif + + +/* Define to 1 if we found a declaration for 'abort', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_ABORT 1 +#endif + + +/* Define to 1 if we found a declaration for 'asprintf', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_ASPRINTF 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'atof', otherwise define to 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_ATOF 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'atol', otherwise define to 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_ATOL 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'basename', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_BASENAME 0 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'calloc', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_CALLOC 1 +#endif + + +/* Define to 1 if we found a declaration for 'clearerr_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_CLEARERR_UNLOCKED 1 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'clock', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_CLOCK 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'errno', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_ERRNO 1 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'feof_unlocked', otherwise define + to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_FEOF_UNLOCKED 1 +#endif + + +/* Define to 1 if we found a declaration for 'ferror_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_FERROR_UNLOCKED 1 +#endif + + +/* Define to 1 if we found a declaration for 'fflush_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_FFLUSH_UNLOCKED 0 +#endif + + +/* Define to 1 if we found a declaration for 'fgetc_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_FGETC_UNLOCKED 0 +#endif + + +/* Define to 1 if we found a declaration for 'fgets_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_FGETS_UNLOCKED 0 +#endif + + +/* Define to 1 if we found a declaration for 'fileno_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_FILENO_UNLOCKED 1 +#endif + + +/* Define to 1 if we found a declaration for 'fprintf_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_FPRINTF_UNLOCKED 0 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'fputc_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_FPUTC_UNLOCKED 0 +#endif + + +/* Define to 1 if we found a declaration for 'fputs_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_FPUTS_UNLOCKED 0 +#endif + + +/* Define to 1 if we found a declaration for 'fread_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_FREAD_UNLOCKED 0 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'free', otherwise define to 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_FREE 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'fwrite_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_FWRITE_UNLOCKED 0 +#endif + + +/* Define to 1 if we found a declaration for 'getchar_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_GETCHAR_UNLOCKED 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'getcwd', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_GETCWD 1 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'getc_unlocked', otherwise define + to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_GETC_UNLOCKED 1 +#endif + + +/* Define to 1 if we found a declaration for 'getenv', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_GETENV 1 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'getopt', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_GETOPT 1 +#endif + + +/* Define to 1 if we found a declaration for 'getpagesize', otherwise define + to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_GETPAGESIZE 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'getrlimit', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_GETRLIMIT 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'getrusage', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_GETRUSAGE 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'getwd', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_GETWD 1 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'ldgetname', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_LDGETNAME 0 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'malloc', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_MALLOC 1 +#endif + + +/* Define to 1 if we found a declaration for 'putchar_unlocked', otherwise + define to 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_PUTCHAR_UNLOCKED 1 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'putc_unlocked', otherwise define + to 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_PUTC_UNLOCKED 1 +#endif + -/* Define to 1 if we found this declaration otherwise define to 0. */ +/* Define to 1 if we found a declaration for 'realloc', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_REALLOC 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'sbrk', otherwise define to 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_SBRK 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'setrlimit', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_SETRLIMIT 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'snprintf', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_SNPRINTF 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'strsignal', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_STRSIGNAL 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'strstr', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_STRSTR 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'strverscmp', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_STRVERSCMP 0 +#endif + + +/* Define to 1 if we found a declaration for 'times', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_TIMES 1 +#endif -/* Define to 1 if we found this declaration otherwise define to 0. */ + +/* Define to 1 if we found a declaration for 'vasprintf', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET #define HAVE_DECL_VASPRINTF 1 +#endif + + +/* Define to 1 if we found a declaration for 'vsnprintf', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET +#define HAVE_DECL_VSNPRINTF 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_DIRECT_H */ +#endif -/* Define to 1 if you have the `dup2' function. */ -#define HAVE_DUP2 1 /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_FCNTL_H 1 +#endif + + +/* Define to 1 if you have the `feof_unlocked' function. */ +#ifndef USED_FOR_TARGET +#define HAVE_FEOF_UNLOCKED 1 +#endif + + +/* Define to 1 if you have the `ferror_unlocked' function. */ +#ifndef USED_FOR_TARGET +#define HAVE_FERROR_UNLOCKED 1 +#endif + + +/* Define to 1 if you have the `fflush_unlocked' function. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_FFLUSH_UNLOCKED */ +#endif + + +/* Define to 1 if you have the `fgetc_unlocked' function. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_FGETC_UNLOCKED */ +#endif + + +/* Define to 1 if you have the `fgets_unlocked' function. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_FGETS_UNLOCKED */ +#endif + + +/* Define to 1 if you have the `fileno_unlocked' function. */ +#ifndef USED_FOR_TARGET +#define HAVE_FILENO_UNLOCKED 1 +#endif + /* Define to 1 if you have the `fork' function. */ +#ifndef USED_FOR_TARGET #define HAVE_FORK 1 +#endif + /* Define to 1 if you have the `fprintf_unlocked' function. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_FPRINTF_UNLOCKED */ +#endif + /* Define to 1 if you have the `fputc_unlocked' function. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_FPUTC_UNLOCKED */ +#endif + /* Define to 1 if you have the `fputs_unlocked' function. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_FPUTS_UNLOCKED */ +#endif + + +/* Define to 1 if you have the `fread_unlocked' function. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_FREAD_UNLOCKED */ +#endif + /* Define to 1 if you have the `fwrite_unlocked' function. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_FWRITE_UNLOCKED */ +#endif + /* Define if your assembler supports .balign and .p2align. */ +#ifndef USED_FOR_TARGET #define HAVE_GAS_BALIGN_AND_P2ALIGN 1 +#endif + /* Define if your assembler uses the new HImode fild and fist notation. */ +#ifndef USED_FOR_TARGET #define HAVE_GAS_FILDS_FISTS 1 +#endif + /* Define if your assembler and linker support .hidden. */ #define HAVE_GAS_HIDDEN 1 /* Define if your assembler supports specifying the maximum number of bytes to skip when using the GAS .p2align command. */ +#ifndef USED_FOR_TARGET #define HAVE_GAS_MAX_SKIP_P2ALIGN 1 +#endif + + +/* Define if your assembler supports .nsubspa comdat option. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_GAS_NSUBSPA_COMDAT */ +#endif + + +/* Define if your assembler and linker support 32-bit section relative relocs + via '.secrel32 label'. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_GAS_PE_SECREL32_RELOC */ +#endif + /* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag. */ +#ifndef USED_FOR_TARGET #define HAVE_GAS_SHF_MERGE 1 +#endif + /* Define if your assembler supports .subsection and .subsection -1 starts emitting at the beginning of your section. */ +#ifndef USED_FOR_TARGET #define HAVE_GAS_SUBSECTION_ORDERING 1 +#endif + /* Define if your assembler supports .weak. */ +#ifndef USED_FOR_TARGET #define HAVE_GAS_WEAK 1 +#endif + + +/* Define if your assembler supports .weakref. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_GAS_WEAKREF */ +#endif + + +/* Define to 1 if you have the `getchar_unlocked' function. */ +#ifndef USED_FOR_TARGET +#define HAVE_GETCHAR_UNLOCKED 1 +#endif + + +/* Define to 1 if you have the `getc_unlocked' function. */ +#ifndef USED_FOR_TARGET +#define HAVE_GETC_UNLOCKED 1 +#endif + /* Define to 1 if you have the `getrlimit' function. */ +#ifndef USED_FOR_TARGET #define HAVE_GETRLIMIT 1 +#endif + /* Define to 1 if you have the `getrusage' function. */ +#ifndef USED_FOR_TARGET #define HAVE_GETRUSAGE 1 +#endif + /* Define to 1 if you have the `gettimeofday' function. */ +#ifndef USED_FOR_TARGET #define HAVE_GETTIMEOFDAY 1 +#endif + /* Define if you have the iconv() function. */ -/* #undef HAVE_ICONV */ +#ifndef USED_FOR_TARGET +#define HAVE_ICONV 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_ICONV_H */ +#endif + /* Define .init_array/.fini_array sections are available and working. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_INITFINI_ARRAY */ +#endif + /* Define if you have a working header file. */ +#ifndef USED_FOR_TARGET #define HAVE_INTTYPES_H 1 +#endif + /* Define to 1 if you have the `kill' function. */ +#ifndef USED_FOR_TARGET #define HAVE_KILL 1 +#endif + + +/* Define if you have and nl_langinfo(CODESET). */ +#ifndef USED_FOR_TARGET +#define HAVE_LANGINFO_CODESET 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_LANGINFO_H 1 +#endif + /* Define if your file defines LC_MESSAGES. */ +#ifndef USED_FOR_TARGET #define HAVE_LC_MESSAGES 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_LDFCN_H */ +#endif + /* Define if your linker supports --as-needed and --no-as-needed options. */ -/* #undef HAVE_LD_AS_NEEDED */ +#ifndef USED_FOR_TARGET +#define HAVE_LD_AS_NEEDED 1 +#endif + + +/* Define if your linker supports --demangle option. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_LD_DEMANGLE */ +#endif + /* Define if your linker supports --eh-frame-hdr option. */ #define HAVE_LD_EH_FRAME_HDR 1 +/* Define if your PowerPC64 linker only needs function descriptor syms. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_LD_NO_DOT_SYMS */ +#endif + + /* Define if your linker supports -pie option. */ -/* #undef HAVE_LD_PIE */ +#ifndef USED_FOR_TARGET +#define HAVE_LD_PIE 1 +#endif + /* Define if your linker links a mix of read-only and read-write sections into a read-write section. */ +#ifndef USED_FOR_TARGET #define HAVE_LD_RO_RW_SECTION_MIXING 1 +#endif + + +/* Define if your linker supports -Bstatic/-Bdynamic option. */ +#ifndef USED_FOR_TARGET +#define HAVE_LD_STATIC_DYNAMIC 1 +#endif + + +/* Define if your linker supports --sysroot. */ +#ifndef USED_FOR_TARGET +/* #undef HAVE_LD_SYSROOT */ +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_LIMITS_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_LOCALE_H 1 +#endif -/* Define if your compiler supports the \`long long' type. */ + +/* Define to 1 if the system has the type `long long'. */ +#ifndef USED_FOR_TARGET #define HAVE_LONG_LONG 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_MALLOC_H */ +#endif + /* Define to 1 if you have the `mbstowcs' function. */ +#ifndef USED_FOR_TARGET #define HAVE_MBSTOWCS 1 +#endif + /* Define if valgrind's memcheck.h header is installed. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_MEMCHECK_H */ +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_MEMORY_H 1 +#endif + /* Define to 1 if you have the `mincore' function. */ +#ifndef USED_FOR_TARGET #define HAVE_MINCORE 1 +#endif + /* Define to 1 if you have the `mmap' function. */ +#ifndef USED_FOR_TARGET #define HAVE_MMAP 1 +#endif + /* Define if mmap with MAP_ANON(YMOUS) works. */ +#ifndef USED_FOR_TARGET #define HAVE_MMAP_ANON 1 +#endif + /* Define if mmap of /dev/zero works. */ +#ifndef USED_FOR_TARGET #define HAVE_MMAP_DEV_ZERO 1 +#endif + /* Define if read-only mmap of a plain file works. */ +#ifndef USED_FOR_TARGET #define HAVE_MMAP_FILE 1 +#endif + /* Define to 1 if you have the `nl_langinfo' function. */ +#ifndef USED_FOR_TARGET #define HAVE_NL_LANGINFO 1 +#endif + + +/* Define to 1 if you have the `putchar_unlocked' function. */ +#ifndef USED_FOR_TARGET +#define HAVE_PUTCHAR_UNLOCKED 1 +#endif -/* Define if printf supports "%p". */ -#define HAVE_PRINTF_PTR 1 /* Define to 1 if you have the `putc_unlocked' function. */ +#ifndef USED_FOR_TARGET #define HAVE_PUTC_UNLOCKED 1 +#endif + /* Define to 1 if you have the `scandir' function. */ +#ifndef USED_FOR_TARGET #define HAVE_SCANDIR 1 +#endif + /* Define to 1 if you have the `setlocale' function. */ +#ifndef USED_FOR_TARGET #define HAVE_SETLOCALE 1 +#endif + /* Define to 1 if you have the `setrlimit' function. */ +#ifndef USED_FOR_TARGET #define HAVE_SETRLIMIT 1 - -/* Define if you have a working header file. */ -#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \ - __FreeBSD_version >= 500014 -#define HAVE_STDBOOL_H 1 #endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_STDDEF_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_STDINT_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_STDLIB_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_STRINGS_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_STRING_H 1 +#endif + /* Define to 1 if you have the `strsignal' function. */ +#ifndef USED_FOR_TARGET #define HAVE_STRSIGNAL 1 +#endif + /* Define if defines struct tms. */ +#ifndef USED_FOR_TARGET #define HAVE_STRUCT_TMS 1 +#endif + /* Define to 1 if you have the `sysconf' function. */ +#ifndef USED_FOR_TARGET #define HAVE_SYSCONF 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_FILE_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_MMAN_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_PARAM_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_RESOURCE_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_STAT_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_TIMES_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_TIME_H 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_TYPES_H 1 +#endif + /* Define to 1 if you have that is POSIX.1 compatible. */ +#ifndef USED_FOR_TARGET #define HAVE_SYS_WAIT_H 1 +#endif + /* Define to 1 if you have the `times' function. */ +#ifndef USED_FOR_TARGET #define HAVE_TIMES 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_TIME_H 1 +#endif -/* Define if defines \`uchar'. */ -/* #undef HAVE_UCHAR */ /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_UNISTD_H 1 +#endif + /* Define if valgrind's valgrind/memcheck.h header is installed. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_VALGRIND_MEMCHECK_H */ +#endif + /* Define to 1 if you have the `vfork' function. */ +#ifndef USED_FOR_TARGET #define HAVE_VFORK 1 +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET /* #undef HAVE_VFORK_H */ +#endif + /* Define to 1 if you have the header file. */ +#ifndef USED_FOR_TARGET #define HAVE_WCHAR_H 1 +#endif + /* Define to 1 if you have the `wcswidth' function. */ +#ifndef USED_FOR_TARGET #define HAVE_WCSWIDTH 1 +#endif + /* Define to 1 if `fork' works. */ +#ifndef USED_FOR_TARGET #define HAVE_WORKING_FORK 1 +#endif + /* Define this macro if mbstowcs does not crash when its first argument is NULL. */ +#ifndef USED_FOR_TARGET #define HAVE_WORKING_MBSTOWCS 1 +#endif + /* Define to 1 if `vfork' works. */ +#ifndef USED_FOR_TARGET #define HAVE_WORKING_VFORK 1 +#endif -/* Define if the \`_Bool' type is built-in. */ -#define HAVE__BOOL 1 -/* Define if your compiler supports the \`__int64' type. */ +/* Define to 1 if the system has the type `__int64'. */ +#ifndef USED_FOR_TARGET /* #undef HAVE___INT64 */ - -/* Define if the host machine stores words of multi-word integers in - big-endian order. */ -#if _QUAD_HIGHWORD == 0 -#define HOST_WORDS_BIG_ENDIAN 1 #endif + /* Define as const if the declaration of iconv() needs const. */ -/* #undef ICONV_CONST */ +#ifndef USED_FOR_TARGET +#define ICONV_CONST const +#endif + /* Define if host mkdir takes a single argument. */ +#ifndef USED_FOR_TARGET /* #undef MKDIR_TAKES_ONE_ARG */ +#endif + /* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */ +#ifndef USED_FOR_TARGET #define NEED_64BIT_HOST_WIDE_INT 1 +#endif + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#ifndef USED_FOR_TARGET /* #undef NO_MINUS_C_MINUS_O */ +#endif + /* Define to the address where bug reports for this package should be sent. */ +#ifndef USED_FOR_TARGET #define PACKAGE_BUGREPORT "" +#endif + /* Define to the full name of this package. */ +#ifndef USED_FOR_TARGET #define PACKAGE_NAME "" +#endif + /* Define to the full name and version of this package. */ +#ifndef USED_FOR_TARGET #define PACKAGE_STRING "" +#endif + /* Define to the one symbol short name of this package. */ +#ifndef USED_FOR_TARGET #define PACKAGE_TARNAME "" +#endif + /* Define to the version of this package. */ +#ifndef USED_FOR_TARGET #define PACKAGE_VERSION "" +#endif + /* Define to PREFIX/include if cpp should also search that directory. */ +#ifndef USED_FOR_TARGET /* #undef PREFIX_INCLUDE_DIR */ +#endif -/* The number of bytes in type int */ + +/* The size of a `int', as computed by sizeof. */ +#ifndef USED_FOR_TARGET #define SIZEOF_INT 4 +#endif -#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) -/* The number of bytes in type long */ -# define SIZEOF_LONG SIZEOF_INT -#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__) -# define SIZEOF_LONG SIZEOF_LONG_LONG -#else -# error "I don't know what arch this is." + +/* The size of a `long', as computed by sizeof. */ +#ifndef USED_FOR_TARGET +#define SIZEOF_LONG 4 #endif -/* The number of bytes in type long long */ + +/* The size of a `long long', as computed by sizeof. */ +#ifndef USED_FOR_TARGET #define SIZEOF_LONG_LONG 8 +#endif + -/* The number of bytes in type short */ +/* The size of a `short', as computed by sizeof. */ +#ifndef USED_FOR_TARGET #define SIZEOF_SHORT 2 +#endif + + +/* The size of a `void *', as computed by sizeof. */ +#ifndef USED_FOR_TARGET +#define SIZEOF_VOID_P 4 +#endif -/* The number of bytes in type void * */ -#define SIZEOF_VOID_P SIZEOF_LONG -/* The number of bytes in type __int64 */ +/* The size of a `__int64', as computed by sizeof. */ +#ifndef USED_FOR_TARGET /* #undef SIZEOF___INT64 */ +#endif + /* Define to 1 if you have the ANSI C header files. */ +#ifndef USED_FOR_TARGET #define STDC_HEADERS 1 +#endif + /* Define if you can safely include both and . */ +#ifndef USED_FOR_TARGET #define STRING_WITH_STRINGS 1 +#endif + + +/* Define if your target C library provides stack protector support */ +#ifndef USED_FOR_TARGET +/* #undef TARGET_LIBC_PROVIDES_SSP */ +#endif + /* Define to 1 if you can safely include both and . */ +#ifndef USED_FOR_TARGET #define TIME_WITH_SYS_TIME 1 +#endif + /* Define if your assembler mis-optimizes .eh_frame data. */ +#ifndef USED_FOR_TARGET /* #undef USE_AS_TRADITIONAL_FORMAT */ +#endif + + +/* Define to 1 if the 'long long' (or '__int64') is wider than 'long' but + still efficiently supported by the host hardware. */ +#ifndef USED_FOR_TARGET +/* #undef USE_LONG_LONG_FOR_WIDEST_FAST_INT */ +#endif -/* Define if gcc should use -lunwind. */ -/* #undef USE_LIBUNWIND_EXCEPTIONS */ -/* Define to be the last portion of registry key on windows hosts. */ +/* Define if location_t is fileline integer cookie. */ +#ifndef USED_FOR_TARGET +/* #undef USE_MAPPED_LOCATION */ +#endif + + +/* Define to be the last component of the Windows registry key under which to + look for installation paths. The full key used will be + HKEY_LOCAL_MACHINE/SOFTWARE/Free Software Foundation/{WIN32_REGISTRY_KEY}. + The default is the GCC version number. */ +#ifndef USED_FOR_TARGET /* #undef WIN32_REGISTRY_KEY */ +#endif -/* whether byteorder is bigendian */ + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#ifndef USED_FOR_TARGET /* #undef WORDS_BIGENDIAN */ +#endif + /* Always define this when using the GNU C Library */ +#ifndef USED_FOR_TARGET /* #undef _GNU_SOURCE */ +#endif + /* Define to `int' if doesn't define. */ +#ifndef USED_FOR_TARGET /* #undef gid_t */ +#endif + -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus /* #undef inline */ +#endif /* Define to `int' if does not define. */ +#ifndef USED_FOR_TARGET /* #undef pid_t */ +#endif + /* Define to \`long' if doesn't define. */ +#ifndef USED_FOR_TARGET /* #undef rlim_t */ +#endif + /* Define to `int' if does not define. */ +#ifndef USED_FOR_TARGET /* #undef ssize_t */ +#endif + /* Define to `int' if doesn't define. */ +#ifndef USED_FOR_TARGET /* #undef uid_t */ +#endif + /* Define as `fork' if `vfork' does not work. */ +#ifndef USED_FOR_TARGET /* #undef vfork */ +#endif + +/* Override SIZEOF_?? using proper values. */ +#include Index: gnu/usr.bin/cc/cc_tools/freebsd-native.h =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v retrieving revision 1.27 diff -u -r1.27 freebsd-native.h --- gnu/usr.bin/cc/cc_tools/freebsd-native.h 21 Sep 2006 03:27:07 -0000 1.27 +++ gnu/usr.bin/cc/cc_tools/freebsd-native.h 22 Sep 2006 16:50:21 -0000 @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.27 2006/09/21 03:27:07 kan Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.26 2005/10/30 19:04:47 obrien Exp $ */ /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD source tree so it can be configured appropriately without using @@ -8,15 +8,19 @@ /* Fake out gcc/config/freebsd.h. */ #define FBSD_MAJOR 7 -#define FBSD_CC_VER 700002 /* form like __FreeBSD_version */ +#define FBSD_CC_VER 700003 /* form like __FreeBSD_version */ #undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ #undef TOOL_INCLUDE_DIR /* We don't need one for now. */ #undef LOCAL_INCLUDE_DIR /* We don't wish to support one. */ /* Look for the include files in the system-defined places. */ +#define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/c++/4.1" +#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/4.1/backward" +#if XXXKAN #define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/c++/3.4" #define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/3.4/backward" +#endif #define GCC_INCLUDE_DIR PREFIX"/include" #ifdef CROSS_COMPILE #define CROSS_INCLUDE_DIR PREFIX"/include" @@ -28,9 +32,9 @@ /usr/libexec directory. ``cc --print-search-dirs'' gives: - install: STANDARD_EXEC_PREFIX/(null) - programs: /usr/libexec//:STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX - libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX + install: STANDARD_EXEC_PREFIX/ + programs: STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX + libraries: STANDARD_STARTFILE_PREFIX */ #undef STANDARD_BINDIR_PREFIX /* We don't need one for now. */ #define STANDARD_EXEC_PREFIX PREFIX"/libexec/" @@ -46,20 +50,34 @@ #define STANDARD_STARTFILE_PREFIX PREFIX"/lib/" #define STARTFILE_PREFIX_SPEC PREFIX"/lib/" -/* For the native system compiler, we actually build libgcc in a profiled - version. So we should use it with -pg. */ +#if 0 #define LIBGCC_SPEC "%{shared: -lgcc_pic} \ %{!shared: %{!pg: -lgcc} %{pg: -lgcc_p}}" +#endif #define LIBSTDCXX_PROFILE "-lstdc++_p" #define MATH_LIBRARY_PROFILE "-lm_p" #define FORTRAN_LIBRARY_PROFILE "-lg2c_p" +#if 1 +#define LIBGCC_SPEC "-lgcc" +/* For the native system compiler, we actually build libgcc in a profiled + version. So we should use it with -pg. */ +#define LIBGCC_STATIC_LIB_SPEC " \ + %{!shared: \ + %{!pg: -lgcc} \ + %{pg: -lgcc_p}} \ + %{shared: -lgcc} \ +" +#define LIBGCC_EH_STATIC_LIB_SPEC " \ + %{!shared: \ + %{!pg: -lgcc_eh} \ + %{pg: -lgcc_eh_p}} \ + %{shared: -lgcc_eh} \ +" +#else +#define LIBGCC_STATIC_LIB_SPEC "-lgcc" +#define LIBGCC_EH_STATIC_LIB_SPEC "-lgcc_eh" +#endif + /* FreeBSD is 4.4BSD derived */ #define bsd4_4 - -/* And now they want to replace ctype.h.... grr... [stupid, IMHO] */ -#define xxxISDIGIT isdigit -#define xxxISGRAPH isgraph -#define xxxISLOWER islower -#define xxxISSPACE isspace -#define xxxTOUPPER toupper Index: gnu/usr.bin/cc/cpp/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cpp/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- gnu/usr.bin/cc/cpp/Makefile 21 Sep 2006 07:52:41 -0000 1.26 +++ gnu/usr.bin/cc/cpp/Makefile 25 Sep 2006 15:40:52 -0000 @@ -1,14 +1,20 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.26 2006/09/21 07:52:41 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.24 2004/02/05 22:44:21 ru Exp $ .include "../Makefile.inc" .include "../Makefile.fe" -.PATH: ${GCCDIR} ${GCCDIR}/doc +.PATH: ${GCCDIR} PROG= cpp SRCS= gcc.c cppspec.c +NO_MAN= -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} +DPADD= ${LIBBACKEND} ${LIBIBERTY} +LDADD= ${LIBBACKEND} ${LIBIBERTY} + +CLEANFILES= cpp.1 + +cpp.1: cccp.1 + cat ${.ALLSRC} > ${.TARGET} .include Index: gnu/usr.bin/cc/doc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/doc/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- gnu/usr.bin/cc/doc/Makefile 28 Jul 2004 05:27:20 -0000 1.13 +++ gnu/usr.bin/cc/doc/Makefile 25 Sep 2006 21:36:21 -0000 @@ -1,6 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/cc/doc/Makefile,v 1.13 2004/07/28 05:27:20 kan Exp $ .include "../Makefile.inc" +.include "../Makefile.ver" .PATH: ${GCCDIR}/doc @@ -16,17 +17,28 @@ invoke.texi extend.texi md.texi objc.texi gcov.texi trouble.texi \ bugreport.texi service.texi contribute.texi compat.texi \ include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \ - contrib.texi cppenv.texi cppopts.texi + contrib.texi cppenv.texi cppopts.texi gcc-vers.texi gccint.info: gccint.texi include/gcc-common.texi contribute.texi \ makefile.texi configterms.texi portability.texi interface.texi \ passes.texi c-tree.texi rtl.texi md.texi tm.texi hostconfig.texi \ fragments.texi configfiles.texi collect2.texi headerdirs.texi \ include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \ - contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi + contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi \ + gcc-vers.texi cpp.info: cpp.texi include/fdl.texi cppenv.texi cppopts.texi MAKEINFOFLAGS+= -I ${GCCDIR}/doc -I ${GCCDIR}/doc/include +gcc-vers.texi: + (echo "@set version-GCC $(BASEVER)"; \ + if [ "$(DEVPHASE)" = "experimental" ]; then \ + echo "@set DEVELOPMENT"; \ + else \ + echo "@clear DEVELOPMENT"; \ + fi) > ${.TARGET} + +CLEANFILES+= gcc-vers.texi + .include Index: gnu/usr.bin/cc/gcov/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/gcov/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- gnu/usr.bin/cc/gcov/Makefile 28 Jul 2004 05:27:20 -0000 1.4 +++ gnu/usr.bin/cc/gcov/Makefile 25 Sep 2006 18:22:28 -0000 @@ -1,13 +1,20 @@ # $FreeBSD: src/gnu/usr.bin/cc/gcov/Makefile,v 1.4 2004/07/28 05:27:20 kan Exp $ .include "../Makefile.inc" +.include "../Makefile.ver" .PATH: ${GCCDIR} ${GCCDIR}/doc PROG= gcov -SRCS= gcov.c version.c +SRCS= gcov.c version.c errors.c +NO_MAN= -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} +DPADD= ${LIBIBERTY} +LDADD= ${LIBIBERTY} + +version.o: version.c + ${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \ + -DDATESTAMP=\"\ ${DATESTAMP}\" \ + -DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC} .include Index: gnu/usr.bin/gdb/kgdb/kgdb.h =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/gdb/kgdb/kgdb.h,v retrieving revision 1.3 diff -u -r1.3 kgdb.h --- gnu/usr.bin/gdb/kgdb/kgdb.h 10 Sep 2005 18:25:53 -0000 1.3 +++ gnu/usr.bin/gdb/kgdb/kgdb.h 11 Oct 2006 23:48:18 -0000 @@ -32,7 +32,6 @@ struct thread_info; extern kvm_t *kvm; -extern int verbose; struct kthr { struct kthr *next; Index: include/nsswitch.h =================================================================== RCS file: /home/ncvs/src/include/nsswitch.h,v retrieving revision 1.4 diff -u -r1.4 nsswitch.h --- include/nsswitch.h 28 Apr 2006 12:03:34 -0000 1.4 +++ include/nsswitch.h 14 Sep 2006 18:29:31 -0000 @@ -208,7 +208,7 @@ typedef struct _ns_dbt { const char *name; /* name of database */ ns_src *srclist; /* list of sources */ - int srclistsize; /* size of srclist */ + unsigned int srclistsize; /* size of srclist */ } ns_dbt; /* Index: kerberos5/tools/make-print-version/Makefile =================================================================== RCS file: /home/ncvs/src/kerberos5/tools/make-print-version/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- kerberos5/tools/make-print-version/Makefile 21 Dec 2004 08:47:02 -0000 1.2 +++ kerberos5/tools/make-print-version/Makefile 21 Sep 2006 19:36:26 -0000 @@ -3,6 +3,7 @@ PROG= make-print-version NO_MAN= +CFLAGS+= -v .include .PATH: ${KRB5DIR}/lib/vers Index: lib/libc/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libc/Makefile,v retrieving revision 1.68 diff -u -r1.68 Makefile --- lib/libc/Makefile 22 Aug 2006 07:55:13 -0000 1.68 +++ lib/libc/Makefile 25 Sep 2006 20:19:03 -0000 @@ -19,6 +19,7 @@ CLEANFILES+=tags INSTALL_PIC_ARCHIVE= PRECIOUSLIB= +LDFLAGS+= -nodefaultlibs -lgcc_s # Define (empty) variables so that make doesn't give substitution # errors if the included makefiles don't change these: Index: lib/libc/gen/arc4random.c =================================================================== RCS file: /home/ncvs/src/lib/libc/gen/arc4random.c,v retrieving revision 1.11 diff -u -r1.11 arc4random.c --- lib/libc/gen/arc4random.c 4 Oct 2006 01:17:23 -0000 1.11 +++ lib/libc/gen/arc4random.c 6 Oct 2006 01:35:39 -0000 @@ -118,7 +118,7 @@ /* fd < 0? Ah, what the heck. We'll just take whatever was on the * stack... */ - arc4_addrandom(as, (void *) &rdat, sizeof(rdat)); + arc4_addrandom(as, (u_char *) &rdat, sizeof(rdat)); /* * Throw away the first N bytes of output, as suggested in the Index: lib/libc/gmon/mcount.c =================================================================== RCS file: /home/ncvs/src/lib/libc/gmon/mcount.c,v retrieving revision 1.21 diff -u -r1.21 mcount.c --- lib/libc/gmon/mcount.c 6 May 2005 07:37:01 -0000 1.21 +++ lib/libc/gmon/mcount.c 14 Sep 2006 18:12:16 -0000 @@ -93,7 +93,8 @@ #ifdef _KERNEL MCOUNT_ENTER(s); #else - if (!atomic_cmpset_acq_int(&p->state, GMON_PROF_ON, GMON_PROF_BUSY)) + if (!atomic_cmpset_acq_int((u_int *)&p->state, GMON_PROF_ON, + GMON_PROF_BUSY)) return; #endif frompci = frompc - p->lowpc; @@ -262,11 +263,11 @@ #ifdef _KERNEL MCOUNT_EXIT(s); #else - atomic_store_rel_int(&p->state, GMON_PROF_ON); + atomic_store_rel_int((u_int *)&p->state, GMON_PROF_ON); #endif return; overflow: - atomic_store_rel_int(&p->state, GMON_PROF_ERROR); + atomic_store_rel_int((u_int *)&p->state, GMON_PROF_ERROR); #ifdef _KERNEL MCOUNT_EXIT(s); #endif Index: lib/libc/inet/inet_net_ntop.c =================================================================== RCS file: /home/ncvs/src/lib/libc/inet/inet_net_ntop.c,v retrieving revision 1.2 diff -u -r1.2 inet_net_ntop.c --- lib/libc/inet/inet_net_ntop.c 21 Mar 2006 15:37:15 -0000 1.2 +++ lib/libc/inet/inet_net_ntop.c 14 Sep 2006 18:13:45 -0000 @@ -266,7 +266,7 @@ } } /* Format CIDR /width. */ - SPRINTF((cp, "/%u", bits)); + (void)SPRINTF((cp, "/%u", bits)); if (strlen(outbuf) + 1 > size) goto emsgsize; strcpy(dst, outbuf); Index: lib/libc/locale/collate.c =================================================================== RCS file: /home/ncvs/src/lib/libc/locale/collate.c,v retrieving revision 1.35 diff -u -r1.35 collate.c --- lib/libc/locale/collate.c 27 Feb 2005 20:31:13 -0000 1.35 +++ lib/libc/locale/collate.c 14 Sep 2006 19:17:20 -0000 @@ -47,7 +47,7 @@ int __collate_load_error = 1; int __collate_substitute_nontrivial; -u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; +char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; struct __collate_st_chain_pri *__collate_chain_pri_table; @@ -200,12 +200,12 @@ return (_LDP_LOADED); } -u_char * -__collate_substitute(const u_char *s) +char * +__collate_substitute(const char *s) { int dest_len, len, nlen; int delta = strlen(s); - u_char *dest_str = NULL; + char *dest_str = NULL; if (s == NULL || *s == '\0') return (__collate_strdup("")); @@ -215,20 +215,21 @@ __collate_err(EX_OSERR, __func__); len = 0; while (*s) { - nlen = len + strlen(__collate_substitute_table[*s]); + nlen = len + strlen(__collate_substitute_table[(u_char)*s]); if (dest_len <= nlen) { dest_str = reallocf(dest_str, dest_len = nlen + delta); if (dest_str == NULL) __collate_err(EX_OSERR, __func__); } - (void)strcpy(dest_str + len, __collate_substitute_table[*s++]); + (void)strcpy(dest_str + len, + __collate_substitute_table[(u_char)*s++]); len = nlen; } return (dest_str); } void -__collate_lookup(const u_char *t, int *len, int *prim, int *sec) +__collate_lookup(const char *t, int *len, int *prim, int *sec) { struct __collate_st_chain_pri *p2; @@ -243,14 +244,14 @@ return; } } - *prim = __collate_char_pri_table[*t].prim; - *sec = __collate_char_pri_table[*t].sec; + *prim = __collate_char_pri_table[(u_char)*t].prim; + *sec = __collate_char_pri_table[(u_char)*t].sec; } -u_char * -__collate_strdup(u_char *s) +char * +__collate_strdup(char *s) { - u_char *t = strdup(s); + char *t = strdup(s); if (t == NULL) __collate_err(EX_OSERR, __func__); Index: lib/libc/locale/collate.h =================================================================== RCS file: /home/ncvs/src/lib/libc/locale/collate.h,v retrieving revision 1.15 diff -u -r1.15 collate.h --- lib/libc/locale/collate.h 27 Feb 2005 20:31:13 -0000 1.15 +++ lib/libc/locale/collate.h 14 Sep 2006 19:16:10 -0000 @@ -43,23 +43,23 @@ int prim, sec; }; struct __collate_st_chain_pri { - u_char str[STR_LEN]; + char str[STR_LEN]; int prim, sec; }; extern int __collate_load_error; extern int __collate_substitute_nontrivial; #define __collate_substitute_table (*__collate_substitute_table_ptr) -extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; +extern char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; #define __collate_char_pri_table (*__collate_char_pri_table_ptr) extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; extern struct __collate_st_chain_pri *__collate_chain_pri_table; __BEGIN_DECLS -u_char *__collate_strdup(u_char *); -u_char *__collate_substitute(const u_char *); +char *__collate_strdup(char *); +char *__collate_substitute(const char *); int __collate_load_tables(const char *); -void __collate_lookup(const u_char *, int *, int *, int *); +void __collate_lookup(const char *, int *, int *, int *); int __collate_range_cmp(int, int); #ifdef COLLATE_DEBUG void __collate_print_tables(void); Index: lib/libc/resolv/Symbol.map =================================================================== RCS file: /home/ncvs/src/lib/libc/resolv/Symbol.map,v retrieving revision 1.5 diff -u -r1.5 Symbol.map --- lib/libc/resolv/Symbol.map 21 May 2006 11:29:26 -0000 1.5 +++ lib/libc/resolv/Symbol.map 14 Sep 2006 18:35:50 -0000 @@ -52,6 +52,7 @@ sym_ntop; dn_count_labels; p_secstodate; + __r_code_syms; __res_init; __res_randomid; __h_errno; Index: lib/libc/resolv/res_debug.c =================================================================== RCS file: /home/ncvs/src/lib/libc/resolv/res_debug.c,v retrieving revision 1.2 diff -u -r1.2 res_debug.c --- lib/libc/resolv/res_debug.c 21 Mar 2006 15:37:16 -0000 1.2 +++ lib/libc/resolv/res_debug.c 14 Sep 2006 18:34:16 -0000 @@ -472,7 +472,7 @@ /* * Names of DNS rcodes. */ -static const struct res_sym __p_rcode_syms[] = { +const struct res_sym __p_rcode_syms[] = { {ns_r_noerror, "NOERROR", "no error"}, {ns_r_formerr, "FORMERR", "format error"}, {ns_r_servfail, "SERVFAIL", "server failed"}, Index: lib/libc/rpc/clnt_dg.c =================================================================== RCS file: /home/ncvs/src/lib/libc/rpc/clnt_dg.c,v retrieving revision 1.18 diff -u -r1.18 clnt_dg.c --- lib/libc/rpc/clnt_dg.c 27 Feb 2006 22:10:58 -0000 1.18 +++ lib/libc/rpc/clnt_dg.c 14 Sep 2006 18:51:21 -0000 @@ -382,7 +382,7 @@ xid++; *(u_int32_t *)(void *)(cu->cu_outbuf) = htonl(xid); - if ((! XDR_PUTINT32(xdrs, &proc)) || + if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || (! (*xargs)(xdrs, argsp))) { cu->cu_error.re_status = RPC_CANTENCODEARGS; Index: lib/libc/rpc/clnt_raw.c =================================================================== RCS file: /home/ncvs/src/lib/libc/rpc/clnt_raw.c,v retrieving revision 1.20 diff -u -r1.20 clnt_raw.c --- lib/libc/rpc/clnt_raw.c 27 Feb 2006 22:10:58 -0000 1.20 +++ lib/libc/rpc/clnt_raw.c 14 Sep 2006 18:51:58 -0000 @@ -172,7 +172,7 @@ XDR_SETPOS(xdrs, 0); clp->u.mashl_rpcmsg.rm_xid ++ ; if ((! XDR_PUTBYTES(xdrs, clp->u.mashl_callmsg, clp->mcnt)) || - (! XDR_PUTINT32(xdrs, &proc)) || + (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || (! AUTH_MARSHALL(h->cl_auth, xdrs)) || (! (*xargs)(xdrs, argsp))) { return (RPC_CANTENCODEARGS); Index: lib/libc/rpc/clnt_vc.c =================================================================== RCS file: /home/ncvs/src/lib/libc/rpc/clnt_vc.c,v retrieving revision 1.20 diff -u -r1.20 clnt_vc.c --- lib/libc/rpc/clnt_vc.c 9 Sep 2006 22:18:57 -0000 1.20 +++ lib/libc/rpc/clnt_vc.c 14 Sep 2006 18:52:38 -0000 @@ -361,7 +361,7 @@ x_id = ntohl(--(*msg_x_id)); if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) || - (! XDR_PUTINT32(xdrs, &proc)) || + (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || (! (*xdr_args)(xdrs, args_ptr))) { if (ct->ct_error.re_status == RPC_SUCCESS) Index: lib/libc/rpc/des_crypt.c =================================================================== RCS file: /home/ncvs/src/lib/libc/rpc/des_crypt.c,v retrieving revision 1.8 diff -u -r1.8 des_crypt.c --- lib/libc/rpc/des_crypt.c 16 Oct 2004 06:11:34 -0000 1.8 +++ lib/libc/rpc/des_crypt.c 14 Sep 2006 18:54:46 -0000 @@ -82,7 +82,7 @@ struct desparams dp; #ifdef BROKEN_DES - dp.UDES.UDES_buf = buf; + dp.UDES.UDES_buf = (u_char *)buf; dp.des_mode = ECB; #else dp.des_mode = CBC; @@ -107,7 +107,7 @@ struct desparams dp; #ifdef BROKEN_DES - dp.UDES.UDES_buf = buf; + dp.UDES.UDES_buf = (u_char *)buf; dp.des_mode = CBC; #else dp.des_mode = ECB; Index: lib/libc/stdio/fgetwc.c =================================================================== RCS file: /home/ncvs/src/lib/libc/stdio/fgetwc.c,v retrieving revision 1.12 diff -u -r1.12 fgetwc.c --- lib/libc/stdio/fgetwc.c 20 Jul 2004 08:27:27 -0000 1.12 +++ lib/libc/stdio/fgetwc.c 14 Sep 2006 18:40:48 -0000 @@ -71,7 +71,8 @@ return (wc); } do { - nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate); + nconv = __mbrtowc(&wc, (const char *)fp->_p, fp->_r, + &fp->_extra->mbstate); if (nconv == (size_t)-1) break; else if (nconv == (size_t)-2) Index: lib/libc/stdio/fgetws.c =================================================================== RCS file: /home/ncvs/src/lib/libc/stdio/fgetws.c,v retrieving revision 1.6 diff -u -r1.6 fgetws.c --- lib/libc/stdio/fgetws.c 3 Oct 2004 15:48:32 -0000 1.6 +++ lib/libc/stdio/fgetws.c 14 Sep 2006 18:41:17 -0000 @@ -58,7 +58,7 @@ goto error; wsp = ws; do { - src = fp->_p; + src = (const char *)fp->_p; nl = memchr(fp->_p, '\n', fp->_r); nconv = __mbsnrtowcs(wsp, &src, nl != NULL ? (nl - fp->_p + 1) : fp->_r, Index: lib/libc/stdio/mktemp.c =================================================================== RCS file: /home/ncvs/src/lib/libc/stdio/mktemp.c,v retrieving revision 1.28 diff -u -r1.28 mktemp.c --- lib/libc/stdio/mktemp.c 16 Feb 2003 17:29:10 -0000 1.28 +++ lib/libc/stdio/mktemp.c 14 Sep 2006 18:42:59 -0000 @@ -173,7 +173,7 @@ for (trv = start;;) { if (*trv == '\0' || trv == suffp) return (0); - pad = strchr(padchar, *trv); + pad = strchr((const char *)padchar, *trv); if (pad == NULL || *++pad == '\0') *trv++ = padchar[0]; else { Index: lib/libc/stdio/vswprintf.c =================================================================== RCS file: /home/ncvs/src/lib/libc/stdio/vswprintf.c,v retrieving revision 1.6 diff -u -r1.6 vswprintf.c --- lib/libc/stdio/vswprintf.c 21 Feb 2005 19:41:44 -0000 1.6 +++ lib/libc/stdio/vswprintf.c 14 Sep 2006 18:45:14 -0000 @@ -74,7 +74,7 @@ return (-1); } *f._p = '\0'; - mbp = f._bf._base; + mbp = (char *)f._bf._base; /* * XXX Undo the conversion from wide characters to multibyte that * fputwc() did in __vfwprintf(). Index: lib/libpmc/pmclog.c =================================================================== RCS file: /home/ncvs/src/lib/libpmc/pmclog.c,v retrieving revision 1.4 diff -u -r1.4 pmclog.c --- lib/libpmc/pmclog.c 26 Mar 2006 12:20:53 -0000 1.4 +++ lib/libpmc/pmclog.c 14 Sep 2006 19:51:59 -0000 @@ -88,7 +88,7 @@ int ps_fd; /* active fd or -1 */ char *ps_buffer; /* scratch buffer if fd != -1 */ char *ps_data; /* current parse pointer */ - size_t ps_len; /* length of buffered data */ + ssize_t ps_len; /* length of buffered data */ }; #define PMCLOG_HEADER_FROM_SAVED_STATE(PS) \ Index: lib/libpthread/sys/lock.h =================================================================== RCS file: /home/ncvs/src/lib/libpthread/sys/lock.h,v retrieving revision 1.7 diff -u -r1.7 lock.h --- lib/libpthread/sys/lock.h 4 Nov 2003 20:01:38 -0000 1.7 +++ lib/libpthread/sys/lock.h 14 Sep 2006 20:20:46 -0000 @@ -53,8 +53,8 @@ struct lockreq { struct lockuser *lr_watcher; /* only used for priority locks */ struct lockuser *lr_owner; /* only used for priority locks */ - volatile int lr_locked; /* lock granted = 0, busy otherwise */ - volatile int lr_active; /* non-zero if the lock is last lock for thread */ + volatile u_int lr_locked; /* lock granted = 0, busy otherwise */ + volatile u_int lr_active; /* non-zero if the lock is last lock for thread */ }; struct lockuser { Index: lib/libpthread/thread/thr_private.h =================================================================== RCS file: /home/ncvs/src/lib/libpthread/thread/thr_private.h,v retrieving revision 1.127 diff -u -r1.127 thr_private.h --- lib/libpthread/thread/thr_private.h 9 Jun 2006 14:23:40 -0000 1.127 +++ lib/libpthread/thread/thr_private.h 14 Sep 2006 20:22:51 -0000 @@ -1107,7 +1107,7 @@ /* Garbage collector lock. */ SCLASS struct lock _gc_lock; SCLASS int _gc_check SCLASS_PRESET(0); -SCLASS int _gc_count SCLASS_PRESET(0); +SCLASS u_int _gc_count SCLASS_PRESET(0); SCLASS struct lock _mutex_static_lock; SCLASS struct lock _rwlock_static_lock; Index: lib/libstand/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libstand/Makefile,v retrieving revision 1.57 diff -u -r1.57 Makefile --- lib/libstand/Makefile 6 Nov 2006 22:07:45 -0000 1.57 +++ lib/libstand/Makefile 7 Nov 2006 01:57:46 -0000 @@ -12,7 +12,7 @@ INCS= stand.h MAN= libstand.3 -CFLAGS+= -ffreestanding -Wformat +CFLAGS+= -ffreestanding -Wformat -v CFLAGS+= -I${.CURDIR} .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" Index: lib/libthread_db/arch/amd64/libpthread_md.c =================================================================== RCS file: /home/ncvs/src/lib/libthread_db/arch/amd64/libpthread_md.c,v retrieving revision 1.3 diff -u -r1.3 libpthread_md.c --- lib/libthread_db/arch/amd64/libpthread_md.c 1 Aug 2004 02:08:39 -0000 1.3 +++ lib/libthread_db/arch/amd64/libpthread_md.c 14 Sep 2006 20:29:26 -0000 @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD: src/lib/libthread_db/arch/amd64/libpthread_md.c,v 1.3 2004/08/01 02:08:39 davidxu Exp $"); #include +#include #include void Index: libexec/rtld-elf/rtld_lock.c =================================================================== RCS file: /home/ncvs/src/libexec/rtld-elf/rtld_lock.c,v retrieving revision 1.3 diff -u -r1.3 rtld_lock.c --- libexec/rtld-elf/rtld_lock.c 16 Nov 2004 20:45:51 -0000 1.3 +++ libexec/rtld-elf/rtld_lock.c 15 Sep 2006 00:43:46 -0000 @@ -54,7 +54,7 @@ #define RC_INCR 0x2 /* Adjusts count of readers desiring lock */ typedef struct Struct_Lock { - volatile int lock; + volatile u_int lock; void *base; } Lock; Index: sbin/fsdb/fsdb.c =================================================================== RCS file: /home/ncvs/src/sbin/fsdb/fsdb.c,v retrieving revision 1.35 diff -u -r1.35 fsdb.c --- sbin/fsdb/fsdb.c 31 Oct 2006 22:07:29 -0000 1.35 +++ sbin/fsdb/fsdb.c 7 Nov 2006 01:58:10 -0000 @@ -523,8 +523,10 @@ } /* Look through direct data blocks. */ if (is_ufs2 ? - find_blks64(curinode->dp2.di_db, NDADDR, wantedblk64) : - find_blks32(curinode->dp1.di_db, NDADDR, wantedblk32)) + find_blks64((uint64_t *)curinode->dp2.di_db, NDADDR, + wantedblk64) : + find_blks32((uint32_t *)curinode->dp1.di_db, NDADDR, + wantedblk32)) goto end; for (i = 0; i < NIADDR; i++) { /* Index: sbin/gpt/label.c =================================================================== RCS file: /home/ncvs/src/sbin/gpt/label.c,v retrieving revision 1.3 diff -u -r1.3 label.c --- sbin/gpt/label.c 4 Oct 2006 18:20:25 -0000 1.3 +++ sbin/gpt/label.c 6 Oct 2006 01:36:28 -0000 @@ -162,7 +162,7 @@ fclose(f); name[len] = '\0'; /* Only keep the first line, excluding the newline character. */ - p = strchr(name, '\n'); + p = strchr((const char *)name, '\n'); if (p != NULL) *p = '\0'; } @@ -203,7 +203,7 @@ case 'l': if (name != NULL) usage_label(); - name = strdup(optarg); + name = (uint8_t *)strdup(optarg); break; case 's': if (size > 0) Index: sbin/gpt/migrate.c =================================================================== RCS file: /home/ncvs/src/sbin/gpt/migrate.c,v retrieving revision 1.16 diff -u -r1.16 migrate.c --- sbin/gpt/migrate.c 1 Sep 2005 02:42:52 -0000 1.16 +++ sbin/gpt/migrate.c 15 Sep 2006 02:36:13 -0000 @@ -100,21 +100,22 @@ case FS_SWAP: { uuid_t swap = GPT_ENT_TYPE_FREEBSD_SWAP; le_uuid_enc(&ent->ent_type, &swap); - utf8_to_utf16("FreeBSD swap partition", + utf8_to_utf16((const uint8_t *)"FreeBSD swap partition", ent->ent_name, 36); break; } case FS_BSDFFS: { uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS; le_uuid_enc(&ent->ent_type, &ufs); - utf8_to_utf16("FreeBSD UFS partition", + utf8_to_utf16((const uint8_t *)"FreeBSD UFS partition", ent->ent_name, 36); break; } case FS_VINUM: { uuid_t vinum = GPT_ENT_TYPE_FREEBSD_VINUM; le_uuid_enc(&ent->ent_type, &vinum); - utf8_to_utf16("FreeBSD vinum partition", + utf8_to_utf16( + (const uint8_t *)"FreeBSD vinum partition", ent->ent_name, 36); break; } @@ -255,7 +256,8 @@ le_uuid_enc(&ent->ent_type, &freebsd); ent->ent_lba_start = htole64((uint64_t)start); ent->ent_lba_end = htole64(start + size - 1LL); - utf8_to_utf16("FreeBSD disklabel partition", + utf8_to_utf16((const uint8_t *) + "FreeBSD disklabel partition", ent->ent_name, 36); ent++; } else @@ -267,7 +269,7 @@ le_uuid_enc(&ent->ent_type, &efi_slice); ent->ent_lba_start = htole64((uint64_t)start); ent->ent_lba_end = htole64(start + size - 1LL); - utf8_to_utf16("EFI system partition", + utf8_to_utf16((const uint8_t *)"EFI system partition", ent->ent_name, 36); ent++; break; Index: sbin/growfs/growfs.c =================================================================== RCS file: /home/ncvs/src/sbin/growfs/growfs.c,v retrieving revision 1.25 diff -u -r1.25 growfs.c --- sbin/growfs/growfs.c 17 Jul 2006 20:48:36 -0000 1.25 +++ sbin/growfs/growfs.c 15 Sep 2006 02:41:25 -0000 @@ -156,7 +156,7 @@ static void updrefs(int, ino_t, struct gfs_bpp *, int, int, unsigned int); static void indirchk(ufs_lbn_t, ufs_lbn_t, ufs2_daddr_t, ufs_lbn_t, struct gfs_bpp *, int, int, unsigned int); -static void get_dev_size(int, int *); +static void get_dev_size(int, u_int32_t *); /* ************************************************************ growfs ***** */ /* @@ -1924,7 +1924,7 @@ * e.g. from vinum volumes. */ static void -get_dev_size(int fd, int *size) +get_dev_size(int fd, u_int32_t *size) { int sectorsize; off_t mediasize; @@ -1977,7 +1977,7 @@ struct disklabel *lp; struct partition *pp; int i,fsi,fso; - u_int32_t p_size; + u_int32_t p_size; char reply[5]; #ifdef FSMAXSNAP int j; Index: share/mk/bsd.lib.mk =================================================================== RCS file: /home/ncvs/src/share/mk/bsd.lib.mk,v retrieving revision 1.179 diff -u -r1.179 bsd.lib.mk --- share/mk/bsd.lib.mk 25 Oct 2006 09:43:38 -0000 1.179 +++ share/mk/bsd.lib.mk 7 Nov 2006 01:58:39 -0000 @@ -24,6 +24,15 @@ SONAME?= ${SHLIB_NAME} .endif +# +# Force PIC archive to be built, regardless of the NO_PIC and MK_TOOLCHAIN +# flags, if requested. +# +.if defined(FORCE_PIC_ARCHIVE) +INSTALL_PIC_ARCHIVE= 1 +MK_TOOLCHAIN= 1 +.endif + .if defined(CRUNCH_CFLAGS) CFLAGS+= ${CRUNCH_CFLAGS} .endif Index: share/mk/bsd.sys.mk =================================================================== RCS file: /home/ncvs/src/share/mk/bsd.sys.mk,v retrieving revision 1.39 diff -u -r1.39 bsd.sys.mk --- share/mk/bsd.sys.mk 4 Nov 2006 04:39:05 -0000 1.39 +++ share/mk/bsd.sys.mk 7 Nov 2006 01:58:39 -0000 @@ -8,6 +8,9 @@ # for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143 +#XXXKAN: Enable when tree is in better shape +NO_WERROR = yes + .if !defined(NO_WARNS) && ${CC} != "icc" . if defined(CSTD) . if ${CSTD} == "k&r" @@ -51,6 +54,8 @@ # XXX always get it right. CWARNFLAGS += -Wno-uninitialized . endif +#XXXKAN: Remove before commit +CWARNFLAGS += -Wno-pointer-sign . endif . if defined(FORMAT_AUDIT) Index: sys/amd64/amd64/support.S =================================================================== RCS file: /home/ncvs/src/sys/amd64/amd64/support.S,v retrieving revision 1.121 diff -u -r1.121 support.S --- sys/amd64/amd64/support.S 17 Oct 2006 02:24:45 -0000 1.121 +++ sys/amd64/amd64/support.S 7 Nov 2006 01:58:45 -0000 @@ -70,6 +70,17 @@ stosb ret +ENTRY(memset) + movq %rsi,%rax + andq $0xff,%rax + movq %rdx,%rcx + movq %rdi,%r11 + cld + rep + stosb + movq %r11,%rax + ret + /* Address: %rdi */ ENTRY(pagezero) movq $-PAGE_SIZE,%rdx Index: sys/amd64/include/md_var.h =================================================================== RCS file: /home/ncvs/src/sys/amd64/include/md_var.h,v retrieving revision 1.78 diff -u -r1.78 md_var.h --- sys/amd64/include/md_var.h 19 Jun 2006 22:36:01 -0000 1.78 +++ sys/amd64/include/md_var.h 18 Sep 2006 20:53:58 -0000 @@ -57,7 +57,9 @@ extern uint64_t *vm_page_dump; extern int vm_page_dump_size; +#ifdef _SYS_PCPU_H_ extern struct pcpu __pcpu[]; +#endif typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; Index: sys/amd64/include/smp.h =================================================================== RCS file: /home/ncvs/src/sys/amd64/include/smp.h,v retrieving revision 1.88 diff -u -r1.88 smp.h --- sys/amd64/include/smp.h 1 May 2006 21:36:47 -0000 1.88 +++ sys/amd64/include/smp.h 18 Sep 2006 21:02:49 -0000 @@ -23,6 +23,7 @@ #include #include #include +#include /* global symbols in mpboot.S */ extern char mptramp_start[]; Index: sys/boot/i386/boot2/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/boot2/Makefile,v retrieving revision 1.59 diff -u -r1.59 Makefile --- sys/boot/i386/boot2/Makefile 15 Jul 2005 12:22:14 -0000 1.59 +++ sys/boot/i386/boot2/Makefile 28 Sep 2006 17:54:36 -0000 @@ -20,7 +20,7 @@ #BOOT2_UFS?= UFS2_ONLY #BOOT2_UFS?= UFS1_ONLY -CFLAGS= -Os \ +CFLAGS= -Os -march=i386 \ -fno-guess-branch-probability \ -fomit-frame-pointer \ -fno-unit-at-a-time \ @@ -36,7 +36,8 @@ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections Index: sys/boot/i386/boot2/boot2.c =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/boot2/boot2.c,v retrieving revision 1.83 diff -u -r1.83 boot2.c --- sys/boot/i386/boot2/boot2.c 2 Nov 2006 17:28:38 -0000 1.83 +++ sys/boot/i386/boot2/boot2.c 7 Nov 2006 01:58:52 -0000 @@ -157,8 +157,8 @@ const char *s = src; char *d = dst; - while (len--) - *d++ = *s++; + while (--len >= 0) + d[len] = s[len]; } static inline int @@ -563,7 +563,6 @@ printf(const char *fmt,...) { va_list ap; - char buf[10]; char *s; unsigned u; int c; @@ -582,12 +581,9 @@ continue; case 'u': u = va_arg(ap, unsigned); - s = buf; do - *s++ = '0' + u % 10U; + putchar('0' + u % 10U); while (u /= 10U); - while (--s >= buf) - putchar(*s); continue; } } Index: sys/cam/cam.c =================================================================== RCS file: /home/ncvs/src/sys/cam/cam.c,v retrieving revision 1.10 diff -u -r1.10 cam.c --- sys/cam/cam.c 18 Apr 2006 21:53:39 -0000 1.10 +++ sys/cam/cam.c 18 Sep 2006 17:41:56 -0000 @@ -104,7 +104,7 @@ #endif void -cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen) +cam_strvis(char *dst, const char *src, int srclen, int dstlen) { /* Trim leading/trailing spaces, nulls. */ @@ -115,16 +115,17 @@ srclen--; while (srclen > 0 && dstlen > 1) { - u_int8_t *cur_pos = dst; + char *cur_pos = dst; + u_int8_t ch = *src; - if (*src < 0x20 || *src >= 0x80) { + if (*src < 0x20 || ch >= 0x80) { /* SCSI-II Specifies that these should never occur. */ /* non-printable character */ if (dstlen > 4) { *cur_pos++ = '\\'; - *cur_pos++ = ((*src & 0300) >> 6) + '0'; - *cur_pos++ = ((*src & 0070) >> 3) + '0'; - *cur_pos++ = ((*src & 0007) >> 0) + '0'; + *cur_pos++ = ((ch & 0300) >> 6) + '0'; + *cur_pos++ = ((ch & 0070) >> 3) + '0'; + *cur_pos++ = ((ch & 0007) >> 0) + '0'; } else { *cur_pos++ = '?'; } @@ -147,7 +148,7 @@ * wildcard '?' matches a single non-space character. */ int -cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len) +cam_strmatch(const char *str, const char *pattern, int str_len) { while (*pattern != '\0'&& str_len > 0) { Index: sys/cam/cam.h =================================================================== RCS file: /home/ncvs/src/sys/cam/cam.h,v retrieving revision 1.11 diff -u -r1.11 cam.h --- sys/cam/cam.h 5 Jan 2005 22:34:34 -0000 1.11 +++ sys/cam/cam.h 18 Sep 2006 17:42:11 -0000 @@ -199,9 +199,9 @@ caddr_t cam_quirkmatch(caddr_t target, caddr_t quirk_table, int num_entries, int entry_size, cam_quirkmatch_t *comp_func); -void cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen); +void cam_strvis(char *dst, const char *src, int srclen, int dstlen); -int cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len); +int cam_strmatch(const char *str, const char *pattern, int str_len); const struct cam_status_entry* cam_fetch_status_entry(cam_status status); #ifdef _KERNEL Index: sys/cam/cam_periph.c =================================================================== RCS file: /home/ncvs/src/sys/cam/cam_periph.c,v retrieving revision 1.64 diff -u -r1.64 cam_periph.c --- sys/cam/cam_periph.c 5 Dec 2006 07:45:27 -0000 1.64 +++ sys/cam/cam_periph.c 6 Dec 2006 14:35:56 -0000 @@ -648,7 +648,7 @@ mapinfo->bp[i]->b_saveaddr = mapinfo->bp[i]->b_data; /* put our pointer in the data slot */ - mapinfo->bp[i]->b_data = *data_ptrs[i]; + mapinfo->bp[i]->b_data = (caddr_t)*data_ptrs[i]; /* set the transfer length, we know it's < DFLTPHYS */ mapinfo->bp[i]->b_bufsize = lengths[i]; @@ -676,7 +676,7 @@ } /* set our pointer to the new mapped area */ - *data_ptrs[i] = mapinfo->bp[i]->b_data; + *data_ptrs[i] = (u_int8_t *)mapinfo->bp[i]->b_data; mapinfo->num_bufs_used++; } @@ -1556,6 +1556,7 @@ frozen = (status & CAM_DEV_QFRZN) != 0; status &= CAM_STATUS_MASK; openings = relsim_flags = 0; + timeout = 0; switch (status) { case CAM_REQ_CMP: Index: sys/cam/scsi/scsi_cd.c =================================================================== RCS file: /home/ncvs/src/sys/cam/scsi/scsi_cd.c,v retrieving revision 1.97 diff -u -r1.97 scsi_cd.c --- sys/cam/scsi/scsi_cd.c 5 Dec 2006 07:45:27 -0000 1.97 +++ sys/cam/scsi/scsi_cd.c 6 Dec 2006 14:35:56 -0000 @@ -1522,7 +1522,7 @@ /* lba */ bp->bio_offset / softc->params.blksize, bp->bio_bcount / softc->params.blksize, - /* data_ptr */ bp->bio_data, + /* data_ptr */ (u_int8_t *)bp->bio_data, /* dxfer_len */ bp->bio_bcount, /* sense_len */ SSD_FULL_SIZE, /* timeout */ 30000); Index: sys/cam/scsi/scsi_da.c =================================================================== RCS file: /home/ncvs/src/sys/cam/scsi/scsi_da.c,v retrieving revision 1.200 diff -u -r1.200 scsi_da.c --- sys/cam/scsi/scsi_da.c 5 Dec 2006 07:45:28 -0000 1.200 +++ sys/cam/scsi/scsi_da.c 6 Dec 2006 14:35:56 -0000 @@ -45,7 +45,9 @@ #include #include +#ifdef _KERNEL #include +#endif /* _KERNEL */ #include #include @@ -1277,7 +1279,7 @@ /*lba*/bp->bio_pblkno, /*block_count*/bp->bio_bcount / softc->params.secsize, - /*data_ptr*/ bp->bio_data, + /*data_ptr*/ (u_int8_t *)bp->bio_data, /*dxfer_len*/ bp->bio_bcount, /*sense_len*/SSD_FULL_SIZE, /*timeout*/da_default_timeout*1000); Index: sys/conf/kern.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kern.mk,v retrieving revision 1.50 diff -u -r1.50 kern.mk --- sys/conf/kern.mk 26 Nov 2006 23:16:46 -0000 1.50 +++ sys/conf/kern.mk 1 Dec 2006 02:50:14 -0000 @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions + ${_wundef} -Wno-pointer-sign -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif Index: sys/conf/kern.pre.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kern.pre.mk,v retrieving revision 1.81 diff -u -r1.81 kern.pre.mk --- sys/conf/kern.pre.mk 26 Oct 2006 15:16:43 -0000 1.81 +++ sys/conf/kern.pre.mk 7 Nov 2006 01:58:58 -0000 @@ -53,7 +53,7 @@ NOSTDINC= -nostdinc .endif -INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. @@ -87,7 +87,7 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -WERROR?= -Werror +#WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". Index: sys/conf/kmod.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kmod.mk,v retrieving revision 1.213 diff -u -r1.213 kmod.mk --- sys/conf/kmod.mk 20 Oct 2006 07:31:15 -0000 1.213 +++ sys/conf/kmod.mk 7 Nov 2006 01:58:58 -0000 @@ -75,7 +75,7 @@ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing . endif -WERROR?= -Werror +#WERROR?= -Werror .endif CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL @@ -89,7 +89,7 @@ NOSTDINC= -nostdinc .endif CFLAGS+= ${C_DIALECT} -CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} +CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif Index: sys/contrib/dev/acpica/exprep.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/dev/acpica/exprep.c,v retrieving revision 1.1.1.24 diff -u -r1.1.1.24 exprep.c --- sys/contrib/dev/acpica/exprep.c 1 Nov 2005 22:11:02 -0000 1.1.1.24 +++ sys/contrib/dev/acpica/exprep.c 18 Sep 2006 17:59:14 -0000 @@ -364,6 +364,7 @@ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown field access type %X\n", Access)); + *ReturnByteAlignment = 1; return_UINT32 (0); } Index: sys/dev/an/if_an.c =================================================================== RCS file: /home/ncvs/src/sys/dev/an/if_an.c,v retrieving revision 1.80 diff -u -r1.80 if_an.c --- sys/dev/an/if_an.c 6 Nov 2006 13:41:50 -0000 1.80 +++ sys/dev/an/if_an.c 7 Nov 2006 01:59:09 -0000 @@ -1478,7 +1478,6 @@ struct an_card_rid_desc an_rid_desc; struct an_command cmd; struct an_reply reply; - char *buf; u_int16_t *ptr; u_int8_t *ptr2; int i, len; @@ -1554,8 +1553,6 @@ return(EIO); } - ptr = (u_int16_t *)buf; - if (reply.an_status & AN_CMD_QUAL_MASK) { printf("an%d: failed to write RID 2 %x %x %x %x %x, %d\n", sc->an_unit, ltv->an_type, Index: sys/dev/usb/ufoma.c =================================================================== RCS file: /home/ncvs/src/sys/dev/usb/ufoma.c,v retrieving revision 1.2 diff -u -r1.2 ufoma.c --- sys/dev/usb/ufoma.c 7 Sep 2006 00:06:41 -0000 1.2 +++ sys/dev/usb/ufoma.c 26 Sep 2006 14:26:49 -0000 @@ -256,8 +256,6 @@ }; -static devclass_t ucom_devclass; - DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0); MODULE_DEPEND(ufoma, usb, 1, 1, 1); MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); Index: sys/i386/i386/support.s =================================================================== RCS file: /home/ncvs/src/sys/i386/i386/support.s,v retrieving revision 1.112 diff -u -r1.112 support.s --- sys/i386/i386/support.s 17 Oct 2006 02:24:46 -0000 1.112 +++ sys/i386/i386/support.s 7 Nov 2006 01:59:41 -0000 @@ -690,6 +690,17 @@ ret +ENTRY(memset) + pushl %edi + movl 12(%esp),%edi + movl 16(%esp),%eax + movl 20(%esp),%ecx + cld + rep + movsb + popl %edi + ret + /*****************************************************************************/ /* copyout and fubyte family */ /*****************************************************************************/ Index: sys/i386/include/smp.h =================================================================== RCS file: /home/ncvs/src/sys/i386/include/smp.h,v retrieving revision 1.87 diff -u -r1.87 smp.h --- sys/i386/include/smp.h 1 May 2006 21:36:47 -0000 1.87 +++ sys/i386/include/smp.h 26 Sep 2006 18:43:49 -0000 @@ -23,6 +23,7 @@ #include #include #include +#include /* global data in mpboot.s */ extern int bootMP_size; Index: sys/kern/kern_linker.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_linker.c,v retrieving revision 1.144 diff -u -r1.144 kern_linker.c --- sys/kern/kern_linker.c 6 Nov 2006 13:42:00 -0000 1.144 +++ sys/kern/kern_linker.c 7 Nov 2006 01:59:48 -0000 @@ -793,7 +793,7 @@ } int -linker_ddb_search_symbol(caddr_t value, c_linker_sym_t *sym, long *diffp) +linker_ddb_search_symbol(caddr_t value, c_linker_sym_t *sym, u_long *diffp) { linker_file_t lf; c_linker_sym_t best, es; Index: sys/sparc64/include/smp.h =================================================================== RCS file: /home/ncvs/src/sys/sparc64/include/smp.h,v retrieving revision 1.19 diff -u -r1.19 smp.h --- sys/sparc64/include/smp.h 3 Nov 2005 21:08:20 -0000 1.19 +++ sys/sparc64/include/smp.h 26 Sep 2006 20:34:49 -0000 @@ -37,6 +37,7 @@ #include #include +#include #define IDR_BUSY (1<<0) #define IDR_NACK (1<<1) Index: sys/sys/linker.h =================================================================== RCS file: /home/ncvs/src/sys/sys/linker.h,v retrieving revision 1.46 diff -u -r1.46 linker.h --- sys/sys/linker.h 20 Jun 2006 20:59:55 -0000 1.46 +++ sys/sys/linker.h 18 Sep 2006 20:23:10 -0000 @@ -153,7 +153,7 @@ */ int linker_ddb_lookup(const char *_symstr, c_linker_sym_t *_sym); int linker_ddb_search_symbol(caddr_t _value, c_linker_sym_t *_sym, - long *_diffp); + u_long *_diffp); int linker_ddb_symbol_values(c_linker_sym_t _sym, linker_symval_t *_symval);