Index: Makefile.inc1 =================================================================== RCS file: /usr/download/ncvs/src/Makefile.inc1,v retrieving revision 1.431 diff -u -r1.431 Makefile.inc1 --- Makefile.inc1 8 Jul 2004 09:08:09 -0000 1.431 +++ Makefile.inc1 9 Jul 2004 00:45:41 -0000 @@ -766,10 +766,6 @@ _share= share/syscons/scrnmaps .endif -.if !defined(NO_FORTRAN) -_fortran= gnu/usr.bin/cc/f771 -.endif - .if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) _kerberos5_tools= kerberos5/tools .endif @@ -784,7 +780,6 @@ bin/sh \ ${_rescue} \ gnu/usr.bin/cc/cc_tools \ - ${_fortran} \ lib/libncurses \ ${_share} \ ${_aicasm} \ Index: contrib/binutils/gas/expr.c =================================================================== RCS file: /usr/download/ncvs/src/contrib/binutils/gas/expr.c,v retrieving revision 1.1.1.8 diff -u -r1.1.1.8 expr.c --- contrib/binutils/gas/expr.c 16 Jun 2004 05:45:10 -0000 1.1.1.8 +++ contrib/binutils/gas/expr.c 22 Jun 2004 00:33:52 -0000 @@ -32,6 +32,7 @@ #include "safe-ctype.h" #include "obstack.h" +static void bignum_negate (expressionS * expressionP); static void floating_constant (expressionS * expressionP); static valueT generic_bignum_to_int32 (void); #ifdef BFD64 @@ -733,6 +734,40 @@ } } +/* In: An expressionP for a bignum to negate. + + Out: A negated expressionP. + && exp->X_add_number == 0 + && symbol_get_value_expression (exp->X_add_symbol)->X_op == O_big +*/ + +static void +bignum_negate (exp) + expressionS *exp; +{ + int i; + unsigned long carry; + + /* Negate the bignum: one's complement each digit and add 1. */ + carry = 1; + for (i = 0; i < exp->X_add_number; i++) + { + unsigned long next; + + next = (((~(generic_bignum[i] & LITTLENUM_MASK)) + & LITTLENUM_MASK) + + carry); + generic_bignum[i] = next & LITTLENUM_MASK; + carry = next >> LITTLENUM_NUMBER_OF_BITS; + } + + if (carry > 0) + { + generic_bignum[exp->X_add_number] = carry; + exp->X_add_number ++; + } +} + /* In: Input_line_pointer points to 1st char of operand, which may be a space. @@ -1079,15 +1114,25 @@ else if (expressionP->X_op != O_illegal && expressionP->X_op != O_absent) { - expressionP->X_add_symbol = make_expr_symbol (expressionP); if (c == '-') - expressionP->X_op = O_uminus; - else if (c == '~' || c == '"') - expressionP->X_op = O_bit_not; - else - expressionP->X_op = O_logical_not; - expressionP->X_add_number = 0; - } + { + if (expressionP->X_op == O_big + && expressionP->X_add_number > 0) + bignum_negate(expressionP); + else + expressionP->X_op = O_uminus; + } + else if (c == '~' || c == '"') + expressionP->X_op = O_bit_not; + else + expressionP->X_op = O_logical_not; + + if (expressionP->X_op != O_big) + { + expressionP->X_add_number = 0; + expressionP->X_add_symbol = make_expr_symbol (expressionP); + } + } else as_warn (_("Unary operator %c ignored because bad operand follows"), c); Index: contrib/smbfs/lib/smb/file.c =================================================================== RCS file: /usr/download/ncvs/src/contrib/smbfs/lib/smb/file.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 file.c --- contrib/smbfs/lib/smb/file.c 14 Dec 2001 11:06:03 -0000 1.1.1.1 +++ contrib/smbfs/lib/smb/file.c 3 Jun 2004 15:05:53 -0000 @@ -71,7 +71,7 @@ struct smbioc_rw rwrq; rwrq.ioc_fh = fh; - (const char*)rwrq.ioc_base = src; + rwrq.ioc_base = (char *)src; rwrq.ioc_cnt = count; rwrq.ioc_offset = offset; if (ioctl(ctx->ct_fd, SMBIOC_WRITE, &rwrq) == -1) Index: contrib/smbfs/lib/smb/rq.c =================================================================== RCS file: /usr/download/ncvs/src/contrib/smbfs/lib/smb/rq.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 rq.c --- contrib/smbfs/lib/smb/rq.c 14 Dec 2001 11:06:03 -0000 1.1.1.1 +++ contrib/smbfs/lib/smb/rq.c 3 Jun 2004 15:03:10 -0000 @@ -162,7 +162,7 @@ bzero(&krq, sizeof(krq)); krq.ioc_setup[0] = setup; krq.ioc_setupcnt = setupcount; - (const char*)krq.ioc_name = name; + krq.ioc_name = (char *)name; krq.ioc_tparamcnt = tparamcnt; krq.ioc_tparam = tparam; krq.ioc_tdatacnt = tdatacnt; Index: contrib/telnet/telnetd/termstat.c =================================================================== RCS file: /usr/download/ncvs/src/contrib/telnet/telnetd/termstat.c,v retrieving revision 1.12 diff -u -r1.12 termstat.c --- contrib/telnet/telnetd/termstat.c 4 May 2003 02:54:49 -0000 1.12 +++ contrib/telnet/telnetd/termstat.c 3 Jun 2004 03:43:04 -0000 @@ -439,7 +439,7 @@ useeditmode = 0; if (tty_isediting()) useeditmode |= MODE_EDIT; - if (tty_istrapsig) + if (tty_istrapsig()) useeditmode |= MODE_TRAPSIG; if (tty_issofttab()) useeditmode |= MODE_SOFT_TAB; Index: contrib/traceroute/findsaddr-socket.c =================================================================== RCS file: /usr/download/ncvs/src/contrib/traceroute/findsaddr-socket.c,v retrieving revision 1.2 diff -u -r1.2 findsaddr-socket.c --- contrib/traceroute/findsaddr-socket.c 30 Jul 2002 04:49:13 -0000 1.2 +++ contrib/traceroute/findsaddr-socket.c 3 Jun 2004 06:01:20 -0000 @@ -192,6 +192,7 @@ default: /* empty */ + break; } if (SALEN(sa) == 0) Index: etc/mtree/BSD.include.dist =================================================================== RCS file: /usr/download/ncvs/src/etc/mtree/BSD.include.dist,v retrieving revision 1.85 diff -u -r1.85 BSD.include.dist --- etc/mtree/BSD.include.dist 8 Jul 2004 16:48:43 -0000 1.85 +++ etc/mtree/BSD.include.dist 9 Jul 2004 00:47:04 -0000 @@ -12,11 +12,13 @@ bsnmp .. c++ - 3.3 + 3.4 backward .. bits .. + debug + .. ext .. .. Index: gnu/lib/csu/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/lib/csu/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- gnu/lib/csu/Makefile 6 Mar 2004 07:34:51 -0000 1.21 +++ gnu/lib/csu/Makefile 2 Jun 2004 20:18:17 -0000 @@ -6,14 +6,14 @@ .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} -SRCS= crtstuff.c tconfig.h +SRCS= crtstuff.c tconfig.h tm.h OBJS= crtbegin.o crtend.o SOBJS= crtbegin.So crtend.So CSTD?= gnu89 CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR CFLAGS+= -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-zero-initialized-in-bss \ - -fno-omit-frame-pointer + -fno-omit-frame-pointer -fno-unit-at-a-time CFLAGS+= -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} @@ -38,7 +38,7 @@ ENDSRC?= crtstuff.c all: ${OBJS} ${SOBJS} ${TGTOBJS} -${OBJS} ${SOBJS}: tconfig.h +${OBJS} ${SOBJS}: tm.h CLEANFILES= ${OBJS} ${SOBJS} ${TGTOBJS} @@ -58,8 +58,8 @@ ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${.ALLSRC:N*.h} -CLEANFILES+= tconfig.h -tconfig.h: ${CCDIR}/cc_tools/Makefile +CLEANFILES+= tm.h tconfig.h +tm.h tconfig.h: ${CCDIR}/cc_tools/Makefile ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} realinstall: Index: gnu/lib/libg2c/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/lib/libg2c/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- gnu/lib/libg2c/Makefile 21 Apr 2004 15:43:26 -0000 1.13 +++ gnu/lib/libg2c/Makefile 29 May 2004 05:08:25 -0000 @@ -59,7 +59,7 @@ etime_.c dtime_.c isatty_.c ltime_.c fstat_.c stat_.c \ lstat_.c access_.c link_.c getlog_.c ttynam_.c getcwd_.c \ symlnk_.c vxttime_.c vxtidate_.c gmtime_.c fdate_.c \ - secnds_.c bes.c dbes.c chdir_.c chmod_.c lnblnk_.c \ + secnds_.c chdir_.c chmod_.c lnblnk_.c \ hostnm_.c rename_.c fgetc_.c fputc_.c umask_.c \ sys_clock_.c date_.c second_.c flush1_.c mclock_.c \ alarm_.c datetime_.c Index: gnu/lib/libgcc/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/lib/libgcc/Makefile,v retrieving revision 1.50 diff -u -r1.50 Makefile --- gnu/lib/libgcc/Makefile 11 Jul 2003 05:29:11 -0000 1.50 +++ gnu/lib/libgcc/Makefile 13 Jul 2004 03:58:31 -0000 @@ -44,41 +44,43 @@ # # When upgrading GCC, get the following defintions straight from Makefile.in # - # Library members defined in libgcc2.c. -# Variable length limited to 255 charactes when passed to a shell script. -LIB2FUNCS_1 = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 _ffsdi2 _clz \ - _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \ - _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi - -LIB2FUNCS_2 = _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf \ - _clear_cache _trampoline __main _exit _absvsi2 _absvdi2 _addvsi3 \ - _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors +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 \ + _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 # Defined in libgcc2.c, included only in the static library. -LIB2FUNCS_ST = _eprintf _bb __gcc_bcmp +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 _thenan_sf _sf_to_usi _usi_to_sf + _sf_to_df _sf_to_tf _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 _thenan_df _df_to_usi _usi_to_df + _df_to_sf _df_to_tf _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 \ + _lt_tf _le_tf _unord_tf _si_to_tf _tf_to_si _negate_tf _make_tf \ + _tf_to_df _tf_to_sf _thenan_tf _tf_to_usi _usi_to_tf # These might cause a divide overflow trap and so are compiled with # unwinder info. LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4 -MACHMODE_H = machmode.h machmode.def - LIB2ADD = $(LIB2FUNCS_EXTRA) LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA) -# Additional sources to handle exceptions; overridden on ia64. -LIB2ADDEH = unwind-dw2.c unwind-dw2-fde.c unwind-sjlj.c unwind-c.c +# 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 #----------------------------------------------------------------------- # @@ -93,8 +95,10 @@ .if ${TARGET_ARCH} == "arm" # from config/arm/t-strongarm-elf -LIB1ASMSRC = lib1funcs.asm -LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func +CFLAGS+= -Dinhibit_libc -fno-inline +LIB1ASMSRC = lib1funcs.asm +LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _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 @@ -103,11 +107,11 @@ .if ${TARGET_ARCH} == "ia64" # from config/ia64/t-ia64 LIB1ASMSRC = lib1funcs.asm -LIB1ASMFUNCS = __divtf3 __divdf3 __divsf3 \ - __divdi3 __moddi3 __udivdi3 __umoddi3 \ - __divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \ - __nonlocal_goto __restore_stack_nonlocal __trampoline -LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c +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 .endif .if ${TARGET_ARCH} == "powerpc" @@ -178,11 +182,11 @@ STATICOBJS= ${SYMS_ST:S/$/.o/} SRCS= ${LIB2ADD} ${LIB2ADDEH} -COMMONHDRS= tconfig.h +COMMONHDRS= tm.h tconfig.h SRCS+= ${COMMONHDRS} CLEANFILES+= ${COMMONHDRS} -tconfig.h: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile +${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} ${OBJS} beforedepend: ${COMMONHDRS} Index: gnu/lib/libobjc/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/lib/libobjc/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- gnu/lib/libobjc/Makefile 14 Jun 2003 13:30:32 -0000 1.19 +++ gnu/lib/libobjc/Makefile 2 Jun 2004 21:35:08 -0000 @@ -23,12 +23,12 @@ CFLAGS+= -fpic .endif -CFLAGS+= -fgnu-runtime -DHAVE_GTHR_DEFAULT -DIN_TARGET_LIBS +CFLAGS+= -fgnu-runtime -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${GCCDIR}/config -I${GCCDIR} -GENHDRS= runtime-info.h tconfig.h +GENHDRS= runtime-info.h tconfig.h tm.h CLEANFILES+= ${GENHDRS} SRCS+= ${GENHDRS} @@ -38,7 +38,7 @@ `${CC} --print-prog-name=cc1obj` -print-objc-runtime-info \ < /dev/null > ${.TARGET} -tconfig.h: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile +tconfig.h tm.h : ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} .include Index: gnu/lib/libstdc++/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/lib/libstdc++/Makefile,v retrieving revision 1.50 diff -u -r1.50 Makefile --- gnu/lib/libstdc++/Makefile 5 Feb 2004 22:44:20 -0000 1.50 +++ gnu/lib/libstdc++/Makefile 4 Jun 2004 21:38:20 -0000 @@ -1,37 +1,36 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.50 2004/02/05 22:44:20 ru Exp $ +# $FreeBSD$ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ SUPDIR= ${SRCDIR}/libsupc++ .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \ - ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std \ + ${SRCDIR}/config/locale/generic ${SRCDIR}/include \ ${SUPDIR} ${GCCDIR} -#SUBDIR= doc - LIB= stdc++ SHLIB_MAJOR= 4 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H -CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated -#LDFLAGS+= -Wl,-version-info,4:0:0 -Wl,--version-script=${SRCDIR}/src/linker.map +CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include +CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ + -Wno-deprecated LDADD= -lm DPADD= ${LIBM} -# libstdc++ sources (libstdc++/src/Makefile.in, do not reorder) -SRCS+= bitset.cc codecvt.cc complex_io.cc concept-inst.cc ctype.cc \ - ext-inst.cc fstream.cc fstream-inst.cc functexcept.cc \ - globals.cc io-inst.cc ios.cc istream-inst.cc limits.cc \ - locale.cc locale-inst.cc localename.cc misc-inst.cc \ - ostream-inst.cc sstream-inst.cc stdexcept.cc stl-inst.cc \ - streambuf-inst.cc string-inst.cc strstream-fixed.cc \ - valarray-inst.cc vterminate.cc wstring-inst.cc +# libstdc++ sources +SRCS+= allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc functexcept.cc \ + globals_locale.cc globals_io.cc ios.cc ios_failure.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 \ + io-inst.cc istream-inst.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 # target sources -SRCS+= codecvt_members.cc collate_members.cc ctype_members.cc \ +SRCS+= atomicity.cc codecvt_members.cc collate_members.cc ctype_members.cc \ messages_members.cc monetary_members.cc numeric_members.cc \ time_members.cc @@ -39,64 +38,95 @@ SRCS+= basic_file_stdio.cc c_locale.cc # C parts of math -SRCS+= nan.c signbit.c signbitf.c signbitl.c stubs.c +SRCS+= signbitf.c signbitl.c 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 eh_personality.cc eh_terminate.cc eh_throw.cc eh_type.cc \ - guard.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc \ - pure.cc tinfo.cc tinfo2.cc vec.cc +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 \ + 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 \ + vec.cc vterminate.cc # from libiberty: -SRCS+= cp-demangle.c dyn-string.c +SRCS+= cp-demangle.c + +# MD headers location +.if ${MACHINE_ARCH} == "sparc64" +MARCHDIR= sparc +.elif ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU} != 'i386' +MARCHDIR= i486 +.elif ${MACHINE_ARCH} == "amd64" +MARCHDIR= i486 +.else +MARCHDIR= ${MACHINE_ARCH} +.endif -strstream-fixed.cc: ${SRCDIR}/src/strstream.cc - sed -e 's,^#include ,#include ,g' \ - < ${SRCDIR}/src/strstream.cc > strstream-fixed.cc +ATOMICITY_H= atomicity.h +.if exists(${SRCDIR}/config/cpu/${MARCHDIR}/atomicity.h) +ATOMICITY_H= ${SRCDIR}/config/cpu/${MARCHDIR}/atomicity.h +.else +ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity.h +.endif -CLEANFILES+= strstream-fixed.cc +atomicity.cc: ${ATOMICITY_H} + ln -sf ${.ALLSRC} ${.TARGET} INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \ - TARGETHDRS THRHDRS + TARGETHDRS THRHDRS DEBUGHDRS +CXXINCLUDEDIR= ${INCLUDEDIR}/c++/3.4 + +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 \ + std_iosfwd.h std_iostream.h std_istream.h std_iterator.h \ + std_limits.h std_list.h std_locale.h std_map.h std_memory.h \ + std_numeric.h std_ostream.h std_queue.h std_set.h \ + std_sstream.h std_stack.h std_stdexcept.h std_streambuf.h \ + std_string.h std_utility.h std_valarray.h std_vector.h +.for h in ${STDHDRS} +STDHDRSNAME_$h=${h:R:S;^std_;;} +.endfor +STDHDRS:= ${STDHDRS:S;^;${SRCDIR}/include/std/;} +STDHDRSDIR= ${CXXINCLUDEDIR} -BITSHDRS= basic_ios.h basic_ios.tcc basic_string.h basic_string.tcc \ - boost_concept_check.h char_traits.h codecvt.h concept_check.h \ - cpp_type_traits.h deque.tcc fpos.h fstream.tcc functexcept.h \ - gslice.h gslice_array.h indirect_array.h \ - ios_base.h istream.tcc list.tcc \ - locale_classes.h locale_facets.h locale_facets.tcc \ - localefwd.h mask_array.h ostream.tcc pthread_allocimpl.h \ +BITSHDRS= allocator.h atomicity.h basic_ios.h basic_ios.tcc \ + basic_string.h basic_string.tcc boost_concept_check.h \ + char_traits.h codecvt.h concept_check.h concurrence.h \ + cpp_type_traits.h deque.tcc fstream.tcc functexcept.h \ + gslice.h gslice_array.h indirect_array.h ios_base.h \ + istream.tcc list.tcc locale_classes.h locale_facets.h \ + locale_facets.tcc localefwd.h mask_array.h ostream.tcc \ + postypes.h stream_iterator.h streambuf_iterator.h \ slice_array.h sstream.tcc stl_algo.h stl_algobase.h \ - stl_alloc.h stl_bvector.h stl_construct.h stl_deque.h \ - stl_function.h stl_heap.h stl_iterator.h \ - stl_iterator_base_funcs.h stl_iterator_base_types.h \ - stl_list.h stl_map.h stl_multimap.h stl_multiset.h \ - stl_numeric.h stl_pair.h stl_pthread_alloc.h stl_queue.h \ + stl_bvector.h stl_construct.h stl_deque.h stl_function.h \ + stl_heap.h stl_iterator.h stl_iterator_base_funcs.h \ + 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 stream_iterator.h streambuf.tcc \ - streambuf_iterator.h stringfwd.h type_traits.h \ - valarray_array.h valarray_array.tcc valarray_meta.h \ - vector.tcc + stl_vector.h streambuf.tcc stringfwd.h type_traits.h \ + valarray_array.h valarray_array.tcc valarray_before.h \ + valarray_after.h vector.tcc BITSHDRS:= ${BITSHDRS:S;^;${SRCDIR}/include/bits/;} -BITSHDRSDIR= ${INCLUDEDIR}/c++/3.3/bits +BITSHDRSDIR= ${CXXINCLUDEDIR}/bits -BKWHDRS= algo.h algobase.h alloc.h backward_warning.h bvector.h \ - complex.h defalloc.h deque.h fstream.h function.h \ - hash_map.h hash_set.h hashtable.h heap.h iomanip.h \ - iostream.h istream.h iterator.h list.h map.h multimap.h \ - multiset.h new.h ostream.h pair.h queue.h rope.h set.h \ - slist.h stack.h stream.h streambuf.h strstream \ - tempbuf.h tree.h vector.h +BKWHDRS= complex.h iomanip.h istream.h ostream.h stream.h streambuf.h \ + algo.h algobase.h alloc.h bvector.h defalloc.h deque.h \ + function.h hash_map.h hash_set.h hashtable.h heap.h iostream.h \ + iterator.h list.h map.h multimap.h new.h multiset.h pair.h \ + queue.h rope.h set.h slist.h stack.h tempbuf.h tree.h \ + vector.h fstream.h strstream backward_warning.h BKWHDRS:= ${BKWHDRS:S;^;${SRCDIR}/include/backward/;} -BKWHDRSDIR= ${INCLUDEDIR}/c++/3.3/backward +BKWHDRSDIR= ${CXXINCLUDEDIR}/backward -EXTHDRS= algorithm enc_filebuf.h functional hash_map hash_set \ - iterator memory numeric rb_tree rope ropeimpl.h slist \ - stdio_filebuf.h stl_hash_fun.h stl_hashtable.h stl_rope.h +EXTHDRS= algorithm bitmap_allocator.h debug_allocator.h demangle.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:= ${EXTHDRS:S;^;${SRCDIR}/include/ext/;} -EXTHDRSDIR= ${INCLUDEDIR}/c++/3.3/ext +EXTHDRSDIR= ${CXXINCLUDEDIR}/ext # 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 \ @@ -108,51 +138,40 @@ BASEHDRSNAME_$h=${h:R:S;^std_;;} .endfor BASEHDRS:= ${BASEHDRS:S;^;${SRCDIR}/include/c_std/;} -BASEHDRSDIR= ${INCLUDEDIR}/c++/3.3 +BASEHDRSDIR= ${CXXINCLUDEDIR} # Some of the different "C" header models need extra files. BASEXHDRS= ${SRCDIR}/include/c_std/cmath.tcc -BASEXHDRSDIR= ${INCLUDEDIR}/c++/3.3/bits +BASEXHDRSDIR= ${CXXINCLUDEDIR}/bits -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 \ - std_iosfwd.h std_iostream.h std_istream.h std_iterator.h \ - std_limits.h std_list.h std_locale.h std_map.h std_memory.h \ - std_numeric.h std_ostream.h std_queue.h std_set.h \ - std_sstream.h std_stack.h std_stdexcept.h std_streambuf.h \ - std_string.h std_utility.h std_valarray.h std_vector.h -.for h in ${STDHDRS} -STDHDRSNAME_$h=${h:R:S;^std_;;} -.endfor -STDHDRS:= ${STDHDRS:S;^;${SRCDIR}/include/std/;} -STDHDRSDIR= ${INCLUDEDIR}/c++/3.3 - -TARGETHDRS= io/basic_file_stdio.h io/c_io_stdio.h \ +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:= ${DEBUGHDRS:S;^;${SRCDIR}/include/debug/;} +DEBUGHDRSDIR= ${CXXINCLUDEDIR}/debug + +TARGETHDRS= 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/codecvt_specializations.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 \ os/bsd/freebsd/os_defines.h TARGETHDRS:= ${TARGETHDRS:S;^;${SRCDIR}/config/;} -TARGETHDRS+= ${.CURDIR}/c++config.h +TARGETHDRS+= c++config.h TARGETHDRSNAME_basic_file_stdio.h= basic_file.h TARGETHDRSNAME_c_io_stdio.h= c++io.h TARGETHDRSNAME_c_locale.h= c++locale.h -TARGETHDRSDIR= ${INCLUDEDIR}/c++/3.3/bits - -MARCHHDRS= atomicity.h -.if ${MACHINE_ARCH} == "sparc64" -MARCHDIR= sparc -.elif ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU} != 'i386' -MARCHDIR= i486 -.else -MARCHDIR= ${MACHINE_ARCH} -.endif +TARGETHDRSNAME_new_allocator_base.h= c++allocator.h +TARGETHDRSDIR= ${CXXINCLUDEDIR}/bits +MARCHHDRS= atomic_word.h .for h in ${MARCHHDRS} .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/${h}) TARGETHDRS+= ${SRCDIR}/config/cpu/${MARCHDIR}/${h} @@ -162,31 +181,45 @@ .endfor THRHDRS= gthr.h gthr-single.h gthr-posix.h gthr-default.h -THRHDRSDIR= ${INCLUDEDIR}/c++/3.3/bits +THRHDRSDIR= ${CXXINCLUDEDIR}/bits +uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] gthr.h: ${GCCDIR}/gthr.h - sed -e '/^#/s/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*\)/_GLIBCPP_\1/g' \ + sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \ + -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's,^#include "\(.*\)",#include ,g' \ - < ${GCCDIR}/gthr.h > gthr.h + < ${.ALLSRC} > ${.TARGET} gthr-single.h: ${GCCDIR}/gthr-single.h - sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \ - -e 's/\(GCC[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*_H\)/_GLIBCPP_\1/g' \ - < ${GCCDIR}/gthr-single.h > gthr-single.h + sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ + -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ + < ${.ALLSRC} > ${.TARGET} gthr-posix.h: ${GCCDIR}/gthr-posix.h - sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \ - -e 's/\(GCC[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*_H\)/_GLIBCPP_\1/g' \ - -e 's/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*WEAK\)/_GLIBCPP_\1/g' \ - < ${GCCDIR}/gthr-posix.h > 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\)/_GLIBCPP_\1/g' \ - -e 's/\(GCC[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*_H\)/_GLIBCPP_\1/g' \ - -e 's/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*WEAK\)/_GLIBCPP_\1/g' \ + 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' \ -e 's,^#include "\(.*\)",#include ,g' \ - < ${GCCDIR}/gthr-posix.h > gthr-default.h + < ${.ALLSRC} > ${.TARGET} CLEANFILES+= ${THRHDRS} +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' \ + -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ + -e 's/VERSION/_GLIBCXX_VERSION/g' \ + -e 's/WORDS_/_GLIBCXX_WORDS_/g' \ + < ${.CURDIR}/config.h >> ${.TARGET} && \ + echo "#endif // _CXXCONFIG_" >> ${.TARGET} +CLEANFILES+= c++config.h + .include cvs diff: gnu/lib/libstdc++/c++config.h was removed, no comparison available Index: gnu/lib/libstdc++/config.h =================================================================== RCS file: /usr/download/ncvs/src/gnu/lib/libstdc++/config.h,v retrieving revision 1.7 diff -u -r1.7 config.h --- gnu/lib/libstdc++/config.h 11 Jul 2003 05:33:24 -0000 1.7 +++ gnu/lib/libstdc++/config.h 4 Jun 2004 21:38:20 -0000 @@ -1,48 +1,74 @@ -/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.7 2003/07/11 05:33:24 kan Exp $ */ +/* $FreeBSD$ */ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* 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 */ -/* Define if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +// Include I/O support for 'long long' and 'unsigned long long'. +#define _GLIBCXX_USE_LONG_LONG 1 -// Define if GCC supports weak symbols. -#define _GLIBCPP_SUPPORTS_WEAK __GXX_WEAK__ +// Include support for 'long double'. +/* #undef _GLIBCXX_USE_LONG_DOUBLE */ -// Include I/O support for 'long long' and 'unsigned long long'. -#define _GLIBCPP_USE_LONG_LONG 1 +// 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 _GLIBCPP_USE_C99 1 +#define _GLIBCXX_USE_C99 1 // Define if code specialized for wchar_t should be used. -#define _GLIBCPP_USE_WCHAR_T 1 +#define _GLIBCXX_USE_WCHAR_T 1 // Define if using setrlimit to limit memory usage during 'make check'. -/* #undef _GLIBCPP_MEM_LIMITS */ +#define _GLIBCXX_MEM_LIMITS 1 // Define to use concept checking code from the boost libraries. -/* #undef _GLIBCPP_CONCEPT_CHECKS */ +/* #undef _GLIBCXX_CONCEPT_CHECKS */ // Define to use symbol versioning in the shared library. -/* #undef _GLIBCPP_SYMVER */ +/* #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: _GLIBCPP_AT_AT is a hack to work around quoting issues in m4. -#if _GLIBCPP_SYMVER - #define _GLIBCPP_ASM_SYMVER(cur, old, version) \ - asm (".symver " #cur "," #old _GLIBCPP_AT_AT #version); +// 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 _GLIBCPP_ASM_SYMVER(cur, old, version) + #define _GLIBCXX_ASM_SYMVER(cur, old, version) #endif +// Define if LFS support is available. +/* #undef _GLIBCXX_USE_LFS */ + +// 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 drand48 exists. -#define HAVE_DRAND48 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 @@ -68,6 +94,9 @@ // 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 @@ -108,13 +137,13 @@ #define HAVE___BUILTIN_SINL 1 // Define if the compiler/host combination has __builtin_sqrt -/* #undef HAVE___BUILTIN_SQRT */ +#define HAVE___BUILTIN_SQRT 1 // Define if the compiler/host combination has __builtin_sqrtf -/* #undef HAVE___BUILTIN_SQRTF */ +#define HAVE___BUILTIN_SQRTF 1 // Define if the compiler/host combination has __builtin_sqrtl -/* #undef HAVE___BUILTIN_SQRTL */ +#define HAVE___BUILTIN_SQRTL 1 // Define if poll is available in . #define HAVE_POLL 1 @@ -125,696 +154,738 @@ // Define if S_IFREG is available in . /* #undef HAVE_S_IFREG */ -// Define if LC_MESSAGES is available in . -#define HAVE_LC_MESSAGES 1 - -/* Define if you have the __signbit function. */ -#define HAVE___SIGNBIT 1 - -/* Define if you have the __signbitf function. */ -/* #undef HAVE___SIGNBITF */ - -/* Define if you have the __signbitl function. */ -/* #undef HAVE___SIGNBITL */ - -/* Define if you have the _acosf function. */ -/* #undef HAVE__ACOSF */ - -/* Define if you have the _acosl function. */ -/* #undef HAVE__ACOSL */ - -/* Define if you have the _asinf function. */ -/* #undef HAVE__ASINF */ - -/* Define if you have the _asinl function. */ -/* #undef HAVE__ASINL */ - -/* Define if you have the _atan2f function. */ -/* #undef HAVE__ATAN2F */ - -/* Define if you have the _atan2l function. */ -/* #undef HAVE__ATAN2L */ - -/* Define if you have the _atanf function. */ -/* #undef HAVE__ATANF */ - -/* Define if you have the _atanl function. */ -/* #undef HAVE__ATANL */ - -/* Define if you have the _ceilf function. */ -/* #undef HAVE__CEILF */ - -/* Define if you have the _ceill function. */ -/* #undef HAVE__CEILL */ - -/* Define if you have the _copysign function. */ -/* #undef HAVE__COPYSIGN */ - -/* Define if you have the _copysignl function. */ -/* #undef HAVE__COPYSIGNL */ - -/* Define if you have the _cosf function. */ -/* #undef HAVE__COSF */ - -/* Define if you have the _coshf function. */ -/* #undef HAVE__COSHF */ - -/* Define if you have the _coshl function. */ -/* #undef HAVE__COSHL */ - -/* Define if you have the _cosl function. */ -/* #undef HAVE__COSL */ - -/* Define if you have the _expf function. */ -/* #undef HAVE__EXPF */ - -/* Define if you have the _expl function. */ -/* #undef HAVE__EXPL */ - -/* Define if you have the _fabsf function. */ -/* #undef HAVE__FABSF */ - -/* Define if you have the _fabsl function. */ -/* #undef HAVE__FABSL */ - -/* Define if you have the _finite function. */ -/* #undef HAVE__FINITE */ - -/* Define if you have the _finitef function. */ -/* #undef HAVE__FINITEF */ - -/* Define if you have the _finitel function. */ -/* #undef HAVE__FINITEL */ - -/* Define if you have the _floorf function. */ -/* #undef HAVE__FLOORF */ - -/* Define if you have the _floorl function. */ -/* #undef HAVE__FLOORL */ - -/* Define if you have the _fmodf function. */ -/* #undef HAVE__FMODF */ - -/* Define if you have the _fmodl function. */ -/* #undef HAVE__FMODL */ - -/* Define if you have the _fpclass function. */ -/* #undef HAVE__FPCLASS */ - -/* Define if you have the _frexpf function. */ -/* #undef HAVE__FREXPF */ +// Define if writev is available in . +#define HAVE_WRITEV 1 -/* Define if you have the _frexpl function. */ -/* #undef HAVE__FREXPL */ - -/* Define if you have the _hypot function. */ -/* #undef HAVE__HYPOT */ +// Define if int64_t is available in . +#define HAVE_INT64_T 1 -/* Define if you have the _hypotf function. */ -/* #undef HAVE__HYPOTF */ - -/* Define if you have the _hypotl function. */ -/* #undef HAVE__HYPOTL */ - -/* Define if you have the _isinf function. */ -/* #undef HAVE__ISINF */ - -/* Define if you have the _isinff function. */ -/* #undef HAVE__ISINFF */ - -/* Define if you have the _isinfl function. */ -/* #undef HAVE__ISINFL */ - -/* Define if you have the _isnan function. */ -/* #undef HAVE__ISNAN */ - -/* Define if you have the _isnanf function. */ -/* #undef HAVE__ISNANF */ - -/* Define if you have the _isnanl function. */ -/* #undef HAVE__ISNANL */ - -/* Define if you have the _ldexpf function. */ -/* #undef HAVE__LDEXPF */ - -/* Define if you have the _ldexpl function. */ -/* #undef HAVE__LDEXPL */ - -/* Define if you have the _log10f function. */ -/* #undef HAVE__LOG10F */ - -/* Define if you have the _log10l function. */ -/* #undef HAVE__LOG10L */ - -/* Define if you have the _logf function. */ -/* #undef HAVE__LOGF */ - -/* Define if you have the _logl function. */ -/* #undef HAVE__LOGL */ - -/* Define if you have the _modff function. */ -/* #undef HAVE__MODFF */ - -/* Define if you have the _modfl function. */ -/* #undef HAVE__MODFL */ - -/* Define if you have the _powf function. */ -/* #undef HAVE__POWF */ - -/* Define if you have the _powl function. */ -/* #undef HAVE__POWL */ - -/* Define if you have the _qfpclass function. */ -/* #undef HAVE__QFPCLASS */ - -/* Define if you have the _sincos function. */ -/* #undef HAVE__SINCOS */ - -/* Define if you have the _sincosf function. */ -/* #undef HAVE__SINCOSF */ - -/* Define if you have the _sincosl function. */ -/* #undef HAVE__SINCOSL */ - -/* Define if you have the _sinf function. */ -/* #undef HAVE__SINF */ - -/* Define if you have the _sinhf function. */ -/* #undef HAVE__SINHF */ - -/* Define if you have the _sinhl function. */ -/* #undef HAVE__SINHL */ - -/* Define if you have the _sinl function. */ -/* #undef HAVE__SINL */ - -/* Define if you have the _sqrtf function. */ -/* #undef HAVE__SQRTF */ - -/* Define if you have the _sqrtl function. */ -/* #undef HAVE__SQRTL */ - -/* Define if you have the _tanf function. */ -/* #undef HAVE__TANF */ +// Define if LC_MESSAGES is available in . +#define HAVE_LC_MESSAGES 1 -/* Define if you have the _tanhf function. */ -/* #undef HAVE__TANHF */ +// Define if exists. +#define HAVE_FLOAT_H 1 -/* Define if you have the _tanhl function. */ -/* #undef HAVE__TANHL */ +// Define if modf is present in +/* #undef HAVE_MODF */ -/* Define if you have the _tanl function. */ -/* #undef HAVE__TANL */ -/* Define if you have the acosf function. */ +/* Define to 1 if you have the `acosf' function. */ #define HAVE_ACOSF 1 -/* Define if you have the acosl function. */ +/* Define to 1 if you have the `acosl' function. */ /* #undef HAVE_ACOSL */ -/* Define if you have the asinf function. */ +/* Define to 1 if you have the `asinf' function. */ #define HAVE_ASINF 1 -/* Define if you have the asinl function. */ +/* Define to 1 if you have the `asinl' function. */ /* #undef HAVE_ASINL */ -/* Define if you have the atan2f function. */ +/* Define to 1 if you have the `atan2f' function. */ #define HAVE_ATAN2F 1 -/* Define if you have the atan2l function. */ +/* Define to 1 if you have the `atan2l' function. */ /* #undef HAVE_ATAN2L */ -/* Define if you have the atanf function. */ +/* Define to 1 if you have the `atanf' function. */ #define HAVE_ATANF 1 -/* Define if you have the atanl function. */ +/* Define to 1 if you have the `atanl' function. */ /* #undef HAVE_ATANL */ -/* Define if you have the btowc function. */ +/* Define to 1 if you have the `btowc' function. */ #define HAVE_BTOWC 1 -/* Define if you have the ceilf function. */ +/* Define to 1 if you have the `ceilf' function. */ #define HAVE_CEILF 1 -/* Define if you have the ceill function. */ +/* Define to 1 if you have the `ceill' function. */ /* #undef HAVE_CEILL */ -/* Define if you have the copysign function. */ +/* Define to 1 if you have the `copysign' function. */ #define HAVE_COPYSIGN 1 -/* Define if you have the copysignf function. */ +/* Define to 1 if you have the `copysignf' function. */ #define HAVE_COPYSIGNF 1 -/* Define if you have the copysignl function. */ -/* #undef HAVE_COPYSIGNL */ +/* Define to 1 if you have the `copysignl' function. */ +#define HAVE_COPYSIGNL 1 -/* Define if you have the cosf function. */ +/* Define to 1 if you have the `cosf' function. */ #define HAVE_COSF 1 -/* Define if you have the coshf function. */ +/* Define to 1 if you have the `coshf' function. */ #define HAVE_COSHF 1 -/* Define if you have the coshl function. */ +/* Define to 1 if you have the `coshl' function. */ /* #undef HAVE_COSHL */ -/* Define if you have the cosl function. */ +/* Define to 1 if you have the `cosl' function. */ /* #undef HAVE_COSL */ -/* Define if you have the drand48 function. */ -#define HAVE_DRAND48 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ENDIAN_H */ -/* Define if you have the expf function. */ +/* Define to 1 if you have the `expf' function. */ #define HAVE_EXPF 1 -/* Define if you have the expl function. */ +/* Define to 1 if you have the `expl' function. */ /* #undef HAVE_EXPL */ -/* Define if you have the fabsf function. */ +/* Define to 1 if you have the `fabsf' function. */ #define HAVE_FABSF 1 -/* Define if you have the fabsl function. */ -/* #undef HAVE_FABSL */ +/* Define to 1 if you have the `fabsl' function. */ +#define HAVE_FABSL 1 -/* Define if you have the fgetwc function. */ +/* Define to 1 if you have the `fgetwc' function. */ #define HAVE_FGETWC 1 -/* Define if you have the fgetws function. */ +/* Define to 1 if you have the `fgetws' function. */ #define HAVE_FGETWS 1 -/* Define if you have the finite function. */ +/* Define to 1 if you have the `finite' function. */ #define HAVE_FINITE 1 -/* Define if you have the finitef function. */ +/* Define to 1 if you have the `finitef' function. */ #define HAVE_FINITEF 1 -/* Define if you have the finitel function. */ +/* Define to 1 if you have the `finitel' function. */ /* #undef HAVE_FINITEL */ -/* Define if you have the floorf function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `floorf' function. */ #define HAVE_FLOORF 1 -/* Define if you have the floorl function. */ +/* Define to 1 if you have the `floorl' function. */ /* #undef HAVE_FLOORL */ -/* Define if you have the fmodf function. */ +/* Define to 1 if you have the `fmodf' function. */ #define HAVE_FMODF 1 -/* Define if you have the fmodl function. */ +/* Define to 1 if you have the `fmodl' function. */ /* #undef HAVE_FMODL */ -/* Define if you have the fpclass function. */ +/* Define to 1 if you have the `fpclass' function. */ /* #undef HAVE_FPCLASS */ -/* Define if you have the fputwc function. */ +/* Define to 1 if you have the `fputwc' function. */ #define HAVE_FPUTWC 1 -/* Define if you have the fputws function. */ +/* Define to 1 if you have the `fputws' function. */ #define HAVE_FPUTWS 1 -/* Define if you have the frexpf function. */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FP_H */ + +/* Define to 1 if you have the `frexpf' function. */ #define HAVE_FREXPF 1 -/* Define if you have the frexpl function. */ +/* Define to 1 if you have the `frexpl' function. */ /* #undef HAVE_FREXPL */ -/* Define if you have the fwide function. */ +/* Define to 1 if you have the `fwide' function. */ #define HAVE_FWIDE 1 -/* Define if you have the fwprintf function. */ +/* Define to 1 if you have the `fwprintf' function. */ #define HAVE_FWPRINTF 1 -/* Define if you have the fwscanf function. */ +/* Define to 1 if you have the `fwscanf' function. */ #define HAVE_FWSCANF 1 -/* Define if you have the getpagesize function. */ +/* 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 if you have the getwc function. */ +/* Define to 1 if you have the `getwc' function. */ #define HAVE_GETWC 1 -/* Define if you have the getwchar function. */ +/* Define to 1 if you have the `getwchar' function. */ #define HAVE_GETWCHAR 1 -/* Define if you have the hypot function. */ +/* Define to 1 if you have the `hypot' function. */ #define HAVE_HYPOT 1 -/* Define if you have the hypotf function. */ +/* Define to 1 if you have the `hypotf' function. */ #define HAVE_HYPOTF 1 -/* Define if you have the hypotl function. */ +/* Define to 1 if you have the `hypotl' function. */ /* #undef HAVE_HYPOTL */ -/* Define if you have the iconv function. */ -/* #undef HAVE_ICONV */ +/* Define to 1 if you have the `iconv' function. */ +#define HAVE_ICONV 1 -/* Define if you have the iconv_close function. */ -/* #undef HAVE_ICONV_CLOSE */ +/* Define to 1 if you have the `iconv_close' function. */ +#define HAVE_ICONV_CLOSE 1 -/* Define if you have the iconv_open function. */ -/* #undef HAVE_ICONV_OPEN */ +/* Define to 1 if you have the `iconv_open' function. */ +#define HAVE_ICONV_OPEN 1 -/* Define if you have the isatty function. */ -#define HAVE_ISATTY 1 +/* Define to 1 if you have the header file. */ +#define HAVE_IEEEFP_H 1 -/* Define if you have the isinf function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isinf' function. */ #define HAVE_ISINF 1 -/* Define if you have the isinff function. */ +/* Define to 1 if you have the `isinff' function. */ /* #undef HAVE_ISINFF */ -/* Define if you have the isinfl function. */ +/* Define to 1 if you have the `isinfl' function. */ /* #undef HAVE_ISINFL */ -/* Define if you have the isnan function. */ +/* Define to 1 if you have the `isnan' function. */ #define HAVE_ISNAN 1 -/* Define if you have the isnanf function. */ +/* Define to 1 if you have the `isnanf' function. */ #define HAVE_ISNANF 1 -/* Define if you have the isnanl function. */ +/* Define to 1 if you have the `isnanl' function. */ /* #undef HAVE_ISNANL */ -/* Define if you have the ldexpf function. */ +/* Define to 1 if you have the `iswblank' function. */ +#define HAVE_ISWBLANK 1 + +/* Define to 1 if you have the `ldexpf' function. */ #define HAVE_LDEXPF 1 -/* Define if you have the ldexpl function. */ +/* Define to 1 if you have the `ldexpl' function. */ /* #undef HAVE_LDEXPL */ -/* Define if you have the log10f function. */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBINTL_H */ + +/* Define to 1 if you have the `m' library (-lm). */ +#define HAVE_LIBM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the `log10f' function. */ #define HAVE_LOG10F 1 -/* Define if you have the log10l function. */ +/* Define to 1 if you have the `log10l' function. */ /* #undef HAVE_LOG10L */ -/* Define if you have the logf function. */ +/* Define to 1 if you have the `logf' function. */ #define HAVE_LOGF 1 -/* Define if you have the logl function. */ +/* Define to 1 if you have the `logl' function. */ /* #undef HAVE_LOGL */ -/* Define if you have the mbrlen function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_MACHINE_ENDIAN_H 1 + +/* 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 if you have the mbrtowc function. */ +/* Define to 1 if you have the `mbrtowc' function. */ #define HAVE_MBRTOWC 1 -/* Define if you have the mbsinit function. */ +/* Define to 1 if you have the `mbsinit' function. */ #define HAVE_MBSINIT 1 -/* Define if you have the mbsrtowcs function. */ +/* Define to 1 if you have the `mbsrtowcs' function. */ #define HAVE_MBSRTOWCS 1 -/* Define if you have the modff function. */ +/* Only used in build directory testsuite_hooks.h. */ +#define HAVE_MEMLIMIT_AS 0 + +/* Only used in build directory testsuite_hooks.h. */ +#define HAVE_MEMLIMIT_DATA 1 + +/* Only used in build directory testsuite_hooks.h. */ +#define HAVE_MEMLIMIT_RSS 1 + +/* Only used in build directory testsuite_hooks.h. */ +#define HAVE_MEMLIMIT_VMEM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the `modff' function. */ #define HAVE_MODFF 1 -/* Define if you have the modfl function. */ +/* Define to 1 if you have the `modfl' function. */ /* #undef HAVE_MODFL */ -/* Define if you have the nan function. */ -/* #undef HAVE_NAN */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NAN_H */ -/* Define if you have the nl_langinfo function. */ +/* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 -/* Define if you have the powf function. */ +/* Define to 1 if you have the `powf' function. */ #define HAVE_POWF 1 -/* Define if you have the powl function. */ +/* Define to 1 if you have the `powl' function. */ /* #undef HAVE_POWL */ -/* Define if you have the putwc function. */ +/* Define to 1 if you have the `putwc' function. */ #define HAVE_PUTWC 1 -/* Define if you have the putwchar function. */ +/* Define to 1 if you have the `putwchar' function. */ #define HAVE_PUTWCHAR 1 -/* Define if you have the qfpclass function. */ +/* Define to 1 if you have the `qfpclass' function. */ /* #undef HAVE_QFPCLASS */ -/* Define if you have the setenv function. */ +/* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define if you have the sincos function. */ +/* Define if sigsetjmp is available. */ +#define HAVE_SIGSETJMP 1 + +/* Define to 1 if you have the `sincos' function. */ /* #undef HAVE_SINCOS */ -/* Define if you have the sincosf function. */ +/* Define to 1 if you have the `sincosf' function. */ /* #undef HAVE_SINCOSF */ -/* Define if you have the sincosl function. */ +/* Define to 1 if you have the `sincosl' function. */ /* #undef HAVE_SINCOSL */ -/* Define if you have the sinf function. */ +/* Define to 1 if you have the `sinf' function. */ #define HAVE_SINF 1 -/* Define if you have the sinhf function. */ +/* Define to 1 if you have the `sinhf' function. */ #define HAVE_SINHF 1 -/* Define if you have the sinhl function. */ +/* Define to 1 if you have the `sinhl' function. */ /* #undef HAVE_SINHL */ -/* Define if you have the sinl function. */ +/* Define to 1 if you have the `sinl' function. */ /* #undef HAVE_SINL */ -/* Define if you have the sqrtf function. */ +/* Define to 1 if you have the `sqrtf' function. */ #define HAVE_SQRTF 1 -/* Define if you have the sqrtl function. */ +/* Define to 1 if you have the `sqrtl' function. */ /* #undef HAVE_SQRTL */ -/* Define if you have the strtof function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strtof' function. */ #define HAVE_STRTOF 1 -/* Define if you have the strtold function. */ +/* Define to 1 if you have the `strtold' function. */ #define HAVE_STRTOLD 1 -/* Define if you have the swprintf function. */ +/* Define to 1 if you have the `swprintf' function. */ #define HAVE_SWPRINTF 1 -/* Define if you have the swscanf function. */ +/* Define to 1 if you have the `swscanf' function. */ #define HAVE_SWSCANF 1 -/* Define if you have the tanf function. */ +/* 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. */ +/* #undef HAVE_SYS_ISA_DEFS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MACHINE_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_PARAM_H */ + +/* 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_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the `tanf' function. */ #define HAVE_TANF 1 -/* Define if you have the tanhf function. */ +/* Define to 1 if you have the `tanhf' function. */ #define HAVE_TANHF 1 -/* Define if you have the tanhl function. */ +/* Define to 1 if you have the `tanhl' function. */ /* #undef HAVE_TANHL */ -/* Define if you have the tanl function. */ +/* Define to 1 if you have the `tanl' function. */ /* #undef HAVE_TANL */ -/* Define if you have the ungetwc function. */ +/* Define to 1 if you have the `ungetwc' function. */ #define HAVE_UNGETWC 1 -/* Define if you have the vfwprintf function. */ +/* 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 -/* Define if you have the vfwscanf function. */ +/* Define to 1 if you have the `vfwscanf' function. */ #define HAVE_VFWSCANF 1 -/* Define if you have the vswprintf function. */ +/* Define to 1 if you have the `vswprintf' function. */ #define HAVE_VSWPRINTF 1 -/* Define if you have the vswscanf function. */ +/* Define to 1 if you have the `vswscanf' function. */ #define HAVE_VSWSCANF 1 -/* Define if you have the vwprintf function. */ +/* Define to 1 if you have the `vwprintf' function. */ #define HAVE_VWPRINTF 1 -/* Define if you have the vwscanf function. */ +/* Define to 1 if you have the `vwscanf' function. */ #define HAVE_VWSCANF 1 -/* Define if you have the wcrtomb function. */ +/* 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 if you have the wcscat function. */ +/* Define to 1 if you have the `wcscat' function. */ #define HAVE_WCSCAT 1 -/* Define if you have the wcschr function. */ +/* Define to 1 if you have the `wcschr' function. */ #define HAVE_WCSCHR 1 -/* Define if you have the wcscmp function. */ +/* Define to 1 if you have the `wcscmp' function. */ #define HAVE_WCSCMP 1 -/* Define if you have the wcscoll function. */ +/* Define to 1 if you have the `wcscoll' function. */ #define HAVE_WCSCOLL 1 -/* Define if you have the wcscpy function. */ +/* Define to 1 if you have the `wcscpy' function. */ #define HAVE_WCSCPY 1 -/* Define if you have the wcscspn function. */ +/* Define to 1 if you have the `wcscspn' function. */ #define HAVE_WCSCSPN 1 -/* Define if you have the wcsftime function. */ +/* Define to 1 if you have the `wcsftime' function. */ #define HAVE_WCSFTIME 1 -/* Define if you have the wcslen function. */ +/* Define to 1 if you have the `wcslen' function. */ #define HAVE_WCSLEN 1 -/* Define if you have the wcsncat function. */ +/* Define to 1 if you have the `wcsncat' function. */ #define HAVE_WCSNCAT 1 -/* Define if you have the wcsncmp function. */ +/* Define to 1 if you have the `wcsncmp' function. */ #define HAVE_WCSNCMP 1 -/* Define if you have the wcsncpy function. */ +/* Define to 1 if you have the `wcsncpy' function. */ #define HAVE_WCSNCPY 1 -/* Define if you have the wcspbrk function. */ +/* Define to 1 if you have the `wcspbrk' function. */ #define HAVE_WCSPBRK 1 -/* Define if you have the wcsrchr function. */ +/* Define to 1 if you have the `wcsrchr' function. */ #define HAVE_WCSRCHR 1 -/* Define if you have the wcsrtombs function. */ +/* Define to 1 if you have the `wcsrtombs' function. */ #define HAVE_WCSRTOMBS 1 -/* Define if you have the wcsspn function. */ +/* Define to 1 if you have the `wcsspn' function. */ #define HAVE_WCSSPN 1 -/* Define if you have the wcsstr function. */ +/* Define to 1 if you have the `wcsstr' function. */ #define HAVE_WCSSTR 1 -/* Define if you have the wcstod function. */ +/* Define to 1 if you have the `wcstod' function. */ #define HAVE_WCSTOD 1 -/* Define if you have the wcstof function. */ +/* Define to 1 if you have the `wcstof' function. */ #define HAVE_WCSTOF 1 -/* Define if you have the wcstok function. */ +/* Define to 1 if you have the `wcstok' function. */ #define HAVE_WCSTOK 1 -/* Define if you have the wcstol function. */ +/* Define to 1 if you have the `wcstol' function. */ #define HAVE_WCSTOL 1 -/* Define if you have the wcstoul function. */ +/* Define to 1 if you have the `wcstoul' function. */ #define HAVE_WCSTOUL 1 -/* Define if you have the wcsxfrm function. */ +/* Define to 1 if you have the `wcsxfrm' function. */ #define HAVE_WCSXFRM 1 -/* Define if you have the wctob function. */ +/* Define to 1 if you have the `wctob' function. */ #define HAVE_WCTOB 1 -/* Define if you have the wmemchr function. */ +/* 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 if you have the wmemcmp function. */ +/* Define to 1 if you have the `wmemcmp' function. */ #define HAVE_WMEMCMP 1 -/* Define if you have the wmemcpy function. */ +/* Define to 1 if you have the `wmemcpy' function. */ #define HAVE_WMEMCPY 1 -/* Define if you have the wmemmove function. */ +/* Define to 1 if you have the `wmemmove' function. */ #define HAVE_WMEMMOVE 1 -/* Define if you have the wmemset function. */ +/* Define to 1 if you have the `wmemset' function. */ #define HAVE_WMEMSET 1 -/* Define if you have the wprintf function. */ +/* Define to 1 if you have the `wprintf' function. */ #define HAVE_WPRINTF 1 -/* Define if you have the wscanf function. */ +/* Define to 1 if you have the `wscanf' function. */ #define HAVE_WSCANF 1 -/* Define if you have the header file. */ -/* #undef HAVE_ENDIAN_H */ +/* Define to 1 if you have the `_acosf' function. */ +/* #undef HAVE__ACOSF */ -/* Define if you have the header file. */ -#define HAVE_FLOAT_H 1 +/* Define to 1 if you have the `_acosl' function. */ +/* #undef HAVE__ACOSL */ -/* Define if you have the header file. */ -/* #undef HAVE_FP_H */ +/* Define to 1 if you have the `_asinf' function. */ +/* #undef HAVE__ASINF */ -/* Define if you have the header file. */ -/* #undef HAVE_GCONV_H */ +/* Define to 1 if you have the `_asinl' function. */ +/* #undef HAVE__ASINL */ -/* Define if you have the header file. */ -#define HAVE_IEEEFP_H 1 +/* Define to 1 if you have the `_atan2f' function. */ +/* #undef HAVE__ATAN2F */ -/* Define if you have the header file. */ -#define HAVE_INTTYPES_H 1 +/* Define to 1 if you have the `_atan2l' function. */ +/* #undef HAVE__ATAN2L */ -/* Define if you have the header file. */ -#define HAVE_LOCALE_H 1 +/* Define to 1 if you have the `_atanf' function. */ +/* #undef HAVE__ATANF */ -/* Define if you have the header file. */ -#define HAVE_MACHINE_ENDIAN_H 1 +/* Define to 1 if you have the `_atanl' function. */ +/* #undef HAVE__ATANL */ -/* Define if you have the header file. */ -#define HAVE_MACHINE_PARAM_H 1 +/* Define to 1 if you have the `_ceilf' function. */ +/* #undef HAVE__CEILF */ -/* Define if you have the header file. */ -/* #undef HAVE_NAN_H */ +/* Define to 1 if you have the `_ceill' function. */ +/* #undef HAVE__CEILL */ -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 +/* Define to 1 if you have the `_copysign' function. */ +/* #undef HAVE__COPYSIGN */ -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 +/* Define to 1 if you have the `_copysignl' function. */ +/* #undef HAVE__COPYSIGNL */ -/* Define if you have the header file. */ -#define HAVE_SYS_FILIO_H 1 +/* Define to 1 if you have the `_cosf' function. */ +/* #undef HAVE__COSF */ -/* Define if you have the header file. */ -#define HAVE_SYS_IOCTL_H 1 +/* Define to 1 if you have the `_coshf' function. */ +/* #undef HAVE__COSHF */ -/* Define if you have the header file. */ -/* #undef HAVE_SYS_ISA_DEFS_H */ +/* Define to 1 if you have the `_coshl' function. */ +/* #undef HAVE__COSHL */ -/* Define if you have the header file. */ -/* #undef HAVE_SYS_MACHINE_H */ +/* Define to 1 if you have the `_cosl' function. */ +/* #undef HAVE__COSL */ -/* Define if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 +/* Define to 1 if you have the `_expf' function. */ +/* #undef HAVE__EXPF */ -/* Define if you have the header file. */ -#define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the `_expl' function. */ +/* #undef HAVE__EXPL */ -/* Define if you have the header file. */ -#define HAVE_SYS_TIME_H 1 +/* Define to 1 if you have the `_fabsf' function. */ +/* #undef HAVE__FABSF */ -/* Define if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the `_fabsl' function. */ +/* #undef HAVE__FABSL */ -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `_finite' function. */ +/* #undef HAVE__FINITE */ -/* Define if you have the header file. */ -#define HAVE_WCHAR_H 1 +/* Define to 1 if you have the `_finitef' function. */ +/* #undef HAVE__FINITEF */ -/* Define if you have the header file. */ -#define HAVE_WCTYPE_H 1 +/* Define to 1 if you have the `_finitel' function. */ +/* #undef HAVE__FINITEL */ -/* Define if you have the m library (-lm). */ -#define HAVE_LIBM 1 +/* Define to 1 if you have the `_floorf' function. */ +/* #undef HAVE__FLOORF */ -/* Name of package */ -#define PACKAGE "libstdc++" +/* Define to 1 if you have the `_floorl' function. */ +/* #undef HAVE__FLOORL */ -/* Version number of package */ -#define VERSION "3.3.1" +/* Define to 1 if you have the `_fmodf' function. */ +/* #undef HAVE__FMODF */ -/* Define if the compiler is configured for setjmp/longjmp exceptions. */ -/* #undef _GLIBCPP_SJLJ_EXCEPTIONS */ +/* Define to 1 if you have the `_fmodl' function. */ +/* #undef HAVE__FMODL */ -/* Define if sigsetjmp is available. */ -#define HAVE_SIGSETJMP 1 +/* Define to 1 if you have the `_fpclass' function. */ +/* #undef HAVE__FPCLASS */ -/* Only used in build directory testsuite_hooks.h. */ -#define HAVE_MEMLIMIT_DATA 0 +/* Define to 1 if you have the `_frexpf' function. */ +/* #undef HAVE__FREXPF */ -/* Only used in build directory testsuite_hooks.h. */ -#define HAVE_MEMLIMIT_RSS 0 +/* Define to 1 if you have the `_frexpl' function. */ +/* #undef HAVE__FREXPL */ -/* Only used in build directory testsuite_hooks.h. */ -#define HAVE_MEMLIMIT_VMEM 0 +/* Define to 1 if you have the `_hypot' function. */ +/* #undef HAVE__HYPOT */ -/* Only used in build directory testsuite_hooks.h. */ -#define HAVE_MEMLIMIT_AS 0 +/* Define to 1 if you have the `_hypotf' function. */ +/* #undef HAVE__HYPOTF */ + +/* Define to 1 if you have the `_hypotl' function. */ +/* #undef HAVE__HYPOTL */ + +/* Define to 1 if you have the `_isinf' function. */ +/* #undef HAVE__ISINF */ + +/* Define to 1 if you have the `_isinff' function. */ +/* #undef HAVE__ISINFF */ + +/* Define to 1 if you have the `_isinfl' function. */ +/* #undef HAVE__ISINFL */ + +/* Define to 1 if you have the `_isnan' function. */ +/* #undef HAVE__ISNAN */ + +/* Define to 1 if you have the `_isnanf' function. */ +/* #undef HAVE__ISNANF */ + +/* Define to 1 if you have the `_isnanl' function. */ +/* #undef HAVE__ISNANL */ + +/* Define to 1 if you have the `_ldexpf' function. */ +/* #undef HAVE__LDEXPF */ + +/* Define to 1 if you have the `_ldexpl' function. */ +/* #undef HAVE__LDEXPL */ + +/* Define to 1 if you have the `_log10f' function. */ +/* #undef HAVE__LOG10F */ + +/* Define to 1 if you have the `_log10l' function. */ +/* #undef HAVE__LOG10L */ +/* Define to 1 if you have the `_logf' function. */ +/* #undef HAVE__LOGF */ + +/* Define to 1 if you have the `_logl' function. */ +/* #undef HAVE__LOGL */ + +/* Define to 1 if you have the `_modff' function. */ +/* #undef HAVE__MODFF */ + +/* Define to 1 if you have the `_modfl' function. */ +/* #undef HAVE__MODFL */ + +/* Define to 1 if you have the `_powf' function. */ +/* #undef HAVE__POWF */ + +/* Define to 1 if you have the `_powl' function. */ +/* #undef HAVE__POWL */ + +/* Define to 1 if you have the `_qfpclass' function. */ +/* #undef HAVE__QFPCLASS */ + +/* Define to 1 if you have the `_sincos' function. */ +/* #undef HAVE__SINCOS */ + +/* Define to 1 if you have the `_sincosf' function. */ +/* #undef HAVE__SINCOSF */ + +/* Define to 1 if you have the `_sincosl' function. */ +/* #undef HAVE__SINCOSL */ + +/* Define to 1 if you have the `_sinf' function. */ +/* #undef HAVE__SINF */ + +/* Define to 1 if you have the `_sinhf' function. */ +/* #undef HAVE__SINHF */ + +/* Define to 1 if you have the `_sinhl' function. */ +/* #undef HAVE__SINHL */ + +/* Define to 1 if you have the `_sinl' function. */ +/* #undef HAVE__SINL */ + +/* Define to 1 if you have the `_sqrtf' function. */ +/* #undef HAVE__SQRTF */ + +/* Define to 1 if you have the `_sqrtl' function. */ +/* #undef HAVE__SQRTL */ + +/* Define to 1 if you have the `_tanf' function. */ +/* #undef HAVE__TANF */ + +/* Define to 1 if you have the `_tanhf' function. */ +/* #undef HAVE__TANHF */ + +/* Define to 1 if you have the `_tanhl' function. */ +/* #undef HAVE__TANHL */ + +/* Define to 1 if you have the `_tanl' function. */ +/* #undef HAVE__TANL */ + +/* Define to 1 if you have the `__signbit' function. */ +#define HAVE___SIGNBIT 1 + +/* Define to 1 if you have the `__signbitf' function. */ +/* #undef HAVE___SIGNBITF */ + +/* Define to 1 if you have the `__signbitl' function. */ +/* #undef HAVE___SIGNBITL */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "package-unused" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "package-unused version-unused" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libstdc++" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "version-unused" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* 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. Index: gnu/lib/libsupc++/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/lib/libsupc++/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- gnu/lib/libsupc++/Makefile 11 Jul 2003 05:37:22 -0000 1.5 +++ gnu/lib/libsupc++/Makefile 2 Jun 2004 16:46:05 -0000 @@ -14,7 +14,7 @@ pure.cc tinfo.cc tinfo2.cc vec.cc # from libiberty: -SRCS+= cp-demangle.c dyn-string.c +SRCS+= cp-demangle.c CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++ @@ -22,6 +22,6 @@ HDRS= exception new typeinfo cxxabi.h exception_defines.h INCS= ${HDRS:S;^;${SRCDIR}/;} -INCSDIR=${INCLUDEDIR}/c++/3.3 +INCSDIR=${INCLUDEDIR}/c++/3.4 .include Index: gnu/usr.bin/binutils/as/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/binutils/as/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- gnu/usr.bin/binutils/as/Makefile 8 Jul 2004 17:05:30 -0000 1.13 +++ gnu/usr.bin/binutils/as/Makefile 13 Jul 2004 19:50:48 -0000 @@ -4,6 +4,7 @@ # BINDIR .include "${.CURDIR}/../../Makefile.inc" WARNS?= 2 +NO_WERROR= yes .include "${.CURDIR}/../Makefile.inc0" .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config Index: gnu/usr.bin/cc/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/Makefile,v retrieving revision 1.35 diff -u -r1.35 Makefile --- gnu/usr.bin/cc/Makefile 11 Jul 2003 05:37:23 -0000 1.35 +++ gnu/usr.bin/cc/Makefile 4 Jun 2004 21:22:41 -0000 @@ -10,7 +10,7 @@ .endif .if !defined(NO_CXX) -SUBDIR+= cc1plus c++ c++filt +SUBDIR+= cc1plus c++ .if !defined(NO_COLLECT2) #SUBDIR+= collect2 .endif Index: gnu/usr.bin/cc/Makefile.fe =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/Makefile.fe,v retrieving revision 1.2 diff -u -r1.2 Makefile.fe --- gnu/usr.bin/cc/Makefile.fe 10 May 2002 08:54:43 -0000 1.2 +++ gnu/usr.bin/cc/Makefile.fe 29 May 2004 02:40:14 -0000 @@ -3,3 +3,13 @@ # Front-end-only bits version!= sed -n /version_string/p ${GCCDIR}/version.c | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' + +# +# 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)\" \ + +CFLAGS+= ${DRIVER_DEFINES} Index: gnu/usr.bin/cc/Makefile.tgt =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/Makefile.tgt,v retrieving revision 1.7 diff -u -r1.7 Makefile.tgt --- gnu/usr.bin/cc/Makefile.tgt 26 Apr 2003 20:04:37 -0000 1.7 +++ gnu/usr.bin/cc/Makefile.tgt 13 Jul 2004 05:16:29 -0000 @@ -9,11 +9,11 @@ .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" GCC_CPU= i386 .elif ${TARGET_ARCH} == "ia64" +TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD GCC_CPU= ia64 .elif ${TARGET_ARCH} == "powerpc" GCC_CPU= rs6000 .elif ${TARGET_ARCH} == "sparc64" GCC_CPU= sparc TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc -CFLAGS+= -DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT} .endif Index: gnu/usr.bin/cc/c++/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/c++/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- gnu/usr.bin/cc/c++/Makefile 5 Feb 2004 22:44:20 -0000 1.20 +++ gnu/usr.bin/cc/c++/Makefile 4 Jun 2004 21:19:44 -0000 @@ -11,9 +11,6 @@ LINKS+= ${BINDIR}/c++ ${BINDIR}/CC NOMAN= 1 -CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" -CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" - DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} Index: gnu/usr.bin/cc/cc/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/cc/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- gnu/usr.bin/cc/cc/Makefile 5 Feb 2004 22:44:21 -0000 1.29 +++ gnu/usr.bin/cc/cc/Makefile 4 Jun 2004 21:20:00 -0000 @@ -13,9 +13,6 @@ LINKS= ${BINDIR}/cc ${BINDIR}/gcc MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 -CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" -CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" - DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} Index: gnu/usr.bin/cc/cc1/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- gnu/usr.bin/cc/cc1/Makefile 5 Feb 2004 22:44:21 -0000 1.30 +++ gnu/usr.bin/cc/cc1/Makefile 4 Jun 2004 21:20:09 -0000 @@ -5,14 +5,14 @@ .PATH: ${GCCDIR} PROG= cc1 -SRCS= main.c c-parse+%DIKED.c c-lang.c c-decl.c c-opts.c +SRCS= main.c c-parse+%DIKED.c c-lang.c stub-objc.c BINDIR= /usr/libexec NOMAN= 1 NOSHARED?=yes CFLAGS+= -I. -DPADD= ${LIBCC_INT} +DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} #----------------------------------------------------------------------- @@ -23,9 +23,8 @@ ${.ALLSRC} > ${.TARGET} c-parse.y: c-parse.in - sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \ - -e "/^ifc$$/d" \ - -e "/^end ifc$$/d" \ + 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 Index: gnu/usr.bin/cc/cc1obj/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/cc1obj/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- gnu/usr.bin/cc/cc1obj/Makefile 5 Feb 2004 22:44:21 -0000 1.23 +++ gnu/usr.bin/cc/cc1obj/Makefile 4 Jun 2004 21:20:16 -0000 @@ -5,14 +5,14 @@ .PATH: ${GCCDIR}/objc ${GCCDIR} PROG= cc1obj -SRCS= objc-parse+DIKED.c objc-act.c objc-lang.c main.c c-decl.c +SRCS= main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c BINDIR= /usr/libexec NOMAN= 1 NOSHARED?=yes CFLAGS+= -I${GCCDIR}/objc -I. -DPADD= ${LIBCC_INT} +DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} #----------------------------------------------------------------------- @@ -23,9 +23,8 @@ ${.ALLSRC} > ${.TARGET} objc-parse.y: c-parse.in - sed -e "/^ifc$$/,/^end ifc$$/d" \ - -e "/^ifobjc$$/d" \ - -e "/^end ifobjc$$/d" \ + 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 Index: gnu/usr.bin/cc/cc1plus/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/cc1plus/Makefile,v retrieving revision 1.34 diff -u -r1.34 Makefile --- gnu/usr.bin/cc/cc1plus/Makefile 5 Feb 2004 22:44:21 -0000 1.34 +++ gnu/usr.bin/cc/cc1plus/Makefile 4 Jun 2004 21:20:24 -0000 @@ -5,11 +5,11 @@ .PATH: ${GCCDIR}/cp ${GCCDIR} PROG= cc1plus -SRCS= parse+%DIKED.c parse.h cfns.h -SRCS+= main.c cp-lang.c c-opts.c \ - call.c class.c cvt.c decl.c decl2.c error.c except.c expr.c friend.c \ - init.c lex.c mangle.c method.c pt.c ptree.c repo.c rtti.c search.c \ - semantics.c spew.c tree.c typeck.c typeck2.c dump.c optimize.c +SRCS= cfns.h +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 BINDIR= /usr/libexec NOMAN= 1 @@ -17,25 +17,15 @@ CFLAGS+= -I${GCCDIR}/cp -I. -DPADD= ${LIBCC_INT} +PADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} #----------------------------------------------------------------------- # C++ parser - -parse+%DIKED.c y.tab.h: parse.c - sed -e "s/malloc/xmalloc/g" \ - -e "s/realloc/xrealloc/g" \ - ${.ALLSRC:M*c} > ${.TARGET} - -parse.h: y.tab.h - cp -pf y.tab.h ${.TARGET} - grep '^#define[ ]*YYEMPTY' ${.TARGET:S/h$/c/} >>${.TARGET} - cfns.h: cfns.gperf - gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' \ + gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ ${.ALLSRC} > ${.TARGET} -CLEANFILES= parse+%DIKED.c parse.c parse.h y.tab.h cfns.h +CLEANFILES= cfns.h .include Index: gnu/usr.bin/cc/cc_int/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/cc_int/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- gnu/usr.bin/cc/cc_int/Makefile 17 Feb 2004 03:18:24 -0000 1.40 +++ gnu/usr.bin/cc/cc_int/Makefile 13 Jul 2004 04:23:09 -0000 @@ -2,38 +2,65 @@ .include "../Makefile.inc" -.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} ${GCCDIR}/../libiberty +.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} LIB= cc_int INTERNALLIB= YES -# dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c \ -# alias.c bitmap.c dwarf2out.c dyn-string.c \ -SRCS= c-common.c c-dump.c c-format.c c-opts.c \ - c-pragma.c c-semantics.c \ - caller-save.c calls.c combine.c convert.c cse.c \ - dbxout.c dwarfout.c dwarf2out.c dwarf2asm.c emit-rtl.c explow.c expmed.c expr.c \ - final.c flow.c fold-const.c function.c getpwd.c global.c graph.c \ - gtype-desc.c haifa-sched.c \ - integrate.c jump.c lcm.c local-alloc.c loop.c optabs.c \ - print-rtl.c print-tree.c \ - ra.c ra-build.c ra-colorize.c ra-debug.c ra-rewrite.c \ - real.c recog.c reg-stack.c regclass.c \ - reload.c reload1.c reorg.c rtl.c rtlanal.c \ - sbitmap.c sdbout.c stmt.c stor-layout.c \ - toplev.c tracer.c tree.c unroll.c varasm.c xcoffout.c \ - alias.c bitmap.c dyn-string.c \ - genrtl.c profile.c regmove.c varray.c \ - attribs.c cselib.c debug.c rtl-error.c tree-dump.c tree-inline.c +# Files from libiberty. +SRCS= choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \ + dyn-string.c errors.c fibheap.c getpwd.c getruntime.c hashtab.c \ + hex.c lbasename.c make-temp-file.c md5.c obstack.c partition.c \ + pexecute.c physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c \ + xstrdup.c xstrerror.c xexit.c + +# Language-independent files. +SRCS+= alias.c bb-reorder.c bitmap.c builtins.c caller-save.c calls.c \ + cfg.c cfganal.c cfgbuild.c cfgcleanup.c cfglayout.c cfgloop.c \ + cfgloopanal.c cfgloopmanip.c loop-init.c loop-unswitch.c loop-unroll.c \ + cfgrtl.c combine.c conflict.c convert.c coverage.c cse.c cselib.c \ + dbxout.c debug.c df.c diagnostic.c dojump.c doloop.c dominance.c \ + dwarf2asm.c dwarf2out.c emit-rtl.c except.c explow.c \ + expmed.c expr.c final.c flow.c fold-const.c function.c gcse.c \ + genrtl.c ggc-common.c global.c graph.c gtype-desc.c \ + haifa-sched.c hooks.c ifcvt.c \ + integrate.c intl.c jump.c langhooks.c lcm.c lists.c local-alloc.c \ + loop.c optabs.c options.c opts.c params.c postreload.c predict.c \ + print-rtl.c print-tree.c value-prof.c \ + profile.c ra.c ra-build.c ra-colorize.c ra-debug.c ra-rewrite.c \ + real.c recog.c reg-stack.c regclass.c regmove.c regrename.c \ + reload.c reload1.c reorg.c resource.c rtl.c rtlanal.c rtl-error.c \ + sbitmap.c sched-deps.c sched-ebb.c sched-rgn.c sched-vis.c sdbout.c \ + sibcall.c simplify-rtx.c sreal.c stmt.c stor-layout.c stringpool.c \ + targhooks.c timevar.c toplev.c tracer.c tree.c tree-dump.c unroll.c \ + varasm.c varray.c version.c vmsdbgout.c xcoffout.c alloc-pool.c \ + et-forest.c cfghooks.c bt-load.c pretty-print.c ggc-page.c web.c + +# Miscellaneous files. +SRCS+= hashtable.c tree-inline.c tree-optimize.c cgraph.c cgraphunit.c + +# Host hooks. +SRCS+= host-default.c + +# C and ObjC files. +SRCS+= attribs.c c-errors.c c-lex.c c-pragma.c c-decl.c c-typeck.c \ + c-convert.c c-aux-info.c c-common.c c-opts.c c-format.c c-semantics.c \ + c-incpath.c cppdefault.c c-ppoutput.c c-cppbuiltin.c prefix.c \ + c-objc-common.c c-dump.c c-pch.c +# Files shared by cc1plus, cc1 and cc1obj +SRCS+= c-pretty-print.c + +# Machine-dependent files. SRCS+= ${GCC_CPU}.c .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-c.c) SRCS+= ${GCC_CPU}-c.c .endif -SRCS+= bb-reorder.c conflict.c ggc-common.c \ - ggc-page.c ifcvt.c lists.c predict.c regrename.c resource.c sibcall.c \ - simplify-rtx.c ssa.c timevar.c ssa-dce.c ssa-ccp.c df.c fibheap.c +# libcpp files. +SRCS+= cpplib.c cpplex.c cppmacro.c cppexp.c cppfiles.c cpptrad.c \ + cpphash.c cpperror.c cppinit.c cppcharset.c \ + line-map.c mkdeps.c cpppch.c # insn-* gunk -- headers are built in cc_tools, as they are used by the # "build-tools" @@ -43,45 +70,20 @@ insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} > insn-$F.c .endfor +.for F in modes +SRCS+= insn-$F.c +CLEANFILES+= insn-$F.c +insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F + ${.OBJDIR}/../cc_tools/gen$F > insn-$F.c +.endfor -# shared between the drivers -SRCS+= multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c mbchar.c concat.c make-temp-file.c -# C_AND_OBJC_OBJS -#SRCS+= attribs.c c-errors.c c-lex.c c-pragma.c c-decl.c c-typeck.c \ -# c-convert.c c-aux-info.c c-common.c c-format.c c-semantics.c \ -# c-objc-common.c - -# XXX: shared by cc1, cc1obj & cpp0 -# cc1plus seems to be able to tolerate these here, -# BUT only if the right .o's are specified in cc1plus/Makefile -SRCS+= c-typeck.c \ - c-errors.c c-convert.c c-aux-info.c c-objc-common.c - -# libbackend -SRCS+= builtins.c diagnostic.c doloop.c dominance.c et-forest.c \ - except.c gcse.c params.c sched-deps.c sched-vis.c sched-rgn.c sched-ebb.c \ - stringpool.c c-lex.c langhooks.c hashtable.c \ - hooks.c \ - cfg.c cfganal.c cfgbuild.c cfgcleanup.c cfglayout.c cfgloop.c cfgrtl.c - -# libcpp -SRCS+= cppdefault.c cpperror.c cppexp.c cppfiles.c cppinit.c cpphash.c \ - cpplex.c cpplib.c cppmacro.c cppmain.c cpptrad.c mkdeps.c line-map.c - -# stuff that makes libiberty now required (2.95) and shouldn't be... -SRCS+= splay-tree.c hashtab.c partition.c lbasename.c md5.c hex.c xmemdup.c physmem.c CFLAGS+= -DHAVE_CONFIG_H - CFLAGS+= -DTARGET_NAME=\"${target}\" -DIN_GCC -.if defined(TARGET_CPU_DEFAULT) -CFLAGS+= -DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT} -.endif -UNDERSCORES= 0 -SRCS+= underscore.c -CLEANFILES+= underscore.c -underscore.c: Makefile - echo '/*WARNING: This file is automatically generated!*/' >${.TARGET} - echo "int prepends_underscore = ${UNDERSCORES};" >>${.TARGET} +# c-pch.o needs extra defines. Replicate the rule here rather than +# pollute compiler command line for all other files. +c-pch.o: c-pch.c + ${CC} ${CFLAGS} -DHOST_MACHINE=\"${host}\" \ + -DTARGET_MACHINE=\"${target}\" -c ${.IMPSRC} .include Index: gnu/usr.bin/cc/cc_tools/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/cc_tools/Makefile,v retrieving revision 1.77 diff -u -r1.77 Makefile --- gnu/usr.bin/cc/cc_tools/Makefile 11 Jun 2004 00:35:29 -0000 1.77 +++ gnu/usr.bin/cc/cc_tools/Makefile 13 Jul 2004 04:46:59 -0000 @@ -16,10 +16,43 @@ .include "../Makefile.inc" -.PATH: ${GCCDIR} +.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 errors.c fibheap.c \ + getpwd.c getruntime.c hashtab.c hex.c lbasename.c make-temp-file.c \ + md5.c obstack.c partition.c pexecute.c physmem.c splay-tree.c xexit.c \ + xmalloc.c xmemdup.c xstrdup.c xstrerror.c xexit.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 @@ -43,8 +76,8 @@ .for F in attr codes config emit extract flags opinit output peep recog build-tools: gen$F -gen$F: gen$F.o rtl.o obstack.o print-rtl.o bitmap.o errors.o gensupport.o \ - ggc-none.o hashtab.o read-rtl.o concat.o insn-conditions.o +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 ${LIBIBERTY} ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c @@ -56,9 +89,9 @@ # build-tools: genattrtab -genattrtab : genattrtab.o rtl.o obstack.o print-rtl.o bitmap.o errors.o \ - gensupport.o ggc-none.o hashtab.o read-rtl.o concat.o \ - insn-conditions.o genautomata.o varray.o getruntime.o +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 \ + ${LIBIBERTY} ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm GENSRCS+= genattrtab.c @@ -71,18 +104,17 @@ .for F in constants conditions build-tools: gen$F -gen$F: gen$F.o rtl.o obstack.o bitmap.o errors.o gensupport.o \ - ggc-none.o hashtab.o read-rtl.o concat.o dummy-conditions.o +gen$F: gen$F.o rtl.o bitmap.o gensupport.o ggc-none.o read-rtl.o dummy-conditions.o min-insn-modes.o ${LIBIBERTY} ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c CLEANFILES+= gen$F .endfor -.for F in check genrtl preds +.for F in modes check genrtl preds build-tools: gen$F -gen$F: gen$F.o +gen$F: gen$F.o ${LIBIBERTY} ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c @@ -96,11 +128,26 @@ GENSRCS+= genrtl.c genrtl.h -SRCS+= bitmap.c concat.c dummy-conditions.c errors.c genautomata.c \ +SRCS+= bitmap.c concat.c dummy-conditions.c genautomata.c \ gensupport.c getruntime.c ggc-none.c hashtab.c \ obstack.c physmem.c print-rtl.c read-rtl.c rtl.c varray.c xmemdup.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 @@ -136,7 +183,7 @@ -e "s/realloc/xrealloc/g" \ ${.ALLSRC} > ${.TARGET} -gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o xmemdup.o +gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o ${LIBIBERTY} ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gengtype.c @@ -156,13 +203,28 @@ GENSRCS+= gtype-desc.c gtype-desc.h CLEANFILES+= gt-*.h gtype-*.h +# +#----------------------------------------------------------------------- +# Fortran build tools + +.if !defined(NO_FORTRAN) +gen-time-stamp: fini +build-tools: fini +fini: fini.o ${LIBIBERTY} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} +SRCS+= fini.c +CLEANFILES+= fini +.endif + #----------------------------------------------------------------------- # Determine content of variables used by the target/host config files # -# The list of headers to go into tconfig.h +# The list of headers to go into tm.h # -TARGET_INC= ansidecl.h +.if ${TARGET_ARCH} == "amd64" +TARGET_INC= i386/biarch64.h +.endif TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h @@ -189,13 +251,16 @@ TARGET_INC+= ${GCC_CPU}/freebsd64.h TARGET_INC+= freebsd64-fix.h .endif +.if ${TARGET_ARCH} == "powepc" +TARGET_INC+= altivec-defs.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= ${.OBJDIR}/tconfig.h ${.CURDIR}/auto-host.h +GCONFIG_H= ${.CURDIR}/auto-host.h .for H in ${TARGET_INC} .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR} @@ -210,29 +275,29 @@ # 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} # # Copied unchanged from gcc/Makefile.in # -GTFILES = $(GCONFIG_H) $(srcdir)/location.h \ - $(HASHTAB_H) \ - $(srcdir)/bitmap.h $(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)/ssa.h $(srcdir)/insn-addr.h $(srcdir)/cselib.h \ +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 \ + $(srcdir)/cselib.h $(srcdir)/basic-block.h $(srcdir)/cgraph.h \ $(srcdir)/c-common.h $(srcdir)/c-tree.h \ - $(srcdir)/basic-block.h \ - $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c \ - $(srcdir)/dwarf2out.c $(srcdir)/emit-rtl.c \ - $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \ + $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \ + $(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \ + $(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \ $(srcdir)/fold-const.c $(srcdir)/function.c \ $(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)/reg-stack.c $(srcdir)/cfglayout.c $(srcdir)/langhooks.c \ $(srcdir)/sdbout.c $(srcdir)/stmt.c $(srcdir)/stor-layout.c \ - $(srcdir)/tree.c $(srcdir)/varasm.c \ - $(out_file) + $(srcdir)/stringpool.c $(srcdir)/tree.c $(srcdir)/varasm.c $(out_file) # # Build a list of frontend directories to look into @@ -271,9 +336,10 @@ #----------------------------------------------------------------------- # the host/target compiler config. -COMMONHDRS= config.h hconfig.h multilib.h options.h specs.h tconfig.h \ - tm_p.h configargs.h safe-ctype.h -GENSRCS+= ${COMMONHDRS} gencheck.h gtyp-gen.h +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} MFILE?= ${.CURDIR}/Makefile ${COMMONHDRS}: ${MFILE} @@ -282,10 +348,31 @@ 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} -hconfig.h: - echo '#include "auto-host.h"' > ${.TARGET} - echo '#include ' >> ${.TARGET} +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} + +bconfig.h: + echo '#ifndef GCC_BCONFIG_H' > ${.TARGET} + echo '#define GCC_BCONFIG_H' >> ${.TARGET} + echo '#include "auto-host.h"' >> ${.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} @@ -301,56 +388,39 @@ echo 'static const char *const multilib_exclusions_raw[] = { \ NULL };' >> ${.TARGET} -options.h: - echo '#include "cp/lang-options.h"' > ${.TARGET} - echo '#include "f/lang-options.h"' >> ${.TARGET} - echo '#include "objc/lang-options.h"' >> ${.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: - echo '#include ' > ${.TARGET} - echo '#ifndef GENERATOR_FILE' >> ${.TARGET} - echo '#include "insn-constants.h"' >> ${.TARGET} - echo '#include "insn-flags.h"' >> ${.TARGET} - echo '#endif' >> ${.TARGET} +config.h: bconfig.h + echo '#include ' > ${.TARGET} -tconfig.h: - echo 'struct rtx_def;' > ${.TARGET} - echo 'typedef struct rtx_def *rtx;' >> ${.TARGET} - echo 'struct rtvec_def;' >> ${.TARGET} - echo 'typedef struct rtvec_def *rtvec;' >> ${.TARGET} - echo 'union tree_node;' >> ${.TARGET} - echo 'typedef union tree_node *tree;' >> ${.TARGET} - echo '#ifndef GTY' >> ${.TARGET} - echo '# define GTY(x)' >> ${.TARGET} - echo '#endif' >> ${.TARGET} - echo '' >> ${.TARGET} -.if ${TARGET_ARCH} == "amd64" - echo '#include "i386/biarch64.h"' >> ${.TARGET} -.endif -.if ${TARGET_ARCH} == "ia64" - echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET} +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 '#ifndef POSIX' >> ${.TARGET} - echo '# define POSIX' >> ${.TARGET} + 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} .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def) echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET} - echo '#define EXTRA_CC_MODES 1' >> ${.TARGET} .endif + echo '#endif /* GCC_TM_H */' >> ${.TARGET} tm_p.h: echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"' >> ${.TARGET} echo '#include "tm-preds.h"' >> ${.TARGET} -safe-ctype.h: Makefile +safe-ctype.h: echo '#include ' > ${.TARGET} .for Z in TOUPPER TOLOWER ISDIGIT ISXDIGIT ISUPPER ISLOWER ISALPHA ISALNUM \ ISSPACE ISPUNCT ISGRAPH ISBLANK ISPRINT ISCNTRL @@ -391,8 +461,9 @@ echo "\"$F\", " >> ${.TARGET} .endfor echo "NULL};" >> ${.TARGET} - echo "#define xexit exit" >> ${.TARGET} +gcov-iov.h: + echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET} #----------------------------------------------------------------------- # General things. @@ -400,7 +471,8 @@ SRCS+= ${GENSRCS} CLEANFILES+= ${GENSRCS} -all: ${SRCS} +all: ${SRCS} +build-tools: ${SRCS} .include @@ -415,19 +487,42 @@ .if !exists(${DEPENDFILE}) # Fudge pre-dependfile dependencies of objects in much the same way as -# bsd.prog.mk would do if we defined PROG. There are complications to -# avoid circular dependencies. First, only make most objects depend on -# all headers. Filter out the objects that would cause problems (i.e., -# objects that will be used to create programs that will generate headers). -# -${OBJS}: ${SRCS:M*.h:Ngtype-desc.h:Ngenrtl.h:Ntree-check.h:Ntm-preds.h:Ninsn-*.h} - -${OBJS:Ngencheck.o:Ngengenrtl.o:Ngenpreds.o}: tree-check.h tm-preds.h genrtl.h - -${OBJS:Ngengtype*.o:Nxmemdup.o:Ngengenrtl.o:Ngencheck.o:Ngenpreds.o}: gtype-desc.h +# bsd.prog.mk would do if we defined PROG. -genextract.o: insn-config.h +${OBJS}: ${COMMONHDRS} -insn-conditions.o: insn-constants.h +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 .endif Index: gnu/usr.bin/cc/cc_tools/auto-host.h =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v retrieving revision 1.17 diff -u -r1.17 auto-host.h --- gnu/usr.bin/cc/cc_tools/auto-host.h 19 Dec 2003 18:20:48 -0000 1.17 +++ gnu/usr.bin/cc/cc_tools/auto-host.h 24 May 2004 02:44:45 -0000 @@ -2,382 +2,387 @@ #ifndef __FreeBSD_version #include +#include #endif -/* auto-host.h. Generated automatically by configure. */ -/* config.in. Generated automatically from configure.in by autoheader. */ +/* auto-host.h. Generated by configure. */ +/* config.in. Generated from configure.ac by autoheader. */ -/* Define if using alloca.c. */ -/* #undef C_ALLOCA */ +/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#define BYTEORDER _BYTE_ORDER -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Define as the number of bits in a byte, if \`limits.h' doesn't. */ +/* #undef CHAR_BIT */ -/* Define to the type of elements in the array set by `getgroups'. - Usually this is either `int' or `gid_t'. */ -#define GETGROUPS_T gid_t +/* Define 0/1 to force the choice for exception handling model. */ +/* #undef CONFIG_SJLJ_EXCEPTIONS */ -/* Define to `int' if doesn't define. */ -/* #undef gid_t */ +/* Define to enable the use of a default assembler. */ +/* #undef DEFAULT_ASSEMBLER */ -/* Define if you have alloca, as a function or macro. */ -#define HAVE_ALLOCA 1 +/* Define to enable the use of a default linker. */ +/* #undef DEFAULT_LINKER */ -/* Define if you have and it should be used (not on Ultrix). */ -/* #undef HAVE_ALLOCA_H */ +/* 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. */ +#define DEFAULT_USE_CXA_ATEXIT 1 -/* Define if you have the ANSI # stringizing operator in cpp. */ -#define HAVE_STRINGIZE 1 +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 +#ifdef WANT_COMPILER_INVARIANTS +/* #warning WANT_COMPILER_INVARIANTS turned on */ -/* Define if you have . */ -/* #undef HAVE_VFORK_H */ +/* 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 -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ +/* Define if you want fold checked that it never destructs its argument. This + is quite expensive. */ +#define ENABLE_FOLD_CHECKING 1 + +/* 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 -/* Define if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ +/* 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 -/* Define to `long' if doesn't define. */ -/* #undef off_t */ +/* 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 -/* Define to `int' if doesn't define. */ -/* #undef pid_t */ +/* 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 -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ +/* 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 -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -/* #undef STACK_DIRECTION */ +/* Define if you want to run subprograms and generated programs through + valgrind (a memory checker). This is extremely expensive. */ +/* #undef ENABLE_VALGRIND_CHECKING */ -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +#endif /* WANT_COMPILER_INVARIANTS */ -/* Define if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 +/* Define to 1 if installation paths should be looked up in Windows32 + Registry. Ignored on non windows32 hosts. */ +/* #undef ENABLE_WIN32_REGISTRY */ -/* Define to `int' if doesn't define. */ -/* #undef uid_t */ +/* Define to enable detailed memory allocation stats gathering. */ +/* #undef GATHER_STATISTICS */ -/* Define vfork as fork if vfork does not work. */ -/* #undef vfork */ +/* Define to the type of elements in the array set by `getgroups'. Usually + this is either `int' or `gid_t'. */ +#define GETGROUPS_T gid_t -/* Define if your assembler supports specifying the maximum number - of bytes to skip when using the GAS .p2align command. */ -#define HAVE_GAS_MAX_SKIP_P2ALIGN 1 +/* Define to 1 if you have the `alphasort' function. */ +#define HAVE_ALPHASORT 1 -/* Define if your assembler supports .balign and .p2align. */ -#define HAVE_GAS_BALIGN_AND_P2ALIGN 1 +/* Define if your assembler supports dwarf2 .file/.loc directives, and + preserves file table indices exactly as given. */ +#define HAVE_AS_DWARF2_DEBUG_LINE 1 -/* Define if your assembler uses the old HImode fild and fist notation. */ -#define HAVE_GAS_FILDS_FISTS 1 +/* Define if your assembler supports explicit relocations. */ +/* #undef HAVE_AS_EXPLICIT_RELOCS */ -/* Define to `int' if doesn't define. */ -/* #undef ssize_t */ +/* Define if your assembler supports the --gdwarf2 option. */ +#define HAVE_AS_GDWARF2_DEBUG_FLAG 1 -/* Define if cpp should also search $prefix/include. */ -/* #undef PREFIX_INCLUDE_DIR */ +/* Define true if the assembler supports '.long foo@GOTOFF'. */ +#define HAVE_AS_GOTOFF_IN_DATA 1 -/* Define if you have the __argz_count function. */ -/* #undef HAVE___ARGZ_COUNT */ +/* Define if your assembler supports the --gstabs option. */ +#define HAVE_AS_GSTABS_DEBUG_FLAG 1 -/* Define if you have the __argz_next function. */ -/* #undef HAVE___ARGZ_NEXT */ +/* Define if your assembler supports the Sun syntax for cmov. */ +/* #undef HAVE_AS_IX86_CMOV_SUN_SYNTAX */ -/* Define if you have the __argz_stringify function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ +/* Define if your assembler supports .sleb128 and .uleb128. */ +#define HAVE_AS_LEB128 1 -/* Define if you have the alphasort function. */ -#define HAVE_ALPHASORT 1 +/* Define if your assembler supports ltoffx and ldxmov relocations. */ +/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */ -/* Define if you have the atoll function. */ -#if __FreeBSD_version >= 500027 -/* FreeBSD didn't always have atoll(3). */ -#define HAVE_ATOLL 1 -#endif +/* Define if your assembler supports mfcr field. */ +/* #undef HAVE_AS_MFCRF */ -/* Define if you have the atoq function. */ -/* #undef HAVE_ATOQ */ +/* Define if your assembler supports the -no-mul-bug-abort option. */ +/* #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION */ -/* Define if you have the clock function. */ -#define HAVE_CLOCK 1 +/* Define if your assembler supports offsetable %lo(). */ +/* #undef HAVE_AS_OFFSETABLE_LO10 */ -/* Define if you have the dcgettext function. */ -/* #undef HAVE_DCGETTEXT */ +/* Define if your assembler supports .register. */ +/* #undef HAVE_AS_REGISTER_PSEUDO_OP */ -/* Define if you have the dup2 function. */ -#define HAVE_DUP2 1 +/* Define if your assembler supports -relax option. */ +/* #undef HAVE_AS_RELAX_OPTION */ -/* Define if you have the feof_unlocked function. */ -#define HAVE_FEOF_UNLOCKED 1 +/* Define if your assembler and linker support unaligned PC relative relocs. + */ +/* #undef HAVE_AS_SPARC_UA_PCREL */ -/* Define if you have the fgets_unlocked function. */ -/* #undef HAVE_FGETS_UNLOCKED */ +/* Define if your assembler and linker support unaligned PC relative relocs + against hidden symbols. */ +/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */ -/* Define if you have the fprintf_unlocked function. */ -/* #undef HAVE_FPRINTF_UNLOCKED */ +/* Define if your assembler supports thread-local storage. */ +#define HAVE_AS_TLS 1 -/* Define if you have the fputc_unlocked function. */ -/* #undef HAVE_FPUTC_UNLOCKED */ +/* Define to 1 if you have the `atoll' function. */ +#if __FreeBSD_version >= 500027 +#define HAVE_ATOLL 1 +#endif -/* Define if you have the fputs_unlocked function. */ -/* #undef HAVE_FPUTS_UNLOCKED */ +/* Define to 1 if you have the `atoq' function. */ +/* #undef HAVE_ATOQ */ -/* Define if you have the fwrite_unlocked function. */ -/* #undef HAVE_FWRITE_UNLOCKED */ +/* Define to 1 if you have the `clock' function. */ +#define HAVE_CLOCK 1 -/* Define if you have the getcwd function. */ -#define HAVE_GETCWD 1 +/* Define if defines clock_t. */ +#define HAVE_CLOCK_T 1 -/* Define if you have the getegid function. */ -#define HAVE_GETEGID 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_ABORT 1 -/* Define if you have the geteuid function. */ -#define HAVE_GETEUID 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_ATOF 1 -/* Define if you have the getgid function. */ -#define HAVE_GETGID 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_ATOL 1 -/* Define if you have the getpagesize function. */ -#define HAVE_GETPAGESIZE 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_BASENAME 0 -/* Define if you have the getrlimit function. */ -#define HAVE_GETRLIMIT 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_CALLOC 1 -/* Define if you have the getrusage function. */ -#define HAVE_GETRUSAGE 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_CLOCK 1 -/* Define if you have the getuid function. */ -#define HAVE_GETUID 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_ERRNO 1 -/* Define if you have the kill function. */ -#define HAVE_KILL 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_FPRINTF_UNLOCKED 0 -/* Define if you have the lstat function. */ -#define HAVE_LSTAT 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_FPUTS_UNLOCKED 0 -/* Define if you have the mempcpy function. */ -/* #undef HAVE_MEMPCPY */ +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_FREE 1 -/* Define if you have the munmap function. */ -#define HAVE_MUNMAP 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_FWRITE_UNLOCKED 0 -/* Define if you have the nl_langinfo function. */ -#define HAVE_NL_LANGINFO 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_GETCWD 1 -/* Define if you have the putc_unlocked function. */ -#define HAVE_PUTC_UNLOCKED 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_GETENV 1 -/* Define if you have the putenv function. */ -#define HAVE_PUTENV 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_GETOPT 1 -/* Define if you have the scandir function. */ -#define HAVE_SCANDIR 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_GETRLIMIT 1 -/* Define if you have the setenv function. */ -#define HAVE_SETENV 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_GETRUSAGE 1 -/* Define if you have the setlocale function. */ -#define HAVE_SETLOCALE 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_GETWD 1 -/* Define if you have the setrlimit function. */ -#define HAVE_SETRLIMIT 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_LDGETNAME 0 -/* Define if you have the stpcpy function. */ -#define HAVE_STPCPY 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_MALLOC 1 -/* Define if you have the strcasecmp function. */ -#define HAVE_STRCASECMP 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_PUTC_UNLOCKED 1 -/* Define if you have the strchr function. */ -#define HAVE_STRCHR 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_REALLOC 1 -/* Define if you have the strdup function. */ -#define HAVE_STRDUP 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_SBRK 1 -/* Define if you have the strsignal function. */ -#define HAVE_STRSIGNAL 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_SETRLIMIT 1 -/* Define if you have the strtoul function. */ -#define HAVE_STRTOUL 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_SNPRINTF 1 -/* Define if you have the sysconf function. */ -#define HAVE_SYSCONF 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_STRSIGNAL 1 -/* Define if you have the times function. */ -#define HAVE_TIMES 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_STRSTR 1 -/* Define if you have the tsearch function. */ -#define HAVE_TSEARCH 1 +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_TIMES 1 -/* Define if you have the header file. */ -/* #undef HAVE_ARGZ_H */ +/* Define to 1 if we found this declaration otherwise define to 0. */ +#define HAVE_DECL_VASPRINTF 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_DIRECT_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the `dup2' function. */ +#define HAVE_DUP2 1 + +/* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 -/* Define if you have the header file. */ -#define HAVE_LANGINFO_H 1 +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 +/* Define to 1 if you have the `fprintf_unlocked' function. */ +/* #undef HAVE_FPRINTF_UNLOCKED */ -/* Define if you have the header file. */ -#define HAVE_LOCALE_H 1 +/* Define to 1 if you have the `fputc_unlocked' function. */ +/* #undef HAVE_FPUTC_UNLOCKED */ -/* Define if you have the header file. */ -/* #undef HAVE_MALLOC_H */ +/* Define to 1 if you have the `fputs_unlocked' function. */ +/* #undef HAVE_FPUTS_UNLOCKED */ -/* Define if you have the header file. */ -#define HAVE_NL_TYPES_H 1 +/* Define to 1 if you have the `fwrite_unlocked' function. */ +/* #undef HAVE_FWRITE_UNLOCKED */ -/* Define if you have the header file. */ -#define HAVE_STDDEF_H 1 +/* Define if your assembler supports .balign and .p2align. */ +#define HAVE_GAS_BALIGN_AND_P2ALIGN 1 -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 +/* Define if your assembler uses the new HImode fild and fist notation. */ +#define HAVE_GAS_FILDS_FISTS 1 -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 +/* Define if your assembler and linker support .hidden. */ +#define HAVE_GAS_HIDDEN 1 -/* Define if you have the header file. */ -#define HAVE_STRINGS_H 1 +/* Define if your assembler supports specifying the maximum number of bytes to + skip when using the GAS .p2align command. */ +#define HAVE_GAS_MAX_SKIP_P2ALIGN 1 -/* Define if you have the header file. */ -#define HAVE_SYS_FILE_H 1 +/* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag. + */ +#define HAVE_GAS_SHF_MERGE 1 -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 +/* Define if your assembler supports .subsection and .subsection -1 starts + emitting at the beginning of your section. */ +#define HAVE_GAS_SUBSECTION_ORDERING 1 -/* Define if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 +/* Define if your assembler supports .weak. */ +#define HAVE_GAS_WEAK 1 -/* Define if you have the header file. */ -#define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 -/* Define if you have the header file. */ -#define HAVE_SYS_TIME_H 1 +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 -/* Define if you have the header file. */ -#define HAVE_SYS_TIMES_H 1 +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 -/* Define if you have the header file. */ -#define HAVE_TIME_H 1 +/* Define if you have the iconv() function. */ +/* #undef HAVE_ICONV */ -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ICONV_H */ -/* Define to enable the use of a default linker. */ -/* #undef DEFAULT_LINKER */ +/* Define .init_array/.fini_array sections are available and working. */ +/* #undef HAVE_INITFINI_ARRAY */ -/* Define to enable the use of a default assembler. */ -/* #undef DEFAULT_ASSEMBLER */ +/* Define if you have a working header file. */ +#define HAVE_INTTYPES_H 1 -/* Define if your compiler understands volatile. */ -#define HAVE_VOLATILE 1 +/* Define to 1 if you have the `kill' function. */ +#define HAVE_KILL 1 -/* Define if your compiler supports the `long double' type. */ -#define HAVE_LONG_DOUBLE 1 +/* Define to 1 if you have the header file. */ +#define HAVE_LANGINFO_H 1 -/* Define if your compiler supports the `long long' type. */ -#define HAVE_LONG_LONG 1 +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 -/* Define if your compiler supports the `__int64' type. */ -/* #undef HAVE___INT64 */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LDFCN_H */ -/* Define if the `_Bool' type is built-in. */ -#define HAVE__BOOL 1 +/* Define if your linker supports --as-needed and --no-as-needed options. */ +/* #undef HAVE_LD_AS_NEEDED */ -/* The number of bytes in type short */ -#define SIZEOF_SHORT 2 +/* Define if your linker supports --eh-frame-hdr option. */ +#define HAVE_LD_EH_FRAME_HDR 1 -/* The number of bytes in type int */ -#define SIZEOF_INT 4 +/* Define if your linker supports -pie option. */ +/* #undef HAVE_LD_PIE */ -/* The number of bytes in type long */ -/* #define SIZEOF_LONG 4 */ -#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) -#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." -#endif +/* Define if your linker links a mix of read-only and read-write sections into + a read-write section. */ +#define HAVE_LD_RO_RW_SECTION_MIXING 1 -/* The number of bytes in type long long */ -#define SIZEOF_LONG_LONG 8 +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 -/* The number of bytes in type __int64 */ -/* #undef SIZEOF___INT64 */ +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 -/* Define if the host execution character set is EBCDIC. */ -/* #undef HOST_EBCDIC */ +/* Define if your compiler supports the \`long long' type. */ +#define HAVE_LONG_LONG 1 -#ifdef WANT_COMPILER_INVARIANTS -//#warning WANT_COMPILER_INVARIANTS turned on +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ -/* 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 +/* Define to 1 if you have the `mbstowcs' function. */ +#define HAVE_MBSTOWCS 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 +/* Define if valgrind's memcheck.h header is installed. */ +/* #undef HAVE_MEMCHECK_H */ -/* 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 +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 -/* 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 +/* Define to 1 if you have the `mincore' function. */ +#define HAVE_MINCORE 1 -/* 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 +/* Define to 1 if you have the `mmap' function. */ +#define HAVE_MMAP 1 -/* 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 +/* Define if mmap with MAP_ANON(YMOUS) works. */ +#define HAVE_MMAP_ANON 1 -/* Define if you want to run subprograms and generated programs - through valgrind (a memory checker). This is extremely expensive. */ -/* #undef ENABLE_VALGRIND_CHECKING */ +/* Define if mmap of /dev/zero works. */ +#define HAVE_MMAP_DEV_ZERO 1 -#endif /* WANT_COMPILER_INVARIANTS */ +/* Define if read-only mmap of a plain file works. */ +#define HAVE_MMAP_FILE 1 -/* 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. */ -#define DEFAULT_USE_CXA_ATEXIT 1 +/* Define to 1 if you have the `nl_langinfo' function. */ +#define HAVE_NL_LANGINFO 1 -/* Define if you want the C and C++ compilers to support multibyte - character sets for source code. */ -/* #undef MULTIBYTE_CHARS */ +/* Define if printf supports "%p". */ +#define HAVE_PRINTF_PTR 1 -/* Always define this when using the GNU C Library */ -/* #undef _GNU_SOURCE */ +/* Define to 1 if you have the `putc_unlocked' function. */ +#define HAVE_PUTC_UNLOCKED 1 + +/* Define to 1 if you have the `scandir' function. */ +#define HAVE_SCANDIR 1 + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 /* Define if you have a working header file. */ #if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \ @@ -385,255 +390,202 @@ #define HAVE_STDBOOL_H 1 #endif -/* Define if you can safely include both and . */ -#define STRING_WITH_STRINGS 1 - -/* Define as the number of bits in a byte, if `limits.h' doesn't. */ -/* #undef CHAR_BIT */ - -/* Define if the host machine stores words of multi-word integers in - big-endian order. */ -/* #undef HOST_WORDS_BIG_ENDIAN */ - -/* Define to the floating point format of the host machine, if not IEEE. */ -/* #undef HOST_FLOAT_FORMAT */ - -/* Define to 1 if the host machine stores floating point numbers in - memory with the word containing the sign bit at the lowest address, - or to 0 if it does it the other way around. - - This macro should not be defined if the ordering is the same as for - multi-word integers. */ -/* #undef HOST_FLOAT_WORDS_BIG_ENDIAN */ - -/* Define if you have a working header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define if printf supports %p. */ -#define HAVE_PRINTF_PTR 1 - -/* Define if mmap can get us zeroed pages from /dev/zero. */ -#define HAVE_MMAP_DEV_ZERO 1 - -/* Define if mmap can get us zeroed pages using MAP_ANON(YMOUS). */ -#define HAVE_MMAP_ANON 1 - -/* Define if read-only mmap of a plain file works. */ -#define HAVE_MMAP_FILE 1 - -/* Define if you have the iconv() function. */ -/* #undef HAVE_ICONV */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 -/* Define as const if the declaration of iconv() needs const. */ -/* #undef ICONV_CONST */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_GETENV 1 - -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_ATOL 1 - -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_SBRK 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_ABORT 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_ATOF 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_GETCWD 1 +/* Define to 1 if you have the `strsignal' function. */ +#define HAVE_STRSIGNAL 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_GETWD 1 +/* Define if defines struct tms. */ +#define HAVE_STRUCT_TMS 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_STRSIGNAL 1 +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_PUTC_UNLOCKED 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FILE_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_FPUTS_UNLOCKED 0 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_FWRITE_UNLOCKED 0 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_FPRINTF_UNLOCKED 0 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_STRSTR 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_ERRNO 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIMES_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_VASPRINTF 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_MALLOC 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_REALLOC 1 +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_CALLOC 1 +/* Define to 1 if you have the `times' function. */ +#define HAVE_TIMES 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_FREE 1 +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_BASENAME 1 +/* Define if defines \`uchar'. */ +/* #undef HAVE_UCHAR */ -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_GETOPT 1 +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_CLOCK 1 +/* Define if valgrind's valgrind/memcheck.h header is installed. */ +/* #undef HAVE_VALGRIND_MEMCHECK_H */ -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_GETRLIMIT 1 +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_SETRLIMIT 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_GETRUSAGE 1 +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 -/* Define to `long' if doesn't define. */ -/* #undef rlim_t */ +/* Define to 1 if you have the `wcswidth' function. */ +#define HAVE_WCSWIDTH 1 -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_TIMES 1 +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 -/* Define if defines struct tms. */ -#define HAVE_STRUCT_TMS 1 +/* Define this macro if mbstowcs does not crash when its first argument is + NULL. */ +#define HAVE_WORKING_MBSTOWCS 1 -/* Define if defines clock_t. */ -#define HAVE_CLOCK_T 1 +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 -/* Define .init_array/.fini_array sections are available and working. */ -/* #undef HAVE_INITFINI_ARRAY */ +/* Define if the \`_Bool' type is built-in. */ +#define HAVE__BOOL 1 -/* Define if host mkdir takes a single argument. */ -/* #undef MKDIR_TAKES_ONE_ARG */ +/* Define if your compiler supports the \`__int64' type. */ +/* #undef HAVE___INT64 */ -/* Define if you have the iconv() function. */ -/* #undef HAVE_ICONV */ +/* 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 */ -/* Define if you have and nl_langinfo(CODESET). */ -#define HAVE_LANGINFO_CODESET 1 - -/* Define if your file defines LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 - -/* Define to 1 if translation of program messages to the user's native language - is requested. */ -/* #undef ENABLE_NLS */ - -/* Define if you have the header file. */ -/* #undef HAVE_LIBINTL_H */ +/* Define if host mkdir takes a single argument. */ +/* #undef MKDIR_TAKES_ONE_ARG */ -/* Define if the GNU gettext() function is already present or preinstalled. */ -/* #undef HAVE_GETTEXT */ +/* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */ +#define NEED_64BIT_HOST_WIDE_INT 1 -/* Define to use the libintl included with this package instead of any - version in the system libraries. */ -/* #undef USE_INCLUDED_LIBINTL */ +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ -/* Define to 1 if installation paths should be looked up in Windows32 - Registry. Ignored on non windows32 hosts. */ -/* #undef ENABLE_WIN32_REGISTRY */ +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" -/* Define to be the last portion of registry key on windows hosts. */ -/* #undef WIN32_REGISTRY_KEY */ +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" -/* Define if your assembler supports .subsection and .subsection -1 starts - emitting at the beginning of your section. */ -#define HAVE_GAS_SUBSECTION_ORDERING 1 +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" -/* Define if your assembler supports .weak. */ -#define HAVE_GAS_WEAK 1 +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" -/* Define if your assembler supports .hidden. */ -#define HAVE_GAS_HIDDEN 1 +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" -/* Define if your assembler supports .uleb128. */ -#define HAVE_AS_LEB128 1 +/* Define to PREFIX/include if cpp should also search that directory. */ +/* #undef PREFIX_INCLUDE_DIR */ -/* Define if your assembler mis-optimizes .eh_frame data. */ -/* #undef USE_AS_TRADITIONAL_FORMAT */ +/* The number of bytes in type int */ +#define SIZEOF_INT 4 -/* Define if your assembler supports marking sections with SHF_MERGE flag. */ -#define HAVE_GAS_SHF_MERGE 1 +#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) +/* 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." +#endif -/* Define if your assembler supports thread-local storage. */ -#define HAVE_AS_TLS 1 +/* The number of bytes in type long long */ +#define SIZEOF_LONG_LONG 8 -/* Define if your assembler supports explicit relocations. */ -/* #undef HAVE_AS_EXPLICIT_RELOCS */ +/* The number of bytes in type short */ +#define SIZEOF_SHORT 2 -/* Define if your assembler supports .register. */ -/* #undef HAVE_AS_REGISTER_PSEUDO_OP */ +/* The number of bytes in type void * */ +#define SIZEOF_VOID_P SIZEOF_LONG -/* Define if your assembler supports -relax option. */ -/* #undef HAVE_AS_RELAX_OPTION */ +/* The number of bytes in type __int64 */ +/* #undef SIZEOF___INT64 */ -/* Define if your assembler and linker support unaligned PC relative relocs. */ -/* #undef HAVE_AS_SPARC_UA_PCREL */ +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 -/* Define if your assembler and linker support unaligned PC relative relocs against hidden symbols. */ -/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */ +/* Define if you can safely include both and . */ +#define STRING_WITH_STRINGS 1 -/* Define if your assembler supports offsetable %lo(). */ -/* #undef HAVE_AS_OFFSETABLE_LO10 */ +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 -/* Define true if the assembler supports '.long foo@GOTOFF'. */ -#define HAVE_AS_GOTOFF_IN_DATA 1 +/* Define if your assembler mis-optimizes .eh_frame data. */ +/* #undef USE_AS_TRADITIONAL_FORMAT */ -/* Define if your assembler supports ltoffx and ldxmov relocations. */ -/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */ +/* Define if gcc should use -lunwind. */ +/* #undef USE_LIBUNWIND_EXCEPTIONS */ -/* Define if your assembler supports dwarf2 .file/.loc directives, - and preserves file table indices exactly as given. */ -#define HAVE_AS_DWARF2_DEBUG_LINE 1 +/* Define to be the last portion of registry key on windows hosts. */ +/* #undef WIN32_REGISTRY_KEY */ -/* Define if your assembler supports the --gdwarf2 option. */ -#define HAVE_AS_GDWARF2_DEBUG_FLAG 1 +/* whether byteorder is bigendian */ +/* #undef WORDS_BIGENDIAN */ -/* Define if your assembler supports the --gstabs option. */ -#define HAVE_AS_GSTABS_DEBUG_FLAG 1 +/* Always define this when using the GNU C Library */ +/* #undef _GNU_SOURCE */ -/* Define if your linker links a mix of read-only - and read-write sections into a read-write section. */ -#define HAVE_LD_RO_RW_SECTION_MIXING 1 +/* Define to `int' if doesn't define. */ +/* #undef gid_t */ -/* Define if your linker supports --eh-frame-hdr option. */ -#define HAVE_LD_EH_FRAME_HDR 1 +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +/* #undef inline */ -/* Define if your MIPS libgloss linker scripts consistently include STARTUP directives. */ -/* #undef HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES */ +/* Define to `int' if does not define. */ +/* #undef pid_t */ -/* Define 0/1 to force the choice for exception handling model. */ -/* #undef CONFIG_SJLJ_EXCEPTIONS */ +/* Define to \`long' if doesn't define. */ +/* #undef rlim_t */ -/* Define if gcc should use -lunwind. */ -/* #undef USE_LIBUNWIND_EXCEPTIONS */ +/* Define to `int' if does not define. */ +/* #undef ssize_t */ +/* Define to `int' if doesn't define. */ +/* #undef uid_t */ -/* Bison unconditionally undefines `const' if neither `__STDC__' nor - __cplusplus are defined. That's a problem since we use `const' in - the GCC headers, and the resulting bison code is therefore type - unsafe. Thus, we must match the bison behavior here. */ - -#ifndef __STDC__ -#ifndef __cplusplus -/* #undef const */ -#define const -#endif -#endif +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ Index: gnu/usr.bin/cc/cc_tools/freebsd-native.h =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v retrieving revision 1.23 diff -u -r1.23 freebsd-native.h --- gnu/usr.bin/cc/cc_tools/freebsd-native.h 11 Jul 2003 05:33:24 -0000 1.23 +++ gnu/usr.bin/cc/cc_tools/freebsd-native.h 4 Jun 2004 05:28:14 -0000 @@ -14,8 +14,8 @@ #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++/3.3" -#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/3.3/backward" +#define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/c++/3.4" +#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/3.4/backward" #define GCC_INCLUDE_DIR PREFIX"/include" #ifdef CROSS_COMPILE #define CROSS_INCLUDE_DIR PREFIX"/include" @@ -31,20 +31,19 @@ programs: /usr/libexec//:STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX */ -#undef TOOLDIR_BASE_PREFIX /* Old?? This is not documented. */ #undef STANDARD_BINDIR_PREFIX /* We don't need one for now. */ #define STANDARD_EXEC_PREFIX PREFIX"/libexec/" +#define STANDARD_LIBEXEC_PREFIX PREFIX"/libexec/" +#define TOOLDIR_BASE_PREFIX PREFIX #undef MD_EXEC_PREFIX /* We don't want one. */ #define FBSD_DATA_PREFIX PREFIX"/libdata/gcc/" /* Under FreeBSD, the normal location of the various *crt*.o files is the /usr/lib directory. */ -#define STANDARD_STARTFILE_PREFIX PREFIX"/lib/" -#ifdef CROSS_COMPILE -#define CROSS_STARTFILE_PREFIX PREFIX"/lib/" -#endif #undef MD_STARTFILE_PREFIX /* We don't need one for now. */ +#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. */ @@ -57,14 +56,6 @@ /* FreeBSD is 4.4BSD derived */ #define bsd4_4 -/* Dike out [stupid, IMHO] libiberty functions. */ -#define xmalloc_set_program_name(dummy) -#define xmalloc malloc -#define xcalloc calloc -#define xrealloc realloc -#define xstrdup strdup -#define xstrerror strerror - /* And now they want to replace ctype.h.... grr... [stupid, IMHO] */ #define xxxISDIGIT isdigit #define xxxISGRAPH isgraph Index: gnu/usr.bin/cc/collect2/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/collect2/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- gnu/usr.bin/cc/collect2/Makefile 5 Feb 2004 22:44:21 -0000 1.7 +++ gnu/usr.bin/cc/collect2/Makefile 4 Jun 2004 21:21:14 -0000 @@ -2,13 +2,10 @@ .include "../Makefile.inc" -.PATH: ${GCCDIR} ${GCCDIR}/../libiberty +.PATH: ${GCCDIR} PROG= collect2 -SRCS= collect2.c cp-demangle.c cplus-dem.c tlink.c +SRCS= collect2.c tlink.c version.c NOMAN= -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} - .include Index: gnu/usr.bin/cc/doc/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/doc/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- gnu/usr.bin/cc/doc/Makefile 11 Jul 2003 05:37:23 -0000 1.12 +++ gnu/usr.bin/cc/doc/Makefile 29 May 2004 04:53:27 -0000 @@ -23,7 +23,7 @@ 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 + contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi cpp.info: cpp.texi include/fdl.texi cppenv.texi cppopts.texi Index: gnu/usr.bin/cc/f771/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/f771/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- gnu/usr.bin/cc/f771/Makefile 26 Feb 2004 07:50:56 -0000 1.11 +++ gnu/usr.bin/cc/f771/Makefile 4 Jun 2004 21:21:48 -0000 @@ -14,22 +14,16 @@ CFLAGS+= -I${GCCDIR}/f -I. -DPADD= ${LIBCC_INT} +DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} -build-tools: fini -fini: fini.o - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} - -CLEANFILES= fini fini.o - #----------------------------------------------------------------------- # str-* gunk .for i in 1t 2t fo io nq op ot .ORDER: str-$i.h str-$i.j -str-$i.j str-$i.h: str-$i.fin fini - ./fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h +str-$i.j str-$i.h: str-$i.fin + ${.OBJDIR}/../cc_tools/fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h FINIHDRS+= str-$i.j str-$i.h .endfor Index: gnu/usr.bin/cc/gcov/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/gcov/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- gnu/usr.bin/cc/gcov/Makefile 24 Feb 2003 22:58:19 -0000 1.3 +++ gnu/usr.bin/cc/gcov/Makefile 4 Jun 2004 21:21:55 -0000 @@ -2,7 +2,7 @@ .include "../Makefile.inc" -.PATH: ${GCCDIR} ${GCCDIR}/doc ${GCCDIR}/../libiberty +.PATH: ${GCCDIR} ${GCCDIR}/doc PROG= gcov SRCS= gcov.c version.c Index: gnu/usr.bin/cc/include/Makefile =================================================================== RCS file: /usr/download/ncvs/src/gnu/usr.bin/cc/include/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- gnu/usr.bin/cc/include/Makefile 9 Dec 2003 16:31:30 -0000 1.6 +++ gnu/usr.bin/cc/include/Makefile 13 Jul 2004 04:38:51 -0000 @@ -8,6 +8,10 @@ INCS= emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h +.elif ${TARGET_ARCH} == "arm" +INCS= mmintrin.h +.elif ${TARGET_ARCH} == "powerpc" +INCS= ppc-asm.h altivec.h spe.h .endif NOOBJ= Index: lib/libc/sparc64/fpu/fpu_implode.c =================================================================== RCS file: /usr/download/ncvs/src/lib/libc/sparc64/fpu/fpu_implode.c,v retrieving revision 1.5 diff -u -r1.5 fpu_implode.c --- lib/libc/sparc64/fpu/fpu_implode.c 27 Apr 2002 21:56:28 -0000 1.5 +++ lib/libc/sparc64/fpu/fpu_implode.c 13 Jul 2004 19:21:04 -0000 @@ -64,7 +64,7 @@ #include "fpu_extern.h" #include "__sparc_utrap_private.h" -static int round(struct fpemu *, struct fpn *); +static int fpround(struct fpemu *, struct fpn *); static int toinf(struct fpemu *, int); /* @@ -80,7 +80,7 @@ * responsibility to fix this if necessary. */ static int -round(struct fpemu *fe, struct fpn *fp) +fpround(struct fpemu *fe, struct fpn *fp) { u_int m0, m1, m2, m3; int gr, s; @@ -344,7 +344,7 @@ if ((exp = fp->fp_exp + SNG_EXP_BIAS) <= 0) { /* subnormal */ /* -NG for g,r; -SNG_FRACBITS-exp for fraction */ (void) __fpu_shr(fp, FP_NMANT - FP_NG - SNG_FRACBITS - exp); - if (round(fe, fp) && fp->fp_mant[3] == SNG_EXP(1)) + if (fpround(fe, fp) && fp->fp_mant[3] == SNG_EXP(1)) return (sign | SNG_EXP(1) | 0); if ((fe->fe_cx & FSR_NX) || (fe->fe_fsr & (FSR_UF << FSR_TEM_SHIFT))) @@ -357,7 +357,7 @@ if ((fp->fp_mant[3] & SNG_EXP(1 << FP_NG)) == 0) __utrap_panic("fpu_ftos"); #endif - if (round(fe, fp) && fp->fp_mant[3] == SNG_EXP(2)) + if (fpround(fe, fp) && fp->fp_mant[3] == SNG_EXP(2)) exp++; if (exp >= SNG_EXP_INFNAN) { /* overflow to inf or to max single */ @@ -405,7 +405,7 @@ if ((exp = fp->fp_exp + DBL_EXP_BIAS) <= 0) { (void) __fpu_shr(fp, FP_NMANT - FP_NG - DBL_FRACBITS - exp); - if (round(fe, fp) && fp->fp_mant[2] == DBL_EXP(1)) { + if (fpround(fe, fp) && fp->fp_mant[2] == DBL_EXP(1)) { res[1] = 0; return (sign | DBL_EXP(1) | 0); } @@ -416,7 +416,7 @@ goto done; } (void) __fpu_shr(fp, FP_NMANT - FP_NG - 1 - DBL_FRACBITS); - if (round(fe, fp) && fp->fp_mant[2] == DBL_EXP(2)) + if (fpround(fe, fp) && fp->fp_mant[2] == DBL_EXP(2)) exp++; if (exp >= DBL_EXP_INFNAN) { fe->fe_cx |= FSR_OF | FSR_NX; @@ -466,7 +466,7 @@ if ((exp = fp->fp_exp + EXT_EXP_BIAS) <= 0) { (void) __fpu_shr(fp, FP_NMANT - FP_NG - EXT_FRACBITS - exp); - if (round(fe, fp) && fp->fp_mant[0] == EXT_EXP(1)) { + if (fpround(fe, fp) && fp->fp_mant[0] == EXT_EXP(1)) { res[1] = res[2] = res[3] = 0; return (sign | EXT_EXP(1) | 0); } @@ -477,7 +477,7 @@ goto done; } /* Since internal == extended, no need to shift here. */ - if (round(fe, fp) && fp->fp_mant[0] == EXT_EXP(2)) + if (fpround(fe, fp) && fp->fp_mant[0] == EXT_EXP(2)) exp++; if (exp >= EXT_EXP_INFNAN) { fe->fe_cx |= FSR_OF | FSR_NX; Index: lib/libkvm/kvm_proc.c =================================================================== RCS file: /usr/download/ncvs/src/lib/libkvm/kvm_proc.c,v retrieving revision 1.78 diff -u -r1.78 kvm_proc.c --- lib/libkvm/kvm_proc.c 23 Jun 2004 21:59:56 -0000 1.78 +++ lib/libkvm/kvm_proc.c 13 Jul 2004 18:26:55 -0000 @@ -292,14 +292,6 @@ (void)kvm_read(kd, (u_long)mtd.td_wmesg, kp->ki_wmesg, WMESGLEN); -#ifdef sparc - (void)kvm_read(kd, (u_long)&proc.p_vmspace->vm_rssize, - (char *)&kp->ki_rssize, - sizeof(kp->ki_rssize)); - (void)kvm_read(kd, (u_long)&proc.p_vmspace->vm_tsize, - (char *)&kp->ki_tsize, - 3 * sizeof(kp->ki_rssize)); /* XXX */ -#else (void)kvm_read(kd, (u_long)proc.p_vmspace, (char *)&vmspace, sizeof(vmspace)); kp->ki_size = vmspace.vm_map.size; @@ -308,7 +300,6 @@ kp->ki_tsize = vmspace.vm_tsize; kp->ki_dsize = vmspace.vm_dsize; kp->ki_ssize = vmspace.vm_ssize; -#endif switch (what & ~KERN_PROC_INC_THREAD) { Index: lib/libmp/Makefile =================================================================== RCS file: /usr/download/ncvs/src/lib/libmp/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- lib/libmp/Makefile 28 Jan 2003 23:03:15 -0000 1.8 +++ lib/libmp/Makefile 3 Jun 2004 03:11:03 -0000 @@ -6,7 +6,7 @@ INCS= mp.h SRCS= mpasbn.c -WARNS?= 2 +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../crypto .include Index: lib/libncp/ncpl_conn.c =================================================================== RCS file: /usr/download/ncvs/src/lib/libncp/ncpl_conn.c,v retrieving revision 1.8 diff -u -r1.8 ncpl_conn.c --- lib/libncp/ncpl_conn.c 25 Jul 2003 19:17:46 -0000 1.8 +++ lib/libncp/ncpl_conn.c 3 Jun 2004 15:02:17 -0000 @@ -424,9 +424,9 @@ ncp_init_request(conn); ncp_add_byte(conn, NCP_CONN_LOGIN); p = (struct ncp_conn_login *)&conn->packet[conn->rqsize]; - (const char*)p->username = user; + p->username = (char *)user; p->objtype = objtype; - (const char*)p->password = password; + p->password = (char *)password; conn->rqsize += sizeof(*p); if ((error = ncp_conn_request(connHandle, conn)) < 0) return -1; Index: lib/libpam/libpam/Makefile =================================================================== RCS file: /usr/download/ncvs/src/lib/libpam/libpam/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile --- lib/libpam/libpam/Makefile 18 Jan 2004 14:58:07 -0000 1.48 +++ lib/libpam/libpam/Makefile 2 Jun 2004 20:38:05 -0000 @@ -132,7 +132,7 @@ pam_vprompt.3 CSTD?= c99 -WARNS?= 6 +WARNS?= 3 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} Index: lib/libpam/modules/pam_radius/pam_radius.c =================================================================== RCS file: /usr/download/ncvs/src/lib/libpam/modules/pam_radius/pam_radius.c,v retrieving revision 1.22 diff -u -r1.22 pam_radius.c --- lib/libpam/modules/pam_radius/pam_radius.c 25 Jun 2004 12:32:45 -0000 1.22 +++ lib/libpam/modules/pam_radius/pam_radius.c 1 Jul 2004 03:26:51 -0000 @@ -111,7 +111,7 @@ hints.ai_family = PF_INET; if (getaddrinfo(nas_ipaddr, NULL, &hints, &res) == 0 && res != NULL) { - (struct sockaddr *)haddr = res->ai_addr; + haddr = (void *)res->ai_addr; error = rad_put_addr(radh, RAD_NAS_IP_ADDRESS, haddr->sin_addr); freeaddrinfo(res); Index: lib/libtelnet/Makefile =================================================================== RCS file: /usr/download/ncvs/src/lib/libtelnet/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- lib/libtelnet/Makefile 24 Jul 2003 17:19:15 -0000 1.18 +++ lib/libtelnet/Makefile 3 Jun 2004 03:15:29 -0000 @@ -11,7 +11,7 @@ SRCS= genget.c getent.c misc.c CFLAGS+= -I${TELNETDIR} -WARNS?= 2 +WARNS?= 0 .if !defined(RELEASE_CRUNCH) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) Index: lib/msun/src/w_dremf.c =================================================================== RCS file: /usr/download/ncvs/src/lib/msun/src/w_dremf.c,v retrieving revision 1.2 diff -u -r1.2 w_dremf.c --- lib/msun/src/w_dremf.c 30 May 1995 05:50:57 -0000 1.2 +++ lib/msun/src/w_dremf.c 2 Jun 2004 20:53:07 -0000 @@ -9,8 +9,7 @@ #include "math_private.h" float -dremf(x, y) - float x, y; +dremf(float x, float y) { return remainderf(x, y); } Index: sbin/dump/traverse.c =================================================================== RCS file: /usr/download/ncvs/src/sbin/dump/traverse.c,v retrieving revision 1.34 diff -u -r1.34 traverse.c --- sbin/dump/traverse.c 9 Apr 2004 19:58:27 -0000 1.34 +++ sbin/dump/traverse.c 3 Jun 2004 04:09:25 -0000 @@ -63,6 +63,12 @@ #define DIP(dp, field) \ ((sblock->fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) +#define DIP_SET(dp, field, val) do {\ + if (sblock->fs_magic == FS_UFS1_MAGIC) \ + (dp)->dp1.field = (val); \ + else \ + (dp)->dp2.field = (val); \ + } while (0) #define HASDUMPEDFILE 0x1 #define HASSUBDIRS 0x2 @@ -446,8 +452,8 @@ * as a zero length file. */ if ((DIP(dp, di_flags) & SF_SNAPSHOT) != 0) { - DIP(dp, di_size) = 0; - DIP(dp, di_flags) &= ~SF_SNAPSHOT; + DIP_SET(dp, di_size, 0); + DIP_SET(dp, di_flags, DIP(dp, di_flags) & ~SF_SNAPSHOT); } if (sblock->fs_magic == FS_UFS1_MAGIC) { spcl.c_mode = dp->dp1.di_mode; Index: sbin/fsck_ffs/Makefile =================================================================== RCS file: /usr/download/ncvs/src/sbin/fsck_ffs/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- sbin/fsck_ffs/Makefile 23 Feb 2004 20:13:51 -0000 1.14 +++ sbin/fsck_ffs/Makefile 3 Jun 2004 04:15:33 -0000 @@ -8,7 +8,7 @@ MLINKS= fsck_ffs.8 fsck_ufs.8 fsck_ffs.8 fsck_4.2bsd.8 SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \ pass4.c pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c -WARNS?= 2 +WARNS?= 0 CFLAGS+= -I${.CURDIR} .PATH: ${.CURDIR}/../../sys/ufs/ffs Index: sbin/fsdb/Makefile =================================================================== RCS file: /usr/download/ncvs/src/sbin/fsdb/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- sbin/fsdb/Makefile 5 Feb 2004 22:44:23 -0000 1.17 +++ sbin/fsdb/Makefile 3 Jun 2004 04:18:16 -0000 @@ -8,6 +8,7 @@ dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c CFLAGS+= -I${.CURDIR}/../fsck_ffs +WARNS?= 0 LDADD= -ledit -ltermcap DPADD= ${LIBEDIT} ${LIBTERMCAP} .PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs Index: sbin/fsirand/fsirand.c =================================================================== RCS file: /usr/download/ncvs/src/sbin/fsirand/fsirand.c,v retrieving revision 1.12 diff -u -r1.12 fsirand.c --- sbin/fsirand/fsirand.c 27 Nov 2002 02:18:57 -0000 1.12 +++ sbin/fsirand/fsirand.c 3 Jun 2004 15:09:16 -0000 @@ -274,9 +274,10 @@ inumber, sblock->fs_magic == FS_UFS1_MAGIC ? (quad_t)dp1->di_gen : dp2->di_gen); + else if (sblock->fs_magic == FS_UFS1_MAGIC) + dp1->di_gen = random(); else - (sblock->fs_magic == FS_UFS1_MAGIC ? - dp1->di_gen : dp2->di_gen) = random(); + dp2->di_gen = random(); } } Index: sbin/growfs/Makefile =================================================================== RCS file: /usr/download/ncvs/src/sbin/growfs/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- sbin/growfs/Makefile 3 Apr 2004 23:56:24 -0000 1.9 +++ sbin/growfs/Makefile 3 Jun 2004 04:22:18 -0000 @@ -10,7 +10,7 @@ SRCS= growfs.c MAN= growfs.8 -WARNS?= 6 +WARNS?= 0 .if defined(GFSDBG) SRCS+= debug.c Index: sys/boot/i386/boot2/boot2.c =================================================================== RCS file: /usr/download/ncvs/src/sys/boot/i386/boot2/boot2.c,v retrieving revision 1.68 diff -u -r1.68 boot2.c --- sys/boot/i386/boot2/boot2.c 12 Mar 2004 21:45:25 -0000 1.68 +++ sys/boot/i386/boot2/boot2.c 3 Jun 2004 05:13:34 -0000 @@ -139,9 +139,6 @@ static int xgetc(int); static int getc(int); -#if defined(__GNUC__) || defined(__INTEL_COMPILER) -#define memcpy __builtin_memcpy -#else static void memcpy(char *, const char *, int); static void memcpy(char *dst, const char *src, int len) @@ -149,7 +146,6 @@ while (len--) *dst++ = *src++; } -#endif static inline int strcmp(const char *s1, const char *s2) Index: sys/cam/scsi/scsi_cd.c =================================================================== RCS file: /usr/download/ncvs/src/sys/cam/scsi/scsi_cd.c,v retrieving revision 1.89 diff -u -r1.89 scsi_cd.c --- sys/cam/scsi/scsi_cd.c 18 Feb 2004 21:36:50 -0000 1.89 +++ sys/cam/scsi/scsi_cd.c 1 Jul 2004 04:35:57 -0000 @@ -597,7 +597,7 @@ * Now register the sysctl handler, so the user can the value on * the fly. */ - SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), + SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, &softc->minimum_command_size, 0, cdcmdsizesysctl, "I", "Minimum CDB size"); Index: sys/coda/coda_vnops.c =================================================================== RCS file: /usr/download/ncvs/src/sys/coda/coda_vnops.c,v retrieving revision 1.52 diff -u -r1.52 coda_vnops.c --- sys/coda/coda_vnops.c 16 Jun 2004 09:46:32 -0000 1.52 +++ sys/coda/coda_vnops.c 5 Jul 2004 15:44:28 -0000 @@ -1740,7 +1740,7 @@ cache_purge(vp); lockdestroy(&(VTOC(vp)->c_lock)); coda_free(VTOC(vp)); - VTOC(vp) = NULL; + vp->v_data = NULL; return (0); } Index: sys/conf/kern.pre.mk =================================================================== RCS file: /usr/download/ncvs/src/sys/conf/kern.pre.mk,v retrieving revision 1.54 diff -u -r1.54 kern.pre.mk --- sys/conf/kern.pre.mk 27 Jun 2004 23:03:43 -0000 1.54 +++ sys/conf/kern.pre.mk 9 Jul 2004 01:22:53 -0000 @@ -70,6 +70,8 @@ CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} .if ${CC} != "icc" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} +CFLAGS+= --param inline-unit-growth=100 +CFLAGS+= --param large-function-growth=1000 WERROR?= -Werror .endif @@ -88,7 +90,7 @@ # XXX doesn't work yet #PROF= -prof_gen . else -PROF= -finstrument-functions +PROF= -finstrument-functions -Wno-inline . endif .else . if ${CC} == "icc" Index: sys/contrib/pf/net/if_pfsync.c =================================================================== RCS file: /usr/download/ncvs/src/sys/contrib/pf/net/if_pfsync.c,v retrieving revision 1.9 diff -u -r1.9 if_pfsync.c --- sys/contrib/pf/net/if_pfsync.c 22 Jun 2004 20:13:24 -0000 1.9 +++ sys/contrib/pf/net/if_pfsync.c 13 Jul 2004 21:34:55 -0000 @@ -1311,7 +1311,7 @@ struct pfsync_header *h; struct pfsync_softc *sc = ifp->if_softc; struct pfsync_state_upd_req *rup; - int s, ret = 0; /* make the compiler happy */ + int s = 0, ret = 0; /* make the compiler happy */ #ifdef __FreeBSD__ PF_ASSERT(MA_OWNED); Index: sys/contrib/pf/net/pf.c =================================================================== RCS file: /usr/download/ncvs/src/sys/contrib/pf/net/pf.c,v retrieving revision 1.11 diff -u -r1.11 pf.c --- sys/contrib/pf/net/pf.c 17 Jun 2004 16:59:47 -0000 1.11 +++ sys/contrib/pf/net/pf.c 5 Jul 2004 17:01:49 -0000 @@ -292,6 +292,7 @@ ((r)->rule_flag & PFRULE_GRBOUND) ? (k)->pfik_parent : \ (k)->pfik_parent->pfik_parent) +#ifndef __FreeBSD__ static __inline int pf_src_compare(struct pf_src_node *, struct pf_src_node *); static __inline int pf_state_compare_lan_ext(struct pf_state *, struct pf_state *); @@ -299,6 +300,15 @@ struct pf_state *); static __inline int pf_state_compare_id(struct pf_state *, struct pf_state *); +#else +static int pf_src_compare(struct pf_src_node *, struct pf_src_node *); +static int pf_state_compare_lan_ext(struct pf_state *, + struct pf_state *); +static int pf_state_compare_ext_gwy(struct pf_state *, + struct pf_state *); +static int pf_state_compare_id(struct pf_state *, + struct pf_state *); +#endif struct pf_src_tree tree_src_tracking; Index: sys/contrib/pf/net/pf_norm.c =================================================================== RCS file: /usr/download/ncvs/src/sys/contrib/pf/net/pf_norm.c,v retrieving revision 1.7 diff -u -r1.7 pf_norm.c --- sys/contrib/pf/net/pf_norm.c 17 Jun 2004 16:59:47 -0000 1.7 +++ sys/contrib/pf/net/pf_norm.c 5 Jul 2004 17:03:19 -0000 @@ -155,8 +155,13 @@ TAILQ_HEAD(pf_fragqueue, pf_fragment) pf_fragqueue; TAILQ_HEAD(pf_cachequeue, pf_fragment) pf_cachequeue; +#ifndef __FreeBSD__ static __inline int pf_frag_compare(struct pf_fragment *, struct pf_fragment *); +#else +static int pf_frag_compare(struct pf_fragment *, + struct pf_fragment *); +#endif RB_HEAD(pf_frag_tree, pf_fragment) pf_frag_tree, pf_cache_tree; RB_PROTOTYPE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare); RB_GENERATE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare); Index: sys/contrib/pf/net/pf_table.c =================================================================== RCS file: /usr/download/ncvs/src/sys/contrib/pf/net/pf_table.c,v retrieving revision 1.4 diff -u -r1.4 pf_table.c --- sys/contrib/pf/net/pf_table.c 16 Jun 2004 23:24:00 -0000 1.4 +++ sys/contrib/pf/net/pf_table.c 13 Jul 2004 21:51:12 -0000 @@ -275,6 +275,7 @@ pfr_enqueue_addrs(kt, &workq, ndel, 0); if (!(flags & PFR_FLAG_DUMMY)) { + s = 0; if (flags & PFR_FLAG_ATOMIC) s = splsoftnet(); pfr_remove_kentries(kt, &workq); @@ -297,7 +298,7 @@ struct pfr_kentryworkq workq; struct pfr_kentry *p, *q; struct pfr_addr ad; - int i, rv, s, xadd = 0; + int i, rv, s = 0, xadd = 0; #ifdef __FreeBSD__ /* * XXX Is it OK under LP64 environments? @@ -383,7 +384,7 @@ struct pfr_kentryworkq workq; struct pfr_kentry *p; struct pfr_addr ad; - int i, rv, s, xdel = 0; + int i, rv, s = 0, xdel = 0; ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY+PFR_FLAG_FEEDBACK); if (pfr_validate_table(tbl, 0, flags & PFR_FLAG_USERIOCTL)) @@ -445,7 +446,7 @@ struct pfr_kentryworkq addq, delq, changeq; struct pfr_kentry *p, *q; struct pfr_addr ad; - int i, rv, s, xadd = 0, xdel = 0, xchange = 0; + int i, rv, s = 0, xadd = 0, xdel = 0, xchange = 0; #ifdef __FreeBSD__ /* * XXX Is it OK under LP64 environments? @@ -649,7 +650,7 @@ struct pfr_ktable *kt; struct pfr_walktree w; struct pfr_kentryworkq workq; - int rv, s; + int rv, s = 0; #ifdef __FreeBSD__ /* * XXX Is it OK under LP64 environments? @@ -715,7 +716,7 @@ struct pfr_kentryworkq workq; struct pfr_kentry *p; struct pfr_addr ad; - int i, rv, s, xzero = 0; + int i, rv, s = 0, xzero = 0; ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY+PFR_FLAG_FEEDBACK); if (pfr_validate_table(tbl, 0, 0)) @@ -1182,7 +1183,7 @@ { struct pfr_ktableworkq workq; struct pfr_ktable *p; - int s, xdel = 0; + int s = 0, xdel = 0; ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY+PFR_FLAG_ALLRSETS); if (pfr_table_count(filter, flags) < 0) @@ -1217,7 +1218,7 @@ { struct pfr_ktableworkq addq, changeq; struct pfr_ktable *p, *q, *r, key; - int i, rv, s, xadd = 0; + int i, rv, s = 0, xadd = 0; #ifdef __FreeBSD__ /* * XXX Is it OK under LP64 environments? @@ -1305,7 +1306,7 @@ { struct pfr_ktableworkq workq; struct pfr_ktable *p, *q, key; - int i, s, xdel = 0; + int i, s = 0, xdel = 0; ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY); SLIST_INIT(&workq); @@ -1377,7 +1378,7 @@ { struct pfr_ktable *p; struct pfr_ktableworkq workq; - int s, n, nn; + int s = 0, n, nn; #ifdef __FreeBSD__ /* * XXX Is it OK under LP64 environments? @@ -1407,7 +1408,8 @@ if (!(flags & PFR_FLAG_ATOMIC)) s = splsoftnet(); if (COPYOUT(&p->pfrkt_ts, tbl++, sizeof(*tbl))) { - splx(s); + if (!(flags & PFR_FLAG_ATOMIC)) + splx(s); return (EFAULT); } if (!(flags & PFR_FLAG_ATOMIC)) @@ -1432,7 +1434,7 @@ { struct pfr_ktableworkq workq; struct pfr_ktable *p, key; - int i, s, xzero = 0; + int i, s = 0, xzero = 0; #ifdef __FreeBSD__ /* * XXX Is it OK under LP64 environments? @@ -1473,7 +1475,7 @@ { struct pfr_ktableworkq workq; struct pfr_ktable *p, *q, key; - int i, s, xchange = 0, xdel = 0; + int i, s = 0, xchange = 0, xdel = 0; ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY); if ((setflag & ~PFR_TFLAG_USRMASK) || @@ -1692,7 +1694,7 @@ struct pfr_ktable *p; struct pfr_ktableworkq workq; struct pf_ruleset *rs; - int s, xadd = 0, xchange = 0; + int s = 0, xadd = 0, xchange = 0; #ifdef __FreeBSD__ /* * XXX Is it OK under LP64 environments? Index: sys/ddb/db_main.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ddb/db_main.c,v retrieving revision 1.1 diff -u -r1.1 db_main.c --- sys/ddb/db_main.c 10 Jul 2004 23:47:18 -0000 1.1 +++ sys/ddb/db_main.c 13 Jul 2004 21:51:45 -0000 @@ -170,9 +170,11 @@ if (ksym_end > ksym_start && ksym_start != 0) { symtab = ksym_start; - tabsz = *((Elf_Size*)symtab)++; + tabsz = *((Elf_Size*)symtab); + tabsz += sizeof(Elf_Size); strtab = symtab + tabsz; - strsz = *((Elf_Size*)strtab)++; + strsz = *((Elf_Size*)strtab); + strsz += sizeof(Elf_Size); if (strtab + strsz <= ksym_end) { db_add_symbol_table((char *)symtab, (char *)(symtab + tabsz), "elf", (char *)strtab); Index: sys/dev/aac/aac.c =================================================================== RCS file: /usr/download/ncvs/src/sys/dev/aac/aac.c,v retrieving revision 1.95 diff -u -r1.95 aac.c --- sys/dev/aac/aac.c 16 Jun 2004 09:46:35 -0000 1.95 +++ sys/dev/aac/aac.c 1 Jul 2004 04:55:55 -0000 @@ -955,7 +955,7 @@ br->Flags = 0; fib->Header.Size += sizeof(struct aac_blockread64); cm->cm_flags |= AAC_CMD_DATAOUT; - (struct aac_sg_table64 *)cm->cm_sgtable = &br->SgMap64; + cm->cm_sgtable = (struct aac_sg_table *)&br->SgMap64; } else { struct aac_blockwrite64 *bw; bw = (struct aac_blockwrite64 *)&fib->data[0]; @@ -967,7 +967,7 @@ bw->Flags = 0; fib->Header.Size += sizeof(struct aac_blockwrite64); cm->cm_flags |= AAC_CMD_DATAIN; - (struct aac_sg_table64 *)cm->cm_sgtable = &bw->SgMap64; + cm->cm_sgtable = (struct aac_sg_table *)&bw->SgMap64; } } @@ -1503,7 +1503,8 @@ aac_common_map, sc, 0); if (sc->aac_common_busaddr < 8192) { - (uint8_t *)sc->aac_common += 8192; + sc->aac_common = (struct aac_common *) + ((uint8_t *)sc->aac_common + 8192); sc->aac_common_busaddr += 8192; } bzero(sc->aac_common, sizeof(*sc->aac_common)); Index: sys/dev/aac/aac_disk.c =================================================================== RCS file: /usr/download/ncvs/src/sys/dev/aac/aac_disk.c,v retrieving revision 1.39 diff -u -r1.39 aac_disk.c --- sys/dev/aac/aac_disk.c 2 Jun 2004 18:15:48 -0000 1.39 +++ sys/dev/aac/aac_disk.c 1 Jul 2004 04:56:18 -0000 @@ -282,7 +282,7 @@ length -= len; offset += len; - (vm_offset_t)virtual += len; + virtual = (uint8_t *)virtual + len; } return (0); Index: sys/dev/ciss/cissio.h =================================================================== RCS file: /usr/download/ncvs/src/sys/dev/ciss/cissio.h,v retrieving revision 1.2 diff -u -r1.2 cissio.h --- sys/dev/ciss/cissio.h 23 Sep 2002 06:35:32 -0000 1.2 +++ sys/dev/ciss/cissio.h 4 Jul 2004 17:40:53 -0000 @@ -122,27 +122,27 @@ } LogUnit __packed; } SCSI3Addr_struct; -typedef struct { +struct PhysDevAddr { u_int32_t TargetId:24; u_int32_t Bus:6; u_int32_t Mode:2; SCSI3Addr_struct Target[2]; -} PhysDevAddr_struct __packed; +} __packed; -typedef struct { +struct LogDevAddr { u_int32_t VolId:30; u_int32_t Mode:2; u_int8_t reserved[4]; -} LogDevAddr_struct __packed; +} __packed; typedef union { u_int8_t LunAddrBytes[8]; SCSI3Addr_struct SCSI3Lun[4]; - PhysDevAddr_struct PhysDev; - LogDevAddr_struct LogDev; -} LUNAddr_struct __packed; + struct PhysDevAddr PhysDev; + struct LogDevAddr LogDev; +} LUNAddr_struct; -typedef struct { +struct RequestBlock { u_int8_t CDBLen; struct { u_int8_t Type:3; @@ -151,7 +151,8 @@ } Type __packed; u_int16_t Timeout; u_int8_t CDB[16]; -} RequestBlock_struct __packed; +} __packed; +typedef struct RequestBlock RequestBlock_struct; typedef union { struct { @@ -165,24 +166,26 @@ u_int8_t offense_num; u_int32_t offense_value; } Invalid_Cmd __packed; -} MoreErrInfo_struct __packed; +} MoreErrInfo_struct; -typedef struct { +struct ErrorInfo { u_int8_t ScsiStatus; u_int8_t SenseLen; u_int16_t CommandStatus; u_int32_t ResidualCnt; MoreErrInfo_struct MoreErrInfo; u_int8_t SenseInfo[SENSEINFOBYTES]; -} ErrorInfo_struct __packed; +} __packed; +typedef struct ErrorInfo ErrorInfo_struct; -typedef struct { +struct IOCTL_Command { LUNAddr_struct LUN_info; /* 8 */ RequestBlock_struct Request; /* 20 */ ErrorInfo_struct error_info; /* 48 */ u_int16_t buf_size; /* 2 */ u_int8_t *buf; /* 4 */ -} IOCTL_Command_struct __packed; +} __packed; +typedef struct IOCTL_Command IOCTL_Command_struct; /* * Note that we'd normally pass the struct in directly, but Index: sys/dev/firewire/firewire.c =================================================================== RCS file: /usr/download/ncvs/src/sys/dev/firewire/firewire.c,v retrieving revision 1.76 diff -u -r1.76 firewire.c --- sys/dev/firewire/firewire.c 14 Jun 2004 09:34:20 -0000 1.76 +++ sys/dev/firewire/firewire.c 4 Jul 2004 17:42:09 -0000 @@ -1760,7 +1760,7 @@ /* Copy header */ p = (u_char *)&rb->xfer->recv.hdr; bcopy(rb->vec->iov_base, p, tinfo->hdr_len); - (u_char *)rb->vec->iov_base += tinfo->hdr_len; + rb->vec->iov_base = (u_char *)rb->vec->iov_base + tinfo->hdr_len; rb->vec->iov_len -= tinfo->hdr_len; /* Copy payload */ Index: sys/dev/scd/scd.c =================================================================== RCS file: /usr/download/ncvs/src/sys/dev/scd/scd.c,v retrieving revision 1.81 diff -u -r1.81 scd.c --- sys/dev/scd/scd.c 16 Jun 2004 09:46:55 -0000 1.81 +++ sys/dev/scd/scd.c 5 Jul 2004 17:14:29 -0000 @@ -1058,22 +1058,21 @@ if (tl->track != 0xb0) return (tl); - (char *)tl += 9; if (tl->track != 0xb1) return (tl); - (char *)tl += 9; + tl = (struct sony_tracklist *)((char *)tl + 9); if (tl->track != 0xb2) return (tl); - (char *)tl += 9; + tl = (struct sony_tracklist *)((char *)tl + 9); if (tl->track != 0xb3) return (tl); - (char *)tl += 9; + tl = (struct sony_tracklist *)((char *)tl + 9); if (tl->track != 0xb4) return (tl); - (char *)tl += 9; + tl = (struct sony_tracklist *)((char *)tl + 9); if (tl->track != 0xc0) return (tl); - (char *)tl += 9; + tl = (struct sony_tracklist *)((char *)tl + 9); return (tl); } Index: sys/dev/si/si.c =================================================================== RCS file: /usr/download/ncvs/src/sys/dev/si/si.c,v retrieving revision 1.130 diff -u -r1.130 si.c --- sys/dev/si/si.c 11 Jul 2004 15:18:38 -0000 1.130 +++ sys/dev/si/si.c 12 Jul 2004 04:39:54 -0000 @@ -215,23 +215,37 @@ static void __inline si_bcopy(const void *src, void *dst, size_t len) { + u_char *d; + const u_char *s; + + d = dst; + s = src; while (len--) - *(((u_char *)dst)++) = *(((const u_char *)src)++); + *d++ = *s++; } static void __inline si_vbcopy(const volatile void *src, void *dst, size_t len) { + u_char *d; + const volatile u_char *s; + + d = dst; + s = src; while (len--) - *(((u_char *)dst)++) = *(((const volatile u_char *)src)++); + *d++ = *s++; } static void __inline si_bcopyv(const void *src, volatile void *dst, size_t len) { + volatile u_char *d; + const u_char *s; + + d = dst; + s = src; while (len--) - *(((volatile u_char *)dst)++) = *(((const u_char *)src)++); + *d++ = *s++; } - /* * Attach the device. Initialize the card. */ Index: sys/dev/syscons/syscons.c =================================================================== RCS file: /usr/download/ncvs/src/sys/dev/syscons/syscons.c,v retrieving revision 1.423 diff -u -r1.423 syscons.c --- sys/dev/syscons/syscons.c 10 Jul 2004 22:29:41 -0000 1.423 +++ sys/dev/syscons/syscons.c 11 Jul 2004 00:03:12 -0000 @@ -872,7 +872,7 @@ frbp = scp->vtb.vtb_buffer + scp->ysize * lsize + ptr->x * sizeof(u_int16_t); /* Pointer to the last line of target buffer */ - (vm_offset_t)outp += ptr->ysize * csize; + outp = (char *)outp + ptr->ysize * csize; /* Pointer to the last line of history buffer */ if (scp->history != NULL) hstp = scp->history->vtb_buffer + sc_vtb_tail(scp->history) * @@ -892,7 +892,7 @@ } if (lnum < ptr->y) continue; - (vm_offset_t)outp -= csize; + outp = (char *)outp - csize; retval = copyout((void *)frbp, outp, csize); if (retval != 0) break; Index: sys/dev/syscons/syscons.h =================================================================== RCS file: /usr/download/ncvs/src/sys/dev/syscons/syscons.h,v retrieving revision 1.78 diff -u -r1.78 syscons.h --- sys/dev/syscons/syscons.h 16 Jun 2004 09:46:59 -0000 1.78 +++ sys/dev/syscons/syscons.h 4 Jul 2004 20:08:44 -0000 @@ -92,7 +92,8 @@ #define SC_DRIVER_NAME "sc" #define SC_VTY(dev) minor(dev) #define SC_DEV(sc, vty) ((sc)->dev[(vty) - (sc)->first_vty]) -#define SC_STAT(dev) ((scr_stat *)(dev)->si_drv1) +#define SC_STAT(dev) (*((scr_stat **)&(dev)->si_drv1)) +#define SC_STAT_DEV(dev, val) (dev)->si_drv1 = (val) /* printable chars */ #ifndef PRINTABLE Index: sys/fs/ntfs/ntfs_subr.c =================================================================== RCS file: /usr/download/ncvs/src/sys/fs/ntfs/ntfs_subr.c,v retrieving revision 1.33 diff -u -r1.33 ntfs_subr.c --- sys/fs/ntfs/ntfs_subr.c 16 Dec 2003 01:52:54 -0000 1.33 +++ sys/fs/ntfs/ntfs_subr.c 4 Jul 2004 17:45:33 -0000 @@ -1899,7 +1899,7 @@ return (EINVAL); } *cfxp = *fxp; - ((caddr_t) cfxp) += ntmp->ntm_bps; + cfxp = (u_int16_t *) ((caddr_t) cfxp + ntmp->ntm_bps); } return (0); } Index: sys/i386/acpica/acpi_wakeup.c =================================================================== RCS file: /usr/download/ncvs/src/sys/i386/acpica/acpi_wakeup.c,v retrieving revision 1.34 diff -u -r1.34 acpi_wakeup.c --- sys/i386/acpica/acpi_wakeup.c 6 Jul 2004 04:56:31 -0000 1.34 +++ sys/i386/acpica/acpi_wakeup.c 9 Jul 2004 03:58:35 -0000 @@ -160,14 +160,14 @@ } #define WAKECODE_FIXUP(offset, type, val) do { \ - void **addr; \ - addr = (void **)(sc->acpi_wakeaddr + offset); \ - (type *)*addr = val; \ + type *addr; \ + addr = (type *)(sc->acpi_wakeaddr + offset); \ + *addr = val; \ } while (0) #define WAKECODE_BCOPY(offset, type, val) do { \ - void **addr; \ - addr = (void **)(sc->acpi_wakeaddr + offset); \ + void *addr; \ + addr = (void *)(sc->acpi_wakeaddr + offset); \ bcopy(&(val), addr, sizeof(type)); \ } while (0) @@ -233,7 +233,7 @@ WAKECODE_FIXUP(previous_ldt, uint16_t, r_ldt); WAKECODE_BCOPY(previous_idt, struct region_descriptor, r_idt); - WAKECODE_FIXUP(where_to_recover, void, acpi_restorecpu); + WAKECODE_FIXUP(where_to_recover, void *, acpi_restorecpu); WAKECODE_FIXUP(previous_ds, uint16_t, r_ds); WAKECODE_FIXUP(previous_es, uint16_t, r_es); Index: sys/kern/kern_sysctl.c =================================================================== RCS file: /usr/download/ncvs/src/sys/kern/kern_sysctl.c,v retrieving revision 1.157 diff -u -r1.157 kern_sysctl.c --- sys/kern/kern_sysctl.c 11 Jun 2004 02:20:37 -0000 1.157 +++ sys/kern/kern_sysctl.c 4 Jul 2004 17:55:02 -0000 @@ -389,8 +389,8 @@ oidp->oid_kind = CTLFLAG_DYN | kind; if ((kind & CTLTYPE) == CTLTYPE_NODE) { /* Allocate space for children */ - SYSCTL_CHILDREN(oidp) = malloc(sizeof(struct sysctl_oid_list), - M_SYSCTLOID, M_WAITOK); + SYSCTL_CHILDREN_SET(oidp, malloc(sizeof(struct sysctl_oid_list), + M_SYSCTLOID, M_WAITOK)); SLIST_INIT(SYSCTL_CHILDREN(oidp)); } else { oidp->oid_arg1 = arg1; @@ -1208,7 +1208,7 @@ return EINVAL; if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) { - (int *)arg1 += indx; + arg1 = (int *)arg1 + indx; arg2 -= indx; } else { arg1 = oid->oid_arg1; Index: sys/kern/sched_ule.c =================================================================== RCS file: /usr/download/ncvs/src/sys/kern/sched_ule.c,v retrieving revision 1.115 diff -u -r1.115 sched_ule.c --- sys/kern/sched_ule.c 10 Jul 2004 21:38:22 -0000 1.115 +++ sys/kern/sched_ule.c 11 Jul 2004 00:03:18 -0000 @@ -638,7 +638,7 @@ struct kse *ke; do { - (volatile struct kse *)ke = kseq->ksq_assigned; + *(volatile struct kse **)&ke = kseq->ksq_assigned; } while(!atomic_cmpset_ptr(&kseq->ksq_assigned, ke, NULL)); for (; ke != NULL; ke = nke) { nke = ke->ke_assign; @@ -663,7 +663,7 @@ * Place a KSE on another cpu's queue and force a resched. */ do { - (volatile struct kse *)ke->ke_assign = kseq->ksq_assigned; + *(volatile struct kse **)&ke->ke_assign = kseq->ksq_assigned; } while(!atomic_cmpset_ptr(&kseq->ksq_assigned, ke->ke_assign, ke)); pcpu = pcpu_find(cpu); td = pcpu->pc_curthread; Index: sys/kern/sysv_shm.c =================================================================== RCS file: /usr/download/ncvs/src/sys/kern/sysv_shm.c,v retrieving revision 1.93 diff -u -r1.93 sysv_shm.c --- sys/kern/sysv_shm.c 9 Jul 2004 05:28:38 -0000 1.93 +++ sys/kern/sysv_shm.c 10 Jul 2004 04:03:37 -0000 @@ -456,8 +456,7 @@ goto done2; break; default: - /* XXX casting to (sy_call_t *) is bogus, as usual. */ - error = ((sy_call_t *)shmctl)(td, uap); + error = shmctl(td, (struct shmctl_args *)uap); break; } done2: Index: sys/net/if_ef.c =================================================================== RCS file: /usr/download/ncvs/src/sys/net/if_ef.c,v retrieving revision 1.30 diff -u -r1.30 if_ef.c --- sys/net/if_ef.c 15 Jun 2004 23:57:41 -0000 1.30 +++ sys/net/if_ef.c 13 Jul 2004 22:33:08 -0000 @@ -325,6 +325,7 @@ int isr; ether_type = ntohs(eh->ether_type); + l = NULL; if (ether_type < ETHERMTU) { l = mtod(m, struct llc*); if (l->llc_dsap == 0xff && l->llc_ssap == 0xff) { Index: sys/net/if_loop.c =================================================================== RCS file: /usr/download/ncvs/src/sys/net/if_loop.c,v retrieving revision 1.99 diff -u -r1.99 if_loop.c --- sys/net/if_loop.c 27 Jun 2004 09:06:10 -0000 1.99 +++ sys/net/if_loop.c 13 Jul 2004 22:49:07 -0000 @@ -274,7 +274,7 @@ (char *)(mtod(m, vm_offset_t) - (mtod(m, vm_offset_t) & 3)), m->m_len); - mtod(m,vm_offset_t) -= (mtod(m, vm_offset_t) & 3); + m->m_data -= (mtod(m,vm_offset_t) & 3); } #endif } Index: sys/net/route.c =================================================================== RCS file: /usr/download/ncvs/src/sys/net/route.c,v retrieving revision 1.104 diff -u -r1.104 route.c --- sys/net/route.c 25 Apr 2004 01:39:00 -0000 1.104 +++ sys/net/route.c 4 Jul 2004 18:38:02 -0000 @@ -1021,7 +1021,7 @@ */ bcopy(dst, new, dlen); Free(rt_key(rt)); /* free old block, if any */ - rt_key(rt) = new; + rt_key(rt) = (struct sockaddr *)new; rt->rt_gateway = (struct sockaddr *)(new + dlen); } Index: sys/net/route.h =================================================================== RCS file: /usr/download/ncvs/src/sys/net/route.h,v retrieving revision 1.60 diff -u -r1.60 route.h --- sys/net/route.h 24 Apr 2004 23:34:04 -0000 1.60 +++ sys/net/route.h 4 Jul 2004 18:36:34 -0000 @@ -105,8 +105,8 @@ * because the code does some casts of a 'struct radix_node *' * to a 'struct rtentry *' */ -#define rt_key(r) ((struct sockaddr *)((r)->rt_nodes->rn_key)) -#define rt_mask(r) ((struct sockaddr *)((r)->rt_nodes->rn_mask)) +#define rt_key(r) (*((struct sockaddr **)(&(r)->rt_nodes->rn_key))) +#define rt_mask(r) (*((struct sockaddr **)(&(r)->rt_nodes->rn_mask))) struct sockaddr *rt_gateway; /* value */ u_long rt_flags; /* up/down?, host/net */ struct ifnet *rt_ifp; /* the answer: interface to use */ Index: sys/netatm/spans/spans_kxdr.c =================================================================== RCS file: /usr/download/ncvs/src/sys/netatm/spans/spans_kxdr.c,v retrieving revision 1.13 diff -u -r1.13 spans_kxdr.c --- sys/netatm/spans/spans_kxdr.c 11 Jun 2003 07:11:35 -0000 1.13 +++ sys/netatm/spans/spans_kxdr.c 5 Jul 2004 18:18:57 -0000 @@ -502,7 +502,7 @@ /* * Advance the data stream */ - ((long *)xdrs->x_private)++; + xdrs->x_private = (long *)xdrs->x_private + 1; return (TRUE); } @@ -558,7 +558,7 @@ /* * Advance the data stream */ - ((long *)xdrs->x_private)++; + xdrs->x_private = (long *)xdrs->x_private + 1; return (TRUE); } @@ -605,7 +605,7 @@ /* * Update data stream controls */ - ((char *)xdrs->x_private) += copy; + xdrs->x_private = (char *)xdrs->x_private + copy; xdrs->x_handy -= copy; addr += copy; len -= copy; @@ -656,7 +656,7 @@ /* * Update data stream controls */ - ((char *)xdrs->x_private)++; + xdrs->x_private = (char *)xdrs->x_private + 1; /*XXXKAN:copy? */ xdrs->x_handy -= copy; addr += copy; len -= copy; Index: sys/netgraph/ng_ether.c =================================================================== RCS file: /usr/download/ncvs/src/sys/netgraph/ng_ether.c,v retrieving revision 1.36 diff -u -r1.36 ng_ether.c --- sys/netgraph/ng_ether.c 26 Jun 2004 22:24:16 -0000 1.36 +++ sys/netgraph/ng_ether.c 5 Jul 2004 22:14:54 -0000 @@ -65,6 +65,7 @@ #include #define IFP2NG(ifp) ((struct ng_node *)((struct arpcom *)(ifp))->ac_netgraph) +#define IFP2NG_SET(ifp, val) (((struct arpcom *)(ifp))->ac_netgraph = (val)) /* Per-node private data */ struct private { @@ -276,7 +277,7 @@ } NG_NODE_SET_PRIVATE(node, priv); priv->ifp = ifp; - IFP2NG(ifp) = node; + IFP2NG_SET(ifp, node); priv->autoSrcAddr = 1; priv->hwassist = ifp->if_hwassist; @@ -305,7 +306,7 @@ * So zap it now. XXX We HOPE that anything running at this time * handles it (as it should in the non netgraph case). */ - IFP2NG(ifp) = NULL; + IFP2NG_SET(ifp, NULL); priv->ifp = NULL; /* XXX race if interrupted an output packet */ ng_rmnode_self(node); /* remove all netgraph parts */ } Index: sys/netgraph/ng_fec.c =================================================================== RCS file: /usr/download/ncvs/src/sys/netgraph/ng_fec.c,v retrieving revision 1.12 diff -u -r1.12 ng_fec.c --- sys/netgraph/ng_fec.c 4 Jul 2004 16:11:02 -0000 1.12 +++ sys/netgraph/ng_fec.c 5 Jul 2004 22:17:35 -0000 @@ -134,6 +134,7 @@ * should be unused, so we can use to hold our node context. */ #define IFP2NG(ifp) (struct ng_node *)(ifp->if_afdata[AF_NETGRAPH]) +#define IFP2NG_SET(ifp, val) ifp->if_afdata[AF_NETGRAPH] = (val); #define FEC_INC(x, y) (x) = (x + 1) % y /* Index: sys/netgraph/ng_gif.c =================================================================== RCS file: /usr/download/ncvs/src/sys/netgraph/ng_gif.c,v retrieving revision 1.13 diff -u -r1.13 ng_gif.c --- sys/netgraph/ng_gif.c 26 Jun 2004 22:24:16 -0000 1.13 +++ sys/netgraph/ng_gif.c 5 Jul 2004 22:18:10 -0000 @@ -88,6 +88,7 @@ #include #define IFP2NG(ifp) ((struct ng_node *)((struct gif_softc *)(ifp))->gif_netgraph) +#define IFP2NG_SET(ifp, val) (((struct gif_softc *)(ifp))->gif_netgraph = (val)) /* Per-node private data */ struct private { @@ -247,7 +248,7 @@ } NG_NODE_SET_PRIVATE(node, priv); priv->ifp = ifp; - IFP2NG(ifp) = node; + IFP2NG_SET(ifp, node); /* Try to give the node the same name as the interface */ if (ng_name_node(node, ifp->if_xname) != 0) { @@ -275,7 +276,7 @@ * So zap it now. XXX We HOPE that anything running at this time * handles it (as it should in the non netgraph case). */ - IFP2NG(ifp) = NULL; + IFP2NG_SET(ifp, NULL); priv->ifp = NULL; /* XXX race if interrupted an output packet */ ng_rmnode_self(node); /* remove all netgraph parts */ } Index: sys/netgraph/ng_parse.c =================================================================== RCS file: /usr/download/ncvs/src/sys/netgraph/ng_parse.c,v retrieving revision 1.22 diff -u -r1.22 ng_parse.c --- sys/netgraph/ng_parse.c 25 Jun 2004 19:22:03 -0000 1.22 +++ sys/netgraph/ng_parse.c 5 Jul 2004 22:21:11 -0000 @@ -1115,7 +1115,7 @@ struct ng_parse_type subtype; subtype = ng_parse_bytearray_subtype; - (const void *)subtype.private = type->info; + *(const void **)&subtype.private = type->info; return ng_array_parse(&subtype, s, off, start, buf, buflen); } } @@ -1127,7 +1127,7 @@ struct ng_parse_type subtype; subtype = ng_parse_bytearray_subtype; - (const void *)subtype.private = type->info; + *(const void **)&subtype.private = type->info; return ng_array_unparse(&subtype, data, off, cbuf, cbuflen); } @@ -1138,7 +1138,7 @@ struct ng_parse_type subtype; subtype = ng_parse_bytearray_subtype; - (const void *)subtype.private = type->info; + *(const void **)&subtype.private = type->info; return ng_array_getDefault(&subtype, start, buf, buflen); } Index: sys/netgraph/atm/ng_atm.c =================================================================== RCS file: /usr/download/ncvs/src/sys/netgraph/atm/ng_atm.c,v retrieving revision 1.9 diff -u -r1.9 ng_atm.c --- sys/netgraph/atm/ng_atm.c 29 May 2004 00:51:13 -0000 1.9 +++ sys/netgraph/atm/ng_atm.c 5 Jul 2004 22:09:23 -0000 @@ -345,6 +345,7 @@ #define IFP2NG(IFP) ((node_p)((struct ifatm *)(IFP))->ngpriv) +#define IFP2NG_SET(IFP, val) (((struct ifatm *)(IFP))->ngpriv = (val)) #define IFFLAGS "\020\001UP\002BROADCAST\003DEBUG\004LOOPBACK" \ "\005POINTOPOINT\006SMART\007RUNNING\010NOARP" \ @@ -1280,7 +1281,7 @@ NG_NODE_SET_PRIVATE(node, priv); priv->ifp = ifp; LIST_INIT(&priv->vccs); - IFP2NG(ifp) = node; + IFP2NG_SET(ifp, node); if (ng_name_node(node, name) != 0) { log(LOG_WARNING, "%s: can't name node %s\n", @@ -1303,7 +1304,7 @@ NG_NODE_REALLY_DIE(node); priv = NG_NODE_PRIVATE(node); - IFP2NG(priv->ifp) = NULL; + IFP2NG_SET(priv->ifp, NULL); priv->ifp = NULL; ng_rmnode_self(node); @@ -1334,7 +1335,7 @@ if (!allow_shutdown) node->nd_flags &= ~NG_INVALID; else { - IFP2NG(priv->ifp) = NULL; + IFP2NG_SET(priv->ifp, NULL); NG_NODE_SET_PRIVATE(node, NULL); free(priv, M_NETGRAPH); NG_NODE_UNREF(node); Index: sys/netipx/ipx_cksum.c =================================================================== RCS file: /usr/download/ncvs/src/sys/netipx/ipx_cksum.c,v retrieving revision 1.10 diff -u -r1.10 ipx_cksum.c --- sys/netipx/ipx_cksum.c 11 Jun 2003 05:25:14 -0000 1.10 +++ sys/netipx/ipx_cksum.c 5 Jul 2004 22:27:31 -0000 @@ -50,7 +50,7 @@ u_short ipx_cksum(struct mbuf *m, int len) { u_int32_t sum = 0; - u_short *w; + u_char *w; u_char oldtc; int mlen, words; struct ipx *ipx; @@ -62,7 +62,7 @@ ipx = mtod(m, struct ipx*); oldtc = ipx->ipx_tc; ipx->ipx_tc = 0; - w = &ipx->ipx_len; + w = (u_char *)&ipx->ipx_len; len -= 2; mlen = 2; @@ -83,7 +83,7 @@ break; mlen &= 1; if (mlen) { - buf.b[0] = *(u_char*)w; + buf.b[0] = *w; if (--len == 0) { buf.b[1] = 0; sum += buf.w; @@ -93,11 +93,11 @@ m = m->m_next; if (m == NULL) break; - w = mtod(m, u_short*); + w = mtod(m, u_char *); if (mlen) { - buf.b[1] = *(u_char*)w; + buf.b[1] = *w; sum += buf.w; - ((u_char*)w)++; + w++; if (--len == 0) break; } Index: sys/netsmb/smb_conn.c =================================================================== RCS file: /usr/download/ncvs/src/sys/netsmb/smb_conn.c,v retrieving revision 1.12 diff -u -r1.12 smb_conn.c --- sys/netsmb/smb_conn.c 1 Mar 2004 03:14:22 -0000 1.12 +++ sys/netsmb/smb_conn.c 5 Jul 2004 22:52:14 -0000 @@ -118,13 +118,16 @@ struct smb_cred *scred, struct smb_vc **vcpp) { struct thread *td = scred->scr_td; + struct smb_connobj *scp; struct smb_vc *vcp; int exact = 1; int error; vcspec->shspec = shspec; error = ENOENT; - SMBCO_FOREACH((struct smb_connobj*)vcp, &smb_vclist) { + vcp = NULL; + SMBCO_FOREACH(scp, &smb_vclist) { + vcp = (struct smb_vc *)scp; error = smb_vc_lock(vcp, LK_EXCLUSIVE, td); if (error) continue; @@ -594,12 +597,14 @@ struct smb_cred *scred, struct smb_share **sspp) { struct thread *td = scred->scr_td; + struct smb_connobj *scp = NULL; struct smb_share *ssp = NULL; int error; *sspp = NULL; dp->scred = scred; - SMBCO_FOREACH((struct smb_connobj*)ssp, VCTOCP(vcp)) { + SMBCO_FOREACH(scp, VCTOCP(vcp)) { + ssp = (struct smb_share *)scp; error = smb_share_lock(ssp, LK_EXCLUSIVE, td); if (error) continue; @@ -848,6 +853,7 @@ { struct thread *td = req->td; struct smb_cred scred; + struct smb_connobj *scp1, *scp2; struct smb_vc *vcp; struct smb_share *ssp; struct smb_vc_info vci; @@ -861,7 +867,8 @@ error = smb_sm_lockvclist(LK_SHARED, td); if (error) return error; - SMBCO_FOREACH((struct smb_connobj*)vcp, &smb_vclist) { + SMBCO_FOREACH(scp1, &smb_vclist) { + vcp = (struct smb_vc *)scp1; error = smb_vc_lock(vcp, LK_SHARED, td); if (error) continue; @@ -871,7 +878,8 @@ smb_vc_unlock(vcp, 0, td); break; } - SMBCO_FOREACH((struct smb_connobj*)ssp, VCTOCP(vcp)) { + SMBCO_FOREACH(scp2, VCTOCP(vcp)) { + ssp = (struct smb_share *)scp2; error = smb_share_lock(ssp, LK_SHARED, td); if (error) { error = 0; Index: sys/nfs4client/nfs4_vnops.c =================================================================== RCS file: /usr/download/ncvs/src/sys/nfs4client/nfs4_vnops.c,v retrieving revision 1.4 diff -u -r1.4 nfs4_vnops.c --- sys/nfs4client/nfs4_vnops.c 7 Apr 2004 20:46:16 -0000 1.4 +++ sys/nfs4client/nfs4_vnops.c 4 Jul 2004 18:41:15 -0000 @@ -1439,7 +1439,8 @@ break; } else if (rlen < len) { backup = len - rlen; - (char *)uiop->uio_iov->iov_base -= backup; + uiop->uio_iov->iov_base = + (char *)uiop->uio_iov->iov_base - backup; uiop->uio_iov->iov_len += backup; uiop->uio_offset -= backup; uiop->uio_resid += backup; @@ -2146,7 +2147,7 @@ blksiz = 0; uiop->uio_offset += len; uiop->uio_resid -= len; - (char *)uiop->uio_iov->iov_base += len; + uiop->uio_iov->iov_base = (char *)uiop->uio_iov->iov_base + len; uiop->uio_iov->iov_len -= len; } Index: sys/security/mac_biba/mac_biba.c =================================================================== RCS file: /usr/download/ncvs/src/sys/security/mac_biba/mac_biba.c,v retrieving revision 1.78 diff -u -r1.78 mac_biba.c --- sys/security/mac_biba/mac_biba.c 24 Jun 2004 03:34:44 -0000 1.78 +++ sys/security/mac_biba/mac_biba.c 5 Jul 2004 22:59:24 -0000 @@ -124,6 +124,7 @@ static int mac_biba_slot; #define SLOT(l) ((struct mac_biba *)LABEL_TO_SLOT((l), mac_biba_slot).l_ptr) +#define SLOT_SET(l, val) (LABEL_TO_SLOT((l), mac_biba_slot).l_ptr = (val)) static uma_zone_t zone_biba; @@ -501,14 +502,14 @@ mac_biba_init_label(struct label *label) { - SLOT(label) = biba_alloc(M_WAITOK); + SLOT_SET(label, biba_alloc(M_WAITOK)); } static int mac_biba_init_label_waitcheck(struct label *label, int flag) { - SLOT(label) = biba_alloc(flag); + SLOT_SET(label, biba_alloc(flag)); if (SLOT(label) == NULL) return (ENOMEM); @@ -520,7 +521,7 @@ { biba_free(SLOT(label)); - SLOT(label) = NULL; + SLOT_SET(label, NULL); } /* Index: sys/security/mac_lomac/mac_lomac.c =================================================================== RCS file: /usr/download/ncvs/src/sys/security/mac_lomac/mac_lomac.c,v retrieving revision 1.31 diff -u -r1.31 mac_lomac.c --- sys/security/mac_lomac/mac_lomac.c 24 Jun 2004 03:34:45 -0000 1.31 +++ sys/security/mac_lomac/mac_lomac.c 5 Jul 2004 23:06:37 -0000 @@ -125,8 +125,10 @@ static int mac_lomac_slot; #define SLOT(l) ((struct mac_lomac *)LABEL_TO_SLOT((l), mac_lomac_slot).l_ptr) +#define SLOT_SET(l, val) (LABEL_TO_SLOT((l), mac_lomac_slot).l_ptr = (val)) #define PSLOT(l) ((struct mac_lomac_proc *) \ LABEL_TO_SLOT((l), mac_lomac_slot).l_ptr) +#define PSLOT_SET(l, val) (LABEL_TO_SLOT((l), mac_lomac_slot).l_ptr = (val)) MALLOC_DEFINE(M_MACLOMAC, "lomac label", "MAC/LOMAC labels"); @@ -612,14 +614,14 @@ mac_lomac_init_label(struct label *label) { - SLOT(label) = lomac_alloc(M_WAITOK); + SLOT_SET(label, lomac_alloc(M_WAITOK)); } static int mac_lomac_init_label_waitcheck(struct label *label, int flag) { - SLOT(label) = lomac_alloc(flag); + SLOT_SET(label, lomac_alloc(flag)); if (SLOT(label) == NULL) return (ENOMEM); @@ -630,8 +632,8 @@ mac_lomac_init_proc_label(struct label *label) { - PSLOT(label) = malloc(sizeof(struct mac_lomac_proc), M_MACLOMAC, - M_ZERO | M_WAITOK); + PSLOT_SET(label, malloc(sizeof(struct mac_lomac_proc), M_MACLOMAC, + M_ZERO | M_WAITOK)); mtx_init(&PSLOT(label)->mtx, "MAC/Lomac proc lock", NULL, MTX_DEF); } @@ -640,7 +642,7 @@ { lomac_free(SLOT(label)); - SLOT(label) = NULL; + SLOT_SET(label, NULL); } static void @@ -649,7 +651,7 @@ mtx_destroy(&PSLOT(label)->mtx); FREE(PSLOT(label), M_MACLOMAC); - PSLOT(label) = NULL; + PSLOT_SET(label, NULL); } static int Index: sys/security/mac_mls/mac_mls.c =================================================================== RCS file: /usr/download/ncvs/src/sys/security/mac_mls/mac_mls.c,v retrieving revision 1.64 diff -u -r1.64 mac_mls.c --- sys/security/mac_mls/mac_mls.c 24 Jun 2004 03:34:45 -0000 1.64 +++ sys/security/mac_mls/mac_mls.c 5 Jul 2004 23:08:23 -0000 @@ -113,6 +113,7 @@ static int mac_mls_slot; #define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), mac_mls_slot).l_ptr) +#define SLOT_SET(l, val) (LABEL_TO_SLOT((l), mac_mls_slot).l_ptr = (val)) static uma_zone_t zone_mls; @@ -467,14 +468,14 @@ mac_mls_init_label(struct label *label) { - SLOT(label) = mls_alloc(M_WAITOK); + SLOT_SET(label, mls_alloc(M_WAITOK)); } static int mac_mls_init_label_waitcheck(struct label *label, int flag) { - SLOT(label) = mls_alloc(flag); + SLOT_SET(label, mls_alloc(flag)); if (SLOT(label) == NULL) return (ENOMEM); @@ -486,7 +487,7 @@ { mls_free(SLOT(label)); - SLOT(label) = NULL; + SLOT_SET(label, NULL); } /* Index: sys/sys/cdefs.h =================================================================== RCS file: /usr/download/ncvs/src/sys/sys/cdefs.h,v retrieving revision 1.81 diff -u -r1.81 cdefs.h --- sys/sys/cdefs.h 7 Apr 2004 04:19:49 -0000 1.81 +++ sys/sys/cdefs.h 14 Jul 2004 01:05:33 -0000 @@ -143,6 +143,7 @@ #define __dead2 __attribute__((__noreturn__)) #define __pure2 __attribute__((__const__)) #define __unused __attribute__((__unused__)) +#define __used __attribute__((__used__)) #define __packed __attribute__((__packed__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) @@ -151,6 +152,7 @@ #define __dead2 __attribute__((__noreturn__)) #define __pure2 __attribute__((__const__)) #define __unused __attribute__((__unused__)) +#define __used __attribute__((__used__)) #define __packed __attribute__((__packed__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) Index: sys/sys/linker_set.h =================================================================== RCS file: /usr/download/ncvs/src/sys/sys/linker_set.h,v retrieving revision 1.14 diff -u -r1.14 linker_set.h --- sys/sys/linker_set.h 12 Mar 2004 21:45:32 -0000 1.14 +++ sys/sys/linker_set.h 14 Jul 2004 00:59:04 -0000 @@ -42,7 +42,7 @@ #if defined(__GNUC__) || defined(__INTEL_COMPILER) #define __MAKE_SET(set, sym) \ static void const * const __set_##set##_sym_##sym \ - __section("set_" #set) __unused = &sym + __section("set_" #set) __used = &sym #else /* !(__GNUC__ || __INTEL_COMPILER) */ #ifndef lint #error "This file needs to be compiled by GCC, an Intel compiler or lint" Index: sys/sys/sysctl.h =================================================================== RCS file: /usr/download/ncvs/src/sys/sys/sysctl.h,v retrieving revision 1.131 diff -u -r1.131 sysctl.h --- sys/sys/sysctl.h 19 Jun 2004 13:42:05 -0000 1.131 +++ sys/sys/sysctl.h 4 Jul 2004 17:53:39 -0000 @@ -180,6 +180,8 @@ /* Hide these in macros */ #define SYSCTL_CHILDREN(oid_ptr) (struct sysctl_oid_list *) \ (oid_ptr)->oid_arg1 +#define SYSCTL_CHILDREN_SET(oid_ptr, val) \ + (oid_ptr)->oid_arg1 = (val); #define SYSCTL_STATIC_CHILDREN(oid_name) \ (&sysctl_##oid_name##_children) Index: sys/ufs/ffs/ffs_alloc.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ffs/ffs_alloc.c,v retrieving revision 1.121 diff -u -r1.121 ffs_alloc.c --- sys/ufs/ffs/ffs_alloc.c 16 Jun 2004 09:47:25 -0000 1.121 +++ sys/ufs/ffs/ffs_alloc.c 4 Jul 2004 18:59:49 -0000 @@ -152,7 +152,7 @@ cg = dtog(fs, bpref); bno = ffs_hashalloc(ip, cg, bpref, size, ffs_alloccg); if (bno > 0) { - DIP(ip, i_blocks) += btodb(size); + DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + btodb(size)); ip->i_flag |= IN_CHANGE | IN_UPDATE; *bnp = bno; return (0); @@ -256,7 +256,7 @@ if (bno) { if (bp->b_blkno != fsbtodb(fs, bno)) panic("ffs_realloccg: bad blockno"); - DIP(ip, i_blocks) += btodb(nsize - osize); + DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + btodb(nsize - osize)); ip->i_flag |= IN_CHANGE | IN_UPDATE; allocbuf(bp, nsize); bp->b_flags |= B_DONE; @@ -324,7 +324,7 @@ if (nsize < request) ffs_blkfree(fs, ip->i_devvp, bno + numfrags(fs, nsize), (long)(request - nsize), ip->i_number); - DIP(ip, i_blocks) += btodb(nsize - osize); + DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + btodb(nsize - osize)); ip->i_flag |= IN_CHANGE | IN_UPDATE; allocbuf(bp, nsize); bp->b_flags |= B_DONE; @@ -874,16 +874,16 @@ if (DIP(ip, i_blocks) && (fs->fs_flags & FS_UNCLEAN) == 0) { /* XXX */ printf("free inode %s/%lu had %ld blocks\n", fs->fs_fsmnt, (u_long)ino, (long)DIP(ip, i_blocks)); - DIP(ip, i_blocks) = 0; + DIP_SET(ip, i_blocks, 0); } ip->i_flags = 0; - DIP(ip, i_flags) = 0; + DIP_SET(ip, i_flags, 0); /* * Set up a new generation number for this inode. */ if (ip->i_gen == 0 || ++ip->i_gen == 0) ip->i_gen = arc4random() / 2 + 1; - DIP(ip, i_gen) = ip->i_gen; + DIP_SET(ip, i_gen, ip->i_gen); if (fs->fs_magic == FS_UFS2_MAGIC) { vfs_timestamp(&ts); ip->i_din2->di_birthtime = ts.tv_sec; @@ -2268,7 +2268,7 @@ break; ip = VTOI(vp); ip->i_nlink += cmd.size; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_effnlink += cmd.size; ip->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(vp)) @@ -2287,7 +2287,7 @@ if ((error = VFS_VGET(mp, (ino_t)cmd.value, LK_EXCLUSIVE, &vp))) break; ip = VTOI(vp); - DIP(ip, i_blocks) += cmd.size; + DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + cmd.size); ip->i_flag |= IN_CHANGE; vput(vp); break; Index: sys/ufs/ffs/ffs_inode.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ffs/ffs_inode.c,v retrieving revision 1.92 diff -u -r1.92 ffs_inode.c --- sys/ufs/ffs/ffs_inode.c 7 Apr 2004 03:47:20 -0000 1.92 +++ sys/ufs/ffs/ffs_inode.c 4 Jul 2004 19:12:38 -0000 @@ -229,7 +229,7 @@ #endif bzero(SHORTLINK(oip), (u_int)oip->i_size); oip->i_size = 0; - DIP(oip, i_size) = 0; + DIP_SET(oip, i_size, 0); oip->i_flag |= IN_CHANGE | IN_UPDATE; if (needextclean) softdep_setup_freeblocks(oip, length, IO_EXT); @@ -291,7 +291,7 @@ if (error) return (error); oip->i_size = length; - DIP(oip, i_size) = length; + DIP_SET(oip, i_size, length); if (bp->b_bufsize == fs->fs_bsize) bp->b_flags |= B_CLUSTEROK; if (flags & IO_SYNC) @@ -312,7 +312,7 @@ offset = blkoff(fs, length); if (offset == 0) { oip->i_size = length; - DIP(oip, i_size) = length; + DIP_SET(oip, i_size, length); } else { lbn = lblkno(fs, length); flags |= BA_CLRBUF; @@ -333,7 +333,7 @@ (error = VOP_FSYNC(ovp, cred, MNT_WAIT, td)) != 0) return (error); oip->i_size = length; - DIP(oip, i_size) = length; + DIP_SET(oip, i_size, length); size = blksize(fs, oip, lbn); if (ovp->v_type != VDIR) bzero((char *)bp->b_data + offset, @@ -367,14 +367,14 @@ for (level = TRIPLE; level >= SINGLE; level--) { oldblks[NDADDR + level] = DIP(oip, i_ib[level]); if (lastiblock[level] < 0) { - DIP(oip, i_ib[level]) = 0; + DIP_SET(oip, i_ib[level], 0); lastiblock[level] = -1; } } for (i = 0; i < NDADDR; i++) { oldblks[i] = DIP(oip, i_db[i]); if (i > lastblock) - DIP(oip, i_db[i]) = 0; + DIP_SET(oip, i_db[i], 0); } oip->i_flag |= IN_CHANGE | IN_UPDATE; allerror = UFS_UPDATE(ovp, 1); @@ -387,14 +387,14 @@ */ for (i = 0; i < NDADDR; i++) { newblks[i] = DIP(oip, i_db[i]); - DIP(oip, i_db[i]) = oldblks[i]; + DIP_SET(oip, i_db[i], oldblks[i]); } for (i = 0; i < NIADDR; i++) { newblks[NDADDR + i] = DIP(oip, i_ib[i]); - DIP(oip, i_ib[i]) = oldblks[NDADDR + i]; + DIP_SET(oip, i_ib[i], oldblks[NDADDR + i]); } oip->i_size = osize; - DIP(oip, i_size) = osize; + DIP_SET(oip, i_size, osize); error = vtruncbuf(ovp, cred, td, length, fs->fs_bsize); if (error && (allerror == 0)) @@ -415,7 +415,7 @@ allerror = error; blocksreleased += count; if (lastiblock[level] < 0) { - DIP(oip, i_ib[level]) = 0; + DIP_SET(oip, i_ib[level], 0); ffs_blkfree(fs, oip->i_devvp, bn, fs->fs_bsize, oip->i_number); blocksreleased += nblocks; @@ -434,7 +434,7 @@ bn = DIP(oip, i_db[i]); if (bn == 0) continue; - DIP(oip, i_db[i]) = 0; + DIP_SET(oip, i_db[i], 0); bsize = blksize(fs, oip, i); ffs_blkfree(fs, oip->i_devvp, bn, bsize, oip->i_number); blocksreleased += btodb(bsize); @@ -456,7 +456,7 @@ */ oldspace = blksize(fs, oip, lastblock); oip->i_size = length; - DIP(oip, i_size) = length; + DIP_SET(oip, i_size, length); newspace = blksize(fs, oip, lastblock); if (newspace == 0) panic("ffs_truncate: newspace"); @@ -492,11 +492,11 @@ * Put back the real size. */ oip->i_size = length; - DIP(oip, i_size) = length; - DIP(oip, i_blocks) -= blocksreleased; + DIP_SET(oip, i_size, length); + DIP_SET(oip, i_blocks, DIP(oip, i_blocks) - blocksreleased); if (DIP(oip, i_blocks) < 0) /* sanity */ - DIP(oip, i_blocks) = 0; + DIP_SET(oip, i_blocks, 0); oip->i_flag |= IN_CHANGE; #ifdef QUOTA (void) chkdq(oip, -blocksreleased, NOCRED, 0); @@ -579,7 +579,10 @@ MALLOC(copy, caddr_t, fs->fs_bsize, M_TEMP, M_WAITOK); bcopy((caddr_t)bp->b_data, copy, (u_int)fs->fs_bsize); for (i = last + 1; i < NINDIR(fs); i++) - BAP(ip, i) = 0; + if (ip->i_ump->um_fstype == UFS1) + bap1[i] = 0; + else + bap2[i] = 0; if (DOINGASYNC(vp)) { bawrite(bp); } else { Index: sys/ufs/ffs/ffs_snapshot.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ffs/ffs_snapshot.c,v retrieving revision 1.83 diff -u -r1.83 ffs_snapshot.c --- sys/ufs/ffs/ffs_snapshot.c 4 Jul 2004 08:52:35 -0000 1.83 +++ sys/ufs/ffs/ffs_snapshot.c 4 Jul 2004 19:18:57 -0000 @@ -211,7 +211,7 @@ if (error) goto out; ip->i_size = lblktosize(fs, (off_t)numblks); - DIP(ip, i_size) = ip->i_size; + DIP_SET(ip, i_size, ip->i_size); ip->i_flag |= IN_CHANGE | IN_UPDATE; if ((error = readblock(bp, numblks - 1)) != 0) goto out; @@ -286,7 +286,7 @@ * Change inode to snapshot type file. */ ip->i_flags |= SF_SNAPSHOT; - DIP(ip, i_flags) = ip->i_flags; + DIP_SET(ip, i_flags, ip->i_flags); ip->i_flag |= IN_CHANGE | IN_UPDATE; /* * Ensure that the snapshot is completely on disk. @@ -455,7 +455,7 @@ ffs_blkfree(copy_fs, vp, DIP(xp, i_db[loc]), len, xp->i_number); blkno = DIP(xp, i_db[loc]); - DIP(xp, i_db[loc]) = 0; + DIP_SET(xp, i_db[loc], 0); } } snaplistsize += 1; @@ -466,7 +466,7 @@ error = expunge_ufs2(vp, xp, copy_fs, fullacct_ufs2, BLK_NOCOPY); if (blkno) - DIP(xp, i_db[loc]) = blkno; + DIP_SET(xp, i_db[loc], blkno); if (!error) error = ffs_freefile(copy_fs, vp, xp->i_number, xp->i_mode); @@ -738,9 +738,9 @@ if (base < NDADDR) { for ( ; loc < NDADDR; loc++) { if (ffs_isblock(fs, cg_blksfree(cgp), loc)) - DIP(ip, i_db[loc]) = BLK_NOCOPY; + DIP_SET(ip, i_db[loc], BLK_NOCOPY); else if (passno == 2 && DIP(ip, i_db[loc])== BLK_NOCOPY) - DIP(ip, i_db[loc]) = 0; + DIP_SET(ip, i_db[loc], 0); else if (passno == 1 && DIP(ip, i_db[loc])== BLK_NOCOPY) panic("ffs_snapshot: lost direct block"); } @@ -1452,12 +1452,13 @@ for (blkno = 1; blkno < NDADDR; blkno++) { dblk = DIP(ip, i_db[blkno]); if (dblk == BLK_NOCOPY || dblk == BLK_SNAP) - DIP(ip, i_db[blkno]) = 0; + DIP_SET(ip, i_db[blkno], 0); else if ((dblk == blkstofrags(fs, blkno) && ffs_snapblkfree(fs, ip->i_devvp, dblk, fs->fs_bsize, ip->i_number))) { - DIP(ip, i_blocks) -= btodb(fs->fs_bsize); - DIP(ip, i_db[blkno]) = 0; + DIP_SET(ip, i_blocks, DIP(ip, i_blocks) - + btodb(fs->fs_bsize)); + DIP_SET(ip, i_db[blkno], 0); } } numblks = howmany(ip->i_size, fs->fs_bsize); @@ -1500,7 +1501,7 @@ * Clear snapshot flag and drop reference. */ ip->i_flags &= ~SF_SNAPSHOT; - DIP(ip, i_flags) = ip->i_flags; + DIP_SET(ip, i_flags, ip->i_flags); ip->i_flag |= IN_CHANGE | IN_UPDATE; } @@ -1597,7 +1598,7 @@ } snapshot_locked = 1; if (lbn < NDADDR) { - DIP(ip, i_db[lbn]) = BLK_NOCOPY; + DIP_SET(ip, i_db[lbn], BLK_NOCOPY); ip->i_flag |= IN_CHANGE | IN_UPDATE; } else if (ip->i_ump->um_fstype == UFS1) { ((ufs1_daddr_t *)(ibp->b_data))[indiroff] = @@ -1644,7 +1645,7 @@ (intmax_t)lbn, inum); #endif if (lbn < NDADDR) { - DIP(ip, i_db[lbn]) = bno; + DIP_SET(ip, i_db[lbn], bno); } else if (ip->i_ump->um_fstype == UFS1) { ((ufs1_daddr_t *)(ibp->b_data))[indiroff] = bno; bdwrite(ibp); @@ -1652,7 +1653,7 @@ ((ufs2_daddr_t *)(ibp->b_data))[indiroff] = bno; bdwrite(ibp); } - DIP(ip, i_blocks) += btodb(size); + DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + btodb(size)); ip->i_flag |= IN_CHANGE | IN_UPDATE; VOP_UNLOCK(vp, 0, td); return (1); Index: sys/ufs/ffs/ffs_softdep.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ffs/ffs_softdep.c,v retrieving revision 1.154 diff -u -r1.154 ffs_softdep.c --- sys/ufs/ffs/ffs_softdep.c 10 Jul 2004 20:45:47 -0000 1.154 +++ sys/ufs/ffs/ffs_softdep.c 11 Jul 2004 00:03:32 -0000 @@ -1968,15 +1968,15 @@ } else { freeblks->fb_oldsize = ip->i_size; ip->i_size = 0; - DIP(ip, i_size) = 0; + DIP_SET(ip, i_size, 0); freeblks->fb_chkcnt = datablocks; for (i = 0; i < NDADDR; i++) { freeblks->fb_dblks[i] = DIP(ip, i_db[i]); - DIP(ip, i_db[i]) = 0; + DIP_SET(ip, i_db[i], 0); } for (i = 0; i < NIADDR; i++) { freeblks->fb_iblks[i] = DIP(ip, i_ib[i]); - DIP(ip, i_ib[i]) = 0; + DIP_SET(ip, i_ib[i], 0); } /* * If the file was removed, then the space being freed was @@ -1997,7 +1997,7 @@ ip->i_din2->di_extb[i] = 0; } } - DIP(ip, i_blocks) -= freeblks->fb_chkcnt; + DIP_SET(ip, i_blocks, DIP(ip, i_blocks) - freeblks->fb_chkcnt); /* * Push the zero'ed inode to to its disk buffer so that we are free * to delete its dependencies below. Once the dependencies are gone @@ -2510,7 +2510,8 @@ VFS_VGET(freeblks->fb_mnt, freeblks->fb_previousinum, (flags & LK_NOWAIT) | LK_EXCLUSIVE, &vp) == 0) { ip = VTOI(vp); - DIP(ip, i_blocks) += freeblks->fb_chkcnt - blocksreleased; + DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + \ + freeblks->fb_chkcnt - blocksreleased); ip->i_flag |= IN_CHANGE; vput(vp); } @@ -3315,7 +3316,7 @@ */ if ((dirrem->dm_state & RMDIR) == 0) { ip->i_nlink--; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; if (ip->i_nlink < ip->i_effnlink) { FREE_LOCK(&lk); @@ -3336,7 +3337,7 @@ * the parent decremented to account for the loss of "..". */ ip->i_nlink -= 2; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; if (ip->i_nlink < ip->i_effnlink) { FREE_LOCK(&lk); Index: sys/ufs/ffs/ffs_vfsops.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ffs/ffs_vfsops.c,v retrieving revision 1.236 diff -u -r1.236 ffs_vfsops.c --- sys/ufs/ffs/ffs_vfsops.c 12 Jul 2004 08:14:09 -0000 1.236 +++ sys/ufs/ffs/ffs_vfsops.c 13 Jul 2004 00:44:34 -0000 @@ -1332,7 +1332,7 @@ ip->i_gen = arc4random() / 2 + 1; if ((vp->v_mount->mnt_flag & MNT_RDONLY) == 0) { ip->i_flag |= IN_MODIFIED; - DIP(ip, i_gen) = ip->i_gen; + DIP_SET(ip, i_gen, ip->i_gen); } } /* Index: sys/ufs/ffs/ffs_vnops.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ffs/ffs_vnops.c,v retrieving revision 1.130 diff -u -r1.130 ffs_vnops.c --- sys/ufs/ffs/ffs_vnops.c 21 May 2004 12:05:48 -0000 1.130 +++ sys/ufs/ffs/ffs_vnops.c 4 Jul 2004 19:27:44 -0000 @@ -667,7 +667,7 @@ if (uio->uio_offset + xfersize > ip->i_size) { ip->i_size = uio->uio_offset + xfersize; - DIP(ip, i_size) = ip->i_size; + DIP_SET(ip, i_size, ip->i_size); extended = 1; } @@ -722,7 +722,7 @@ if (resid > uio->uio_resid && ap->a_cred && suser_cred(ap->a_cred, PRISON_ROOT)) { ip->i_mode &= ~(ISUID | ISGID); - DIP(ip, i_mode) = ip->i_mode; + DIP_SET(ip, i_mode, ip->i_mode); } if (resid > uio->uio_resid) VN_KNOTE(vp, NOTE_WRITE | (extended ? NOTE_EXTEND : 0)); Index: sys/ufs/ufs/inode.h =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ufs/inode.h,v retrieving revision 1.45 diff -u -r1.45 inode.h --- sys/ufs/ufs/inode.h 7 Apr 2004 03:47:20 -0000 1.45 +++ sys/ufs/ufs/inode.h 4 Jul 2004 18:54:02 -0000 @@ -136,6 +136,12 @@ #define DIP(ip, field) \ (((ip)->i_ump->um_fstype == UFS1) ? \ (ip)->i_din1->d##field : (ip)->i_din2->d##field) +#define DIP_SET(ip, field, val) do { \ + if ((ip)->i_ump->um_fstype == UFS1) \ + (ip)->i_din1->d##field = (val); \ + else \ + (ip)->i_din2->d##field = (val); \ + } while (0) #define MAXSYMLINKLEN(ip) \ ((ip)->i_ump->um_fstype == UFS1) ? \ Index: sys/ufs/ufs/ufs_acl.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ufs/ufs_acl.c,v retrieving revision 1.18 diff -u -r1.18 ufs_acl.c --- sys/ufs/ufs/ufs_acl.c 4 Aug 2003 03:29:13 -0000 1.18 +++ sys/ufs/ufs/ufs_acl.c 4 Jul 2004 19:28:25 -0000 @@ -136,7 +136,7 @@ ip->i_mode &= ACL_PRESERVE_MASK; ip->i_mode |= acl_posix1e_acl_to_mode(acl); - DIP(ip, i_mode) = ip->i_mode; + DIP_SET(ip, i_mode, ip->i_mode); } /* Index: sys/ufs/ufs/ufs_inode.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ufs/ufs_inode.c,v retrieving revision 1.53 diff -u -r1.53 ufs_inode.c --- sys/ufs/ufs/ufs_inode.c 7 Apr 2004 03:47:20 -0000 1.53 +++ sys/ufs/ufs/ufs_inode.c 4 Jul 2004 19:29:32 -0000 @@ -103,10 +103,10 @@ * So, rather than creating a new entry point to do the * same thing, we just use softdep_change_linkcnt(). */ - DIP(ip, i_rdev) = 0; + DIP_SET(ip, i_rdev, 0); mode = ip->i_mode; ip->i_mode = 0; - DIP(ip, i_mode) = 0; + DIP_SET(ip, i_mode, 0); ip->i_flag |= IN_CHANGE | IN_UPDATE; if (DOINGSOFTDEP(vp)) softdep_change_linkcnt(ip); Index: sys/ufs/ufs/ufs_lookup.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ufs/ufs_lookup.c,v retrieving revision 1.70 diff -u -r1.70 ufs_lookup.c --- sys/ufs/ufs/ufs_lookup.c 7 Apr 2004 03:47:20 -0000 1.70 +++ sys/ufs/ufs/ufs_lookup.c 4 Jul 2004 19:32:31 -0000 @@ -465,7 +465,7 @@ if (dp->i_offset + DIRSIZ(OFSFMT(vdp), ep) > dp->i_size) { ufs_dirbad(dp, dp->i_offset, "i_size too small"); dp->i_size = dp->i_offset + DIRSIZ(OFSFMT(vdp), ep); - DIP(dp, i_size) = dp->i_size; + DIP_SET(dp, i_size, dp->i_size); dp->i_flag |= IN_CHANGE | IN_UPDATE; } brelse(bp); @@ -758,7 +758,7 @@ return (error); } dp->i_size = dp->i_offset + DIRBLKSIZ; - DIP(dp, i_size) = dp->i_size; + DIP_SET(dp, i_size, dp->i_size); dp->i_flag |= IN_CHANGE | IN_UPDATE; vnode_pager_setsize(dvp, (u_long)dp->i_size); dirp->d_reclen = DIRBLKSIZ; @@ -839,7 +839,7 @@ */ if (dp->i_offset + dp->i_count > dp->i_size) { dp->i_size = dp->i_offset + dp->i_count; - DIP(dp, i_size) = dp->i_size; + DIP_SET(dp, i_size, dp->i_size); } /* * Get the block containing the space for the new directory entry. @@ -1051,7 +1051,7 @@ if (ip) { ip->i_effnlink--; ip->i_nlink--; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; } if (flags & DOWHITEOUT) @@ -1105,7 +1105,7 @@ bdwrite(bp); } else { oip->i_nlink--; - DIP(oip, i_nlink) = oip->i_nlink; + DIP_SET(oip, i_nlink, oip->i_nlink); oip->i_flag |= IN_CHANGE; if (DOINGASYNC(vdp)) { bdwrite(bp); Index: sys/ufs/ufs/ufs_vnops.c =================================================================== RCS file: /usr/download/ncvs/src/sys/ufs/ufs/ufs_vnops.c,v retrieving revision 1.239 diff -u -r1.239 ufs_vnops.c --- sys/ufs/ufs/ufs_vnops.c 7 Apr 2004 03:47:20 -0000 1.239 +++ sys/ufs/ufs/ufs_vnops.c 4 Jul 2004 19:49:08 -0000 @@ -163,17 +163,17 @@ if ((vp->v_mount->mnt_flag & MNT_RDONLY) == 0) { vfs_timestamp(&ts); if (ip->i_flag & IN_ACCESS) { - DIP(ip, i_atime) = ts.tv_sec; - DIP(ip, i_atimensec) = ts.tv_nsec; + DIP_SET(ip, i_atime, ts.tv_sec); + DIP_SET(ip, i_atimensec, ts.tv_nsec); } if (ip->i_flag & IN_UPDATE) { - DIP(ip, i_mtime) = ts.tv_sec; - DIP(ip, i_mtimensec) = ts.tv_nsec; + DIP_SET(ip, i_mtime, ts.tv_sec); + DIP_SET(ip, i_mtimensec, ts.tv_nsec); ip->i_modrev++; } if (ip->i_flag & IN_CHANGE) { - DIP(ip, i_ctime) = ts.tv_sec; - DIP(ip, i_ctimensec) = ts.tv_nsec; + DIP_SET(ip, i_ctime, ts.tv_sec); + DIP_SET(ip, i_ctimensec, ts.tv_nsec); } } ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_UPDATE); @@ -233,7 +233,7 @@ * Want to be able to use this to make badblock * inodes, so don't truncate the dev number. */ - DIP(ip, i_rdev) = vap->va_rdev; + DIP_SET(ip, i_rdev, vap->va_rdev); } /* * Remove inode, then reload it through VFS_VGET so it is @@ -513,7 +513,7 @@ (ip->i_flags & SF_SNAPSHOT) != 0)) return (EPERM); ip->i_flags = vap->va_flags; - DIP(ip, i_flags) = vap->va_flags; + DIP_SET(ip, i_flags, vap->va_flags); } else { if (ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND) || @@ -521,7 +521,7 @@ return (EPERM); ip->i_flags &= SF_SETTABLE; ip->i_flags |= (vap->va_flags & UF_SETTABLE); - DIP(ip, i_flags) = ip->i_flags; + DIP_SET(ip, i_flags, ip->i_flags); } ip->i_flag |= IN_CHANGE; if (vap->va_flags & (IMMUTABLE | APPEND)) @@ -590,12 +590,12 @@ ip->i_flag |= IN_MODIFIED; ufs_itimes(vp); if (vap->va_atime.tv_sec != VNOVAL) { - DIP(ip, i_atime) = vap->va_atime.tv_sec; - DIP(ip, i_atimensec) = vap->va_atime.tv_nsec; + DIP_SET(ip, i_atime, vap->va_atime.tv_sec); + DIP_SET(ip, i_atimensec, vap->va_atime.tv_nsec); } if (vap->va_mtime.tv_sec != VNOVAL) { - DIP(ip, i_mtime) = vap->va_mtime.tv_sec; - DIP(ip, i_mtimensec) = vap->va_mtime.tv_nsec; + DIP_SET(ip, i_mtime, vap->va_mtime.tv_sec); + DIP_SET(ip, i_mtimensec, vap->va_mtime.tv_nsec); } if (vap->va_birthtime.tv_sec != VNOVAL && ip->i_ump->um_fstype == UFS2) { @@ -656,7 +656,7 @@ } ip->i_mode &= ~ALLPERMS; ip->i_mode |= (mode & ALLPERMS); - DIP(ip, i_mode) = ip->i_mode; + DIP_SET(ip, i_mode, ip->i_mode); ip->i_flag |= IN_CHANGE; return (0); } @@ -723,9 +723,9 @@ } #endif ip->i_gid = gid; - DIP(ip, i_gid) = gid; + DIP_SET(ip, i_gid, gid); ip->i_uid = uid; - DIP(ip, i_uid) = uid; + DIP_SET(ip, i_uid, uid); #ifdef QUOTA if ((error = getinoquota(ip)) == 0) { if (ouid == uid) { @@ -748,9 +748,9 @@ } } ip->i_gid = ogid; - DIP(ip, i_gid) = ogid; + DIP_SET(ip, i_gid, ogid); ip->i_uid = ouid; - DIP(ip, i_uid) = ouid; + DIP_SET(ip, i_uid, ouid); if (getinoquota(ip) == 0) { if (ouid == uid) { dqrele(vp, ip->i_dquot[USRQUOTA]); @@ -772,7 +772,7 @@ ip->i_flag |= IN_CHANGE; if (suser_cred(cred, PRISON_ROOT) && (ouid != uid || ogid != gid)) { ip->i_mode &= ~(ISUID | ISGID); - DIP(ip, i_mode) = ip->i_mode; + DIP_SET(ip, i_mode, ip->i_mode); } return (0); } @@ -842,7 +842,7 @@ } ip->i_effnlink++; ip->i_nlink++; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(vp)) softdep_change_linkcnt(ip); @@ -855,7 +855,7 @@ if (error) { ip->i_effnlink--; ip->i_nlink--; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(vp)) softdep_change_linkcnt(ip); @@ -1057,7 +1057,7 @@ */ ip->i_effnlink++; ip->i_nlink++; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(fvp)) softdep_change_linkcnt(ip); @@ -1123,7 +1123,7 @@ } dp->i_effnlink++; dp->i_nlink++; - DIP(dp, i_nlink) = dp->i_nlink; + DIP_SET(dp, i_nlink, dp->i_nlink); dp->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(tdvp)) softdep_change_linkcnt(dp); @@ -1138,7 +1138,7 @@ if (doingdirectory && newparent) { dp->i_effnlink--; dp->i_nlink--; - DIP(dp, i_nlink) = dp->i_nlink; + DIP_SET(dp, i_nlink, dp->i_nlink); dp->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(tdvp)) softdep_change_linkcnt(dp); @@ -1217,11 +1217,11 @@ */ if (!newparent) { dp->i_nlink--; - DIP(dp, i_nlink) = dp->i_nlink; + DIP_SET(dp, i_nlink, dp->i_nlink); dp->i_flag |= IN_CHANGE; } xp->i_nlink--; - DIP(xp, i_nlink) = xp->i_nlink; + DIP_SET(xp, i_nlink, xp->i_nlink); xp->i_flag |= IN_CHANGE; ioflag = IO_NORMAL; if (DOINGASYNC(tvp)) @@ -1320,7 +1320,7 @@ if (vn_lock(fvp, LK_EXCLUSIVE, td) == 0) { ip->i_effnlink--; ip->i_nlink--; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; ip->i_flag &= ~IN_RENAME; if (DOINGSOFTDEP(fvp)) @@ -1378,7 +1378,7 @@ goto out; ip = VTOI(tvp); ip->i_gid = dp->i_gid; - DIP(ip, i_gid) = dp->i_gid; + DIP_SET(ip, i_gid, dp->i_gid); #ifdef SUIDDIR { #ifdef QUOTA @@ -1397,7 +1397,7 @@ (dp->i_mode & ISUID) && dp->i_uid) { dmode |= ISUID; ip->i_uid = dp->i_uid; - DIP(ip, i_uid) = dp->i_uid; + DIP_SET(ip, i_uid, dp->i_uid); #ifdef QUOTA if (dp->i_uid != cnp->cn_cred->cr_uid) { /* @@ -1416,7 +1416,7 @@ #endif } else { ip->i_uid = cnp->cn_cred->cr_uid; - DIP(ip, i_uid) = ip->i_uid; + DIP_SET(ip, i_uid, ip->i_uid); } #ifdef QUOTA if ((error = getinoquota(ip)) || @@ -1429,7 +1429,7 @@ } #else /* !SUIDDIR */ ip->i_uid = cnp->cn_cred->cr_uid; - DIP(ip, i_uid) = ip->i_uid; + DIP_SET(ip, i_uid, ip->i_uid); #ifdef QUOTA if ((error = getinoquota(ip)) || (error = chkiq(ip, 1, cnp->cn_cred, 0))) { @@ -1461,7 +1461,7 @@ if (acl->acl_cnt != 0) { dmode = acl_posix1e_newfilemode(dmode, acl); ip->i_mode = dmode; - DIP(ip, i_mode) = dmode; + DIP_SET(ip, i_mode, dmode); *dacl = *acl; ufs_sync_acl_from_inode(ip, acl); break; @@ -1473,7 +1473,7 @@ * Just use the mode as-is. */ ip->i_mode = dmode; - DIP(ip, i_mode) = dmode; + DIP_SET(ip, i_mode, dmode); FREE(acl, M_ACL); FREE(dacl, M_ACL); dacl = acl = NULL; @@ -1489,19 +1489,19 @@ } else { #endif /* !UFS_ACL */ ip->i_mode = dmode; - DIP(ip, i_mode) = dmode; + DIP_SET(ip, i_mode, dmode); #ifdef UFS_ACL } #endif tvp->v_type = VDIR; /* Rest init'd in getnewvnode(). */ ip->i_effnlink = 2; ip->i_nlink = 2; - DIP(ip, i_nlink) = 2; + DIP_SET(ip, i_nlink, 2); if (DOINGSOFTDEP(tvp)) softdep_change_linkcnt(ip); if (cnp->cn_flags & ISWHITEOUT) { ip->i_flags |= UF_OPAQUE; - DIP(ip, i_flags) = ip->i_flags; + DIP_SET(ip, i_flags, ip->i_flags); } /* @@ -1511,7 +1511,7 @@ */ dp->i_effnlink++; dp->i_nlink++; - DIP(dp, i_nlink) = dp->i_nlink; + DIP_SET(dp, i_nlink, dp->i_nlink); dp->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(dvp)) softdep_change_linkcnt(dp); @@ -1577,7 +1577,7 @@ BA_CLRBUF, &bp)) != 0) goto bad; ip->i_size = DIRBLKSIZ; - DIP(ip, i_size) = DIRBLKSIZ; + DIP_SET(ip, i_size, DIRBLKSIZ); ip->i_flag |= IN_CHANGE | IN_UPDATE; vnode_pager_setsize(tvp, (u_long)ip->i_size); bcopy((caddr_t)&dirtemplate, (caddr_t)bp->b_data, sizeof dirtemplate); @@ -1625,7 +1625,7 @@ } else { dp->i_effnlink--; dp->i_nlink--; - DIP(dp, i_nlink) = dp->i_nlink; + DIP_SET(dp, i_nlink, dp->i_nlink); dp->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(dvp)) softdep_change_linkcnt(dp); @@ -1635,7 +1635,7 @@ */ ip->i_effnlink = 0; ip->i_nlink = 0; - DIP(ip, i_nlink) = 0; + DIP_SET(ip, i_nlink, 0); ip->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(tvp)) softdep_change_linkcnt(ip); @@ -1724,10 +1724,10 @@ */ if (!DOINGSOFTDEP(vp)) { dp->i_nlink--; - DIP(dp, i_nlink) = dp->i_nlink; + DIP_SET(dp, i_nlink, dp->i_nlink); dp->i_flag |= IN_CHANGE; ip->i_nlink--; - DIP(ip, i_nlink) = ip->i_nlink; + DIP_SET(ip, i_nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; ioflag = IO_NORMAL; if (DOINGASYNC(vp)) @@ -1774,7 +1774,7 @@ ip = VTOI(vp); bcopy(ap->a_target, SHORTLINK(ip), len); ip->i_size = len; - DIP(ip, i_size) = len; + DIP_SET(ip, i_size, len); ip->i_flag |= IN_CHANGE | IN_UPDATE; } else error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0, @@ -2385,7 +2385,7 @@ return (error); ip = VTOI(tvp); ip->i_gid = pdir->i_gid; - DIP(ip, i_gid) = pdir->i_gid; + DIP_SET(ip, i_gid, pdir->i_gid); #ifdef SUIDDIR { #ifdef QUOTA @@ -2403,7 +2403,7 @@ (pdir->i_mode & ISUID) && (pdir->i_uid != cnp->cn_cred->cr_uid) && pdir->i_uid) { ip->i_uid = pdir->i_uid; - DIP(ip, i_uid) = ip->i_uid; + DIP_SET(ip, i_uid, ip->i_uid); mode &= ~07111; #ifdef QUOTA /* @@ -2421,7 +2421,7 @@ #endif } else { ip->i_uid = cnp->cn_cred->cr_uid; - DIP(ip, i_uid) = ip->i_uid; + DIP_SET(ip, i_uid, ip->i_uid); } #ifdef QUOTA @@ -2435,7 +2435,7 @@ } #else /* !SUIDDIR */ ip->i_uid = cnp->cn_cred->cr_uid; - DIP(ip, i_uid) = ip->i_uid; + DIP_SET(ip, i_uid, ip->i_uid); #ifdef QUOTA if ((error = getinoquota(ip)) || (error = chkiq(ip, 1, cnp->cn_cred, 0))) { @@ -2472,7 +2472,7 @@ */ mode = acl_posix1e_newfilemode(mode, acl); ip->i_mode = mode; - DIP(ip, i_mode) = mode; + DIP_SET(ip, i_mode, mode); ufs_sync_acl_from_inode(ip, acl); break; } @@ -2483,7 +2483,7 @@ * Just use the mode as-is. */ ip->i_mode = mode; - DIP(ip, i_mode) = mode; + DIP_SET(ip, i_mode, mode); FREE(acl, M_ACL); acl = NULL; break; @@ -2498,25 +2498,25 @@ } else { #endif ip->i_mode = mode; - DIP(ip, i_mode) = mode; + DIP_SET(ip, i_mode, mode); #ifdef UFS_ACL } #endif tvp->v_type = IFTOVT(mode); /* Rest init'd in getnewvnode(). */ ip->i_effnlink = 1; ip->i_nlink = 1; - DIP(ip, i_nlink) = 1; + DIP_SET(ip, i_nlink, 1); if (DOINGSOFTDEP(tvp)) softdep_change_linkcnt(ip); if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, cnp->cn_cred) && suser_cred(cnp->cn_cred, PRISON_ROOT)) { ip->i_mode &= ~ISGID; - DIP(ip, i_mode) = ip->i_mode; + DIP_SET(ip, i_mode, ip->i_mode); } if (cnp->cn_flags & ISWHITEOUT) { ip->i_flags |= UF_OPAQUE; - DIP(ip, i_flags) = ip->i_flags; + DIP_SET(ip, i_flags, ip->i_flags); } /* @@ -2577,7 +2577,7 @@ */ ip->i_effnlink = 0; ip->i_nlink = 0; - DIP(ip, i_nlink) = 0; + DIP_SET(ip, i_nlink, 0); ip->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(tvp)) softdep_change_linkcnt(ip); Index: usr.bin/window/context.c =================================================================== RCS file: /usr/download/ncvs/src/usr.bin/window/context.c,v retrieving revision 1.3 diff -u -r1.3 context.c --- usr.bin/window/context.c 17 May 2001 09:38:48 -0000 1.3 +++ usr.bin/window/context.c 12 Jul 2004 05:59:19 -0000 @@ -49,8 +49,6 @@ * Context push/pop for nested command files. */ -char *malloc(); - cx_alloc() { register struct context *xp; Index: usr.bin/window/string.c =================================================================== RCS file: /usr/download/ncvs/src/usr.bin/window/string.c,v retrieving revision 1.4 diff -u -r1.4 string.c --- usr.bin/window/string.c 17 May 2001 09:38:48 -0000 1.4 +++ usr.bin/window/string.c 12 Jul 2004 05:59:49 -0000 @@ -43,8 +43,6 @@ #include /* System string definitions. */ #include "mystring.h" /* Local string definitions. */ -char *malloc(); - char * str_cpy(s) register char *s; Index: usr.bin/window/tttermcap.c =================================================================== RCS file: /usr/download/ncvs/src/usr.bin/window/tttermcap.c,v retrieving revision 1.3 diff -u -r1.3 tttermcap.c --- usr.bin/window/tttermcap.c 17 May 2001 09:38:48 -0000 1.3 +++ usr.bin/window/tttermcap.c 12 Jul 2004 06:00:20 -0000 @@ -44,7 +44,6 @@ char *tgetstr(); char *tgoto(); -char *malloc(); tttputc(c) { Index: usr.bin/window/var.c =================================================================== RCS file: /usr/download/ncvs/src/usr.bin/window/var.c,v retrieving revision 1.4 diff -u -r1.4 var.c --- usr.bin/window/var.c 17 May 2001 09:38:48 -0000 1.4 +++ usr.bin/window/var.c 12 Jul 2004 06:00:45 -0000 @@ -44,8 +44,6 @@ #include "var.h" #include "mystring.h" -char *malloc(); - struct var * var_set1(head, name, v) struct var **head; Index: usr.sbin/Makefile =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/Makefile,v retrieving revision 1.302 diff -u -r1.302 Makefile --- usr.sbin/Makefile 7 Jul 2004 22:48:30 -0000 1.302 +++ usr.sbin/Makefile 9 Jul 2004 00:48:04 -0000 @@ -66,7 +66,6 @@ jls \ kbdcontrol \ kbdmap \ - kernbb \ ${_keyserv} \ ${_kgmon} \ ${_kgzip} \ Index: usr.sbin/bluetooth/sdpd/profile.c =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/bluetooth/sdpd/profile.c,v retrieving revision 1.1 diff -u -r1.1 profile.c --- usr.sbin/bluetooth/sdpd/profile.c 20 Jan 2004 20:48:26 -0000 1.1 +++ usr.sbin/bluetooth/sdpd/profile.c 4 Jun 2004 20:22:17 -0000 @@ -125,7 +125,8 @@ for (; datalen > 0; datalen --) { SDP_PUT8(SDP_DATA_UUID16, buf); - SDP_PUT16(*((uint16_t const *)data)++, buf); + SDP_PUT16(*((uint16_t const *)data), buf); + data += sizeof(uint16_t); } return (2 + len); @@ -158,9 +159,11 @@ SDP_PUT8(SDP_DATA_SEQ8, buf); SDP_PUT8(6, buf); SDP_PUT8(SDP_DATA_UUID16, buf); - SDP_PUT16(*((uint16_t const *)data)++, buf); + SDP_PUT16(*((uint16_t const *)data), buf); + data += sizeof(uint16_t); SDP_PUT8(SDP_DATA_UINT16, buf); - SDP_PUT16(*((uint16_t const *)data)++, buf); + SDP_PUT16(*((uint16_t const *)data), buf); + data += sizeof(uint16_t); } return (2 + len); Index: usr.sbin/eeprom/ofw_options.c =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/eeprom/ofw_options.c,v retrieving revision 1.1 diff -u -r1.1 ofw_options.c --- usr.sbin/eeprom/ofw_options.c 22 May 2004 16:56:04 -0000 1.1 +++ usr.sbin/eeprom/ofw_options.c 13 Jul 2004 20:38:56 -0000 @@ -71,10 +71,16 @@ }; static int ofwo_setpass(int); -static __inline void ofwo_printprop(const char *, const char*, int); static int ofwo_setstr(int, const void *, int, const char *, const char *); +static __inline void +ofwo_printprop(const char *prop, const char* buf, int buflen) +{ + + printf("%s: %.*s\n", prop, buflen, buf); +} + static int ofwo_oemlogo(struct ofwo_extabent *exent, int fd, const void *buf, int buflen, const char *val) @@ -192,13 +198,6 @@ return (EX_OK); } -static void -ofwo_printprop(const char *prop, const char* buf, int buflen) -{ - - printf("%s: %.*s\n", prop, buflen, buf); -} - static int ofwo_setstr(int fd, const void *buf, int buflen, const char *prop, const char *val) Index: usr.sbin/kernbb/Makefile =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/kernbb/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- usr.sbin/kernbb/Makefile 3 Dec 2003 07:43:03 -0000 1.10 +++ usr.sbin/kernbb/Makefile 3 Jun 2004 05:35:20 -0000 @@ -1,13 +1,22 @@ # $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.10 2003/12/03 07:43:03 phk Exp $ PROG= kernbb +SRCS= kernbb.c MAN= kernbb.8 DPADD= ${LIBKVM} LDADD= -lkvm -CFLAGS+= -I${.CURDIR}/../../contrib/gcc +CFLAGS+= -I${.CURDIR}/../../contrib/gcc -I. WARNS?= 3 + +COMMONHDRS= gcov-iov.h +SRCS+= ${COMMONHDRS} +CLEANFILES+= ${COMMONHDRS} + +${COMMONHDRS}: ${.CURDIR}/../../gnu/usr.bin/cc/cc_tools/Makefile + ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} + .include Index: usr.sbin/pkg_install/add/Makefile =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/pkg_install/add/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- usr.sbin/pkg_install/add/Makefile 29 Jun 2004 19:06:41 -0000 1.19 +++ usr.sbin/pkg_install/add/Makefile 1 Jul 2004 04:20:58 -0000 @@ -5,7 +5,7 @@ CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -WARNS?= 6 +WARNS?= 3 WFORMAT?= 1 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} Index: usr.sbin/pkg_install/add/extract.c =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/pkg_install/add/extract.c,v retrieving revision 1.41 diff -u -r1.41 extract.c --- usr.sbin/pkg_install/add/extract.c 29 Jun 2004 19:06:41 -0000 1.41 +++ usr.sbin/pkg_install/add/extract.c 1 Jul 2004 02:38:20 -0000 @@ -132,7 +132,7 @@ Group = NULL; Mode = NULL; last_file = NULL; - (const char *)Directory = home; + Directory = (char *)home; /* Do it */ while (p) { @@ -223,7 +223,7 @@ Directory = p->name; } else - (const char *)Directory = home; + Directory = (char *)home; break; case PLIST_CMD: Index: usr.sbin/pkg_install/add/main.c =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/pkg_install/add/main.c,v retrieving revision 1.58 diff -u -r1.58 main.c --- usr.sbin/pkg_install/add/main.c 29 Jun 2004 19:06:41 -0000 1.58 +++ usr.sbin/pkg_install/add/main.c 1 Jul 2004 02:38:20 -0000 @@ -187,7 +187,7 @@ errx(1, "package name too long"); } if (!strcmp(*argv, "-")) /* stdin? */ - (const char *)pkgs[ch] = "-"; + pkgs[ch] = (char *)"-"; else if (isURL(*argv)) { /* preserve URLs */ if (strlcpy(pkgnames[ch], *argv, sizeof(pkgnames[ch])) >= sizeof(pkgnames[ch])) Index: usr.sbin/pkg_install/create/Makefile =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/pkg_install/create/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- usr.sbin/pkg_install/create/Makefile 29 Jun 2004 19:06:41 -0000 1.20 +++ usr.sbin/pkg_install/create/Makefile 1 Jul 2004 04:23:29 -0000 @@ -5,7 +5,7 @@ CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -WARNS?= 6 +WARNS?= 3 WFORMAT?= 1 DPADD= ${LIBINSTALL} ${LIBMD} Index: usr.sbin/pkg_install/create/perform.c =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/pkg_install/create/perform.c,v retrieving revision 1.78 diff -u -r1.78 perform.c --- usr.sbin/pkg_install/create/perform.c 29 Jun 2004 18:56:59 -0000 1.78 +++ usr.sbin/pkg_install/create/perform.c 1 Jul 2004 02:38:20 -0000 @@ -472,13 +472,15 @@ read_plist(&plist, fp); fclose(fp); - (const char *)Install = isfile(INSTALL_FNAME) ? INSTALL_FNAME : NULL; - (const char *)PostInstall = isfile(POST_INSTALL_FNAME) ? POST_INSTALL_FNAME : NULL; - (const char *)DeInstall = isfile(DEINSTALL_FNAME) ? DEINSTALL_FNAME : NULL; - (const char *)PostDeInstall = isfile(POST_DEINSTALL_FNAME) ? POST_DEINSTALL_FNAME : NULL; - (const char *)Require = isfile(REQUIRE_FNAME) ? REQUIRE_FNAME : NULL; - (const char *)Display = isfile(DISPLAY_FNAME) ? DISPLAY_FNAME : NULL; - (const char *)Mtree = isfile(MTREE_FNAME) ? MTREE_FNAME : NULL; + Install = isfile(INSTALL_FNAME) ? (char *)INSTALL_FNAME : NULL; + PostInstall = isfile(POST_INSTALL_FNAME) ? + (char *)POST_INSTALL_FNAME : NULL; + DeInstall = isfile(DEINSTALL_FNAME) ? (char *)DEINSTALL_FNAME : NULL; + PostDeInstall = isfile(POST_DEINSTALL_FNAME) ? + (char *)POST_DEINSTALL_FNAME : NULL; + Require = isfile(REQUIRE_FNAME) ? (char *)REQUIRE_FNAME : NULL; + Display = isfile(DISPLAY_FNAME) ? (char *)DISPLAY_FNAME : NULL; + Mtree = isfile(MTREE_FNAME) ? (char *)MTREE_FNAME : NULL; make_dist(homedir, pkg, suf, &plist); Index: usr.sbin/pkg_install/lib/Makefile =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/pkg_install/lib/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- usr.sbin/pkg_install/lib/Makefile 29 Jun 2004 19:06:42 -0000 1.15 +++ usr.sbin/pkg_install/lib/Makefile 1 Jul 2004 04:18:00 -0000 @@ -7,7 +7,7 @@ CFLAGS+= ${DEBUG} -WARNS?= 6 +WARNS?= 3 WFORMAT?= 1 .include Index: usr.sbin/pkg_install/lib/plist.c =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/pkg_install/lib/plist.c,v retrieving revision 1.47 diff -u -r1.47 plist.c --- usr.sbin/pkg_install/lib/plist.c 17 Apr 2003 09:56:05 -0000 1.47 +++ usr.sbin/pkg_install/lib/plist.c 1 Jul 2004 04:17:38 -0000 @@ -205,7 +205,7 @@ ++cp, ++sp; } if (arg) - (const char *)*arg = sp; + *arg = (char *)sp; if (!strcmp(cmd, "cwd")) return PLIST_CWD; else if (!strcmp(cmd, "srcdir")) Index: usr.sbin/ppp/radius.c =================================================================== RCS file: /usr/download/ncvs/src/usr.sbin/ppp/radius.c,v retrieving revision 1.45 diff -u -r1.45 radius.c --- usr.sbin/ppp/radius.c 26 Jun 2004 01:02:31 -0000 1.45 +++ usr.sbin/ppp/radius.c 1 Jul 2004 02:38:20 -0000 @@ -509,7 +509,7 @@ * Only point at the String field if we don't think the * peer has misformatted the response. */ - ((const char *)data)++; + data = (const char *)data + 1; len--; } else log_Printf(LogWARN, "Warning: The MS-CHAP-Error " @@ -536,7 +536,7 @@ * Only point at the String field if we don't think the * peer has misformatted the response. */ - ((const char *)data)++; + data = (const char *)data + 1; len--; } else log_Printf(LogWARN, "Warning: The MS-CHAP2-Success "