Date: Mon, 23 Dec 2013 04:38:57 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r259760 - in projects/sendfile: . bin/pax contrib/file contrib/gcc contrib/gcc/config contrib/gcc/config/rs6000 contrib/gcc/cp contrib/gcc/doc contrib/gcclibs/libcpp contrib/gcclibs/lib... Message-ID: <201312230438.rBN4cvgF092533@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Mon Dec 23 04:38:56 2013 New Revision: 259760 URL: http://svnweb.freebsd.org/changeset/base/259760 Log: Merge head up to r259759. Added: projects/sendfile/contrib/gcclibs/libcpp/ChangeLog.apple - copied unchanged from r259759, head/contrib/gcclibs/libcpp/ChangeLog.apple projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_fbd.c - copied unchanged from r259759, head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/sendfile/sys/arm/freescale/imx/imx51_ipuv3_fbd.c - copied unchanged from r259759, head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Modified: projects/sendfile/UPDATING projects/sendfile/bin/pax/pax.1 projects/sendfile/contrib/file/compress.c projects/sendfile/contrib/gcc/ChangeLog.gcc43 projects/sendfile/contrib/gcc/c-common.c projects/sendfile/contrib/gcc/c-convert.c projects/sendfile/contrib/gcc/c-incpath.c projects/sendfile/contrib/gcc/c-opts.c projects/sendfile/contrib/gcc/c-typeck.c projects/sendfile/contrib/gcc/c.opt projects/sendfile/contrib/gcc/calls.c projects/sendfile/contrib/gcc/cfg.c projects/sendfile/contrib/gcc/collect2.c projects/sendfile/contrib/gcc/config/darwin.h projects/sendfile/contrib/gcc/config/rs6000/rs6000.c projects/sendfile/contrib/gcc/cp/ChangeLog.gcc43 projects/sendfile/contrib/gcc/cp/Make-lang.in projects/sendfile/contrib/gcc/cp/cvt.c projects/sendfile/contrib/gcc/cp/decl.c projects/sendfile/contrib/gcc/cp/mangle.c projects/sendfile/contrib/gcc/cp/method.c projects/sendfile/contrib/gcc/cp/parser.c projects/sendfile/contrib/gcc/cp/pt.c projects/sendfile/contrib/gcc/cp/rtti.c projects/sendfile/contrib/gcc/cp/typeck.c projects/sendfile/contrib/gcc/doc/cppopts.texi projects/sendfile/contrib/gcc/doc/invoke.texi projects/sendfile/contrib/gcc/doc/tm.texi projects/sendfile/contrib/gcc/dwarf2out.c projects/sendfile/contrib/gcc/fold-const.c projects/sendfile/contrib/gcc/gcc.c projects/sendfile/contrib/gcc/gcov.c projects/sendfile/contrib/gcc/sched-vis.c projects/sendfile/contrib/gcc/target-def.h projects/sendfile/contrib/gcc/target.h projects/sendfile/contrib/gcc/tlink.c projects/sendfile/contrib/gcc/tree-dump.c projects/sendfile/contrib/gcc/version.c projects/sendfile/contrib/gcclibs/libcpp/charset.c projects/sendfile/contrib/gcclibs/libcpp/include/cpplib.h projects/sendfile/contrib/gcclibs/libcpp/init.c projects/sendfile/contrib/gcclibs/libcpp/lex.c projects/sendfile/contrib/gperf/lib/getline.cc projects/sendfile/contrib/tcpdump/addrtoname.c projects/sendfile/contrib/tcpdump/tcpdump.c projects/sendfile/contrib/tzdata/asia projects/sendfile/contrib/tzdata/northamerica projects/sendfile/etc/defaults/rc.conf projects/sendfile/etc/rc.d/Makefile projects/sendfile/gnu/lib/csu/Makefile projects/sendfile/gnu/lib/libgcc/Makefile projects/sendfile/gnu/lib/libstdc++/Makefile projects/sendfile/gnu/lib/libsupc++/Makefile projects/sendfile/lib/atf/libatf-c/tests/Makefile projects/sendfile/lib/libc/sys/shm_open.2 projects/sendfile/lib/libstand/close.c projects/sendfile/lib/libstand/dosfs.c projects/sendfile/lib/libstand/dosfs.h projects/sendfile/lib/libstand/environment.c projects/sendfile/lib/libvmmapi/vmmapi.c projects/sendfile/lib/libvmmapi/vmmapi.h projects/sendfile/release/Makefile projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/sendfile/release/rc.local projects/sendfile/sbin/ipfw/ipfw.8 projects/sendfile/sbin/swapon/swapon.c projects/sendfile/share/man/man4/arcmsr.4 projects/sendfile/share/man/man4/cxgbe.4 projects/sendfile/share/man/man9/Makefile projects/sendfile/share/man/man9/mbuf.9 projects/sendfile/share/mk/bsd.own.mk projects/sendfile/share/mk/bsd.sys.mk projects/sendfile/sys/amd64/amd64/pmap.c projects/sendfile/sys/amd64/include/pmap.h projects/sendfile/sys/amd64/include/vmm.h (contents, props changed) projects/sendfile/sys/amd64/vmm/intel/ept.c projects/sendfile/sys/amd64/vmm/intel/vmcs.c projects/sendfile/sys/amd64/vmm/intel/vmcs.h projects/sendfile/sys/amd64/vmm/intel/vmx.c projects/sendfile/sys/amd64/vmm/intel/vmx_genassym.c projects/sendfile/sys/amd64/vmm/io/vlapic.c projects/sendfile/sys/amd64/vmm/vmm.c projects/sendfile/sys/amd64/vmm/vmm_dev.c projects/sendfile/sys/arm/arm/cpufunc.c projects/sendfile/sys/arm/arm/elf_trampoline.c projects/sendfile/sys/arm/arm/identcpu.c projects/sendfile/sys/arm/arm/locore.S projects/sendfile/sys/arm/arm/swtch.S projects/sendfile/sys/arm/at91/uart_dev_at91usart.c projects/sendfile/sys/arm/broadcom/bcm2835/files.bcm2835 projects/sendfile/sys/arm/conf/RPI-B projects/sendfile/sys/arm/freescale/imx/files.imx51 projects/sendfile/sys/arm/include/armreg.h projects/sendfile/sys/arm/include/cpuconf.h projects/sendfile/sys/arm/include/cpufunc.h projects/sendfile/sys/arm/include/intr.h projects/sendfile/sys/arm/include/md_var.h projects/sendfile/sys/arm/mv/mv_pci.c projects/sendfile/sys/arm/ti/am335x/am335x_dmtimer.c projects/sendfile/sys/boot/ia64/efi/version projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/sendfile/sys/cddl/dev/fbt/fbt_powerpc.c projects/sendfile/sys/conf/Makefile.arm projects/sendfile/sys/conf/files.arm projects/sendfile/sys/conf/options.arm projects/sendfile/sys/dev/ae/if_ae.c projects/sendfile/sys/dev/arcmsr/arcmsr.c projects/sendfile/sys/dev/arcmsr/arcmsr.h projects/sendfile/sys/dev/cxgbe/tom/t4_listen.c projects/sendfile/sys/dev/cxgbe/tom/t4_tom.h projects/sendfile/sys/dev/drm2/drm_edid.c projects/sendfile/sys/dev/drm2/radeon/radeon_fence.c projects/sendfile/sys/dev/drm2/radeon/radeon_sa.c projects/sendfile/sys/dev/drm2/ttm/ttm_bo.c projects/sendfile/sys/dev/drm2/ttm/ttm_bo_vm.c projects/sendfile/sys/dev/drm2/ttm/ttm_lock.c projects/sendfile/sys/dev/fdt/fdt_common.h projects/sendfile/sys/dev/fdt/fdt_pci.c projects/sendfile/sys/dev/hwpmc/hwpmc_core.c projects/sendfile/sys/dev/hwpmc/hwpmc_core.h projects/sendfile/sys/dev/hwpmc/hwpmc_intel.c projects/sendfile/sys/dev/ixgbe/ixgbe.c projects/sendfile/sys/dev/netmap/netmap.c projects/sendfile/sys/dev/nmdm/nmdm.c projects/sendfile/sys/dev/ofw/ofw_bus_subr.c projects/sendfile/sys/dev/ofw/ofw_bus_subr.h projects/sendfile/sys/dev/pci/vga_pci.c projects/sendfile/sys/dev/syscons/scterm-teken.c projects/sendfile/sys/dev/uart/uart_cpu.h projects/sendfile/sys/dev/uart/uart_tty.c projects/sendfile/sys/dev/usb/quirk/usb_quirk.c projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/dev/usb/wlan/if_run.c projects/sendfile/sys/dev/usb/wlan/if_runreg.h projects/sendfile/sys/dev/usb/wlan/if_runvar.h projects/sendfile/sys/dev/vt/font/vt_font_default.c projects/sendfile/sys/dev/vt/vt.h projects/sendfile/sys/dev/vt/vt_core.c projects/sendfile/sys/dev/vt/vt_font.c projects/sendfile/sys/dev/vt/vt_sysmouse.c projects/sendfile/sys/fs/fifofs/fifo_vnops.c projects/sendfile/sys/geom/mirror/g_mirror_ctl.c projects/sendfile/sys/kern/kern_event.c projects/sendfile/sys/kern/kern_fork.c projects/sendfile/sys/kern/kern_jail.c projects/sendfile/sys/kern/kern_linker.c projects/sendfile/sys/kern/kern_rwlock.c projects/sendfile/sys/kern/subr_terminal.c projects/sendfile/sys/kern/subr_trap.c projects/sendfile/sys/kern/tty.c projects/sendfile/sys/kern/vfs_vnops.c projects/sendfile/sys/net/radix.c projects/sendfile/sys/netgraph/ng_ksocket.c projects/sendfile/sys/netinet/ip_output.c projects/sendfile/sys/netpfil/ipfw/ip_fw_dynamic.c projects/sendfile/sys/netpfil/pf/pf.c projects/sendfile/sys/netpfil/pf/pf.h projects/sendfile/sys/nfs/nfs_fha.c projects/sendfile/sys/powerpc/include/openpicreg.h projects/sendfile/sys/powerpc/include/openpicvar.h projects/sendfile/sys/powerpc/include/pmc_mdep.h projects/sendfile/sys/powerpc/ofw/ofw_pci.c projects/sendfile/sys/powerpc/ofw/ofw_pcib_pci.c projects/sendfile/sys/powerpc/ofw/openpic_ofw.c projects/sendfile/sys/powerpc/powermac/ata_macio.c projects/sendfile/sys/powerpc/powermac/atibl.c projects/sendfile/sys/powerpc/powermac/cpcht.c projects/sendfile/sys/powerpc/powermac/dbdma.c projects/sendfile/sys/powerpc/powermac/dbdmavar.h projects/sendfile/sys/powerpc/powerpc/openpic.c projects/sendfile/sys/powerpc/psim/openpic_iobus.c projects/sendfile/sys/rpc/svc.c projects/sendfile/sys/rpc/svc.h projects/sendfile/sys/rpc/svc_vc.c projects/sendfile/sys/sparc64/ebus/ebus.c projects/sendfile/sys/sparc64/isa/ofw_isa.c projects/sendfile/sys/sparc64/pci/fire.c projects/sendfile/sys/sparc64/pci/ofw_pcib_subr.c projects/sendfile/sys/sparc64/pci/psycho.c projects/sendfile/sys/sparc64/pci/schizo.c projects/sendfile/sys/sys/consio.h projects/sendfile/sys/sys/terminal.h projects/sendfile/sys/sys/tty.h projects/sendfile/sys/teken/demo/teken_demo.c projects/sendfile/sys/teken/teken.h projects/sendfile/sys/teken/teken_subr.h projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc projects/sendfile/tools/tools/ath/athstats/Makefile projects/sendfile/tools/tools/net80211/wlanstats/Makefile projects/sendfile/tools/tools/vt/fontcvt/fontcvt.c projects/sendfile/tools/tools/vt/mkkfont/mkkfont.c projects/sendfile/tools/tools/vt/setfont/setfont.c projects/sendfile/usr.bin/kdump/kdump.c projects/sendfile/usr.bin/mkcsmapper/Makefile.inc projects/sendfile/usr.bin/netstat/if.c projects/sendfile/usr.bin/netstat/main.c projects/sendfile/usr.bin/netstat/mroute.c projects/sendfile/usr.bin/netstat/mroute6.c projects/sendfile/usr.bin/netstat/netgraph.c projects/sendfile/usr.bin/netstat/netstat.h projects/sendfile/usr.bin/netstat/route.c projects/sendfile/usr.bin/sort/radixsort.c projects/sendfile/usr.sbin/bhyve/bhyve.8 projects/sendfile/usr.sbin/bhyve/bhyverun.c projects/sendfile/usr.sbin/bhyve/pci_passthru.c projects/sendfile/usr.sbin/bhyve/xmsr.c projects/sendfile/usr.sbin/bhyve/xmsr.h projects/sendfile/usr.sbin/bsdinstall/scripts/auto projects/sendfile/usr.sbin/bsdinstall/scripts/zfsboot Directory Properties: projects/sendfile/ (props changed) projects/sendfile/contrib/file/ (props changed) projects/sendfile/contrib/gcc/ (props changed) projects/sendfile/contrib/tcpdump/ (props changed) projects/sendfile/contrib/tzdata/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/gnu/lib/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/lib/libvmmapi/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/sbin/ipfw/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/amd64/vmm/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/boot/ia64/efi/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) Modified: projects/sendfile/UPDATING ============================================================================== --- projects/sendfile/UPDATING Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/UPDATING Mon Dec 23 04:38:56 2013 (r259760) @@ -1943,7 +1943,7 @@ COMMON ITEMS: make buildkernel KERNCONF=YOUR_KERNEL_HERE <maybe newfs current's root partition> <mount current's root partition on directory ${CURRENT_ROOT}> - make installworld DESTDIR=${CURRENT_ROOT} + make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd Modified: projects/sendfile/bin/pax/pax.1 ============================================================================== --- projects/sendfile/bin/pax/pax.1 Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/bin/pax/pax.1 Mon Dec 23 04:38:56 2013 (r259760) @@ -33,7 +33,7 @@ .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd August 29, 2010 +.Dd December 21, 2013 .Dt PAX 1 .Os .Sh NAME @@ -587,6 +587,16 @@ precedence. For example, if .Dl Fl p Ar eme is specified, file modification times are still preserved. +.Pp +File flags set by +.Xr chflags 1 +are not understood by +.Nm , +however +.Xr tar 1 +and +.Xr dump 1 +will preserve these. .It Fl s Ar replstr Modify the file or archive member names specified by the .Ar pattern @@ -1195,3 +1205,11 @@ at the University of California, San Die The .Nm utility does not recognize multibyte characters. +.Pp +File flags set by +.Xr chflags 1 +are not preserved by +.Nm . +The BUGS section of +.Xr chflags 1 +has a list of utilities that are unaware of flags. Modified: projects/sendfile/contrib/file/compress.c ============================================================================== --- projects/sendfile/contrib/file/compress.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/file/compress.c Mon Dec 23 04:38:56 2013 (r259760) @@ -480,7 +480,7 @@ uncompressbuf(struct magic_set *ms, int #endif free(*newch); n = 0; - newch[0] = '\0'; + *newch = NULL; goto err; } else { n = r; Modified: projects/sendfile/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- projects/sendfile/contrib/gcc/ChangeLog.gcc43 Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/ChangeLog.gcc43 Mon Dec 23 04:38:56 2013 (r259760) @@ -45,6 +45,20 @@ * flags.h (force_align_functions_log): Delete. * toplev.c (force_align_functions_log): Delete. +2007-07-06 Josh Conner <jconner@apple.com> (r126422) + + PR middle-end/32602 + PR middle-end/32603 + * calls.c (store_one_arg): Handle arguments which are partially + on the stack when detecting argument overlap. + +2007-07-03 Eric Christopher <echristo@apple.com> (r126278) + + * doc/cppopts.texi: Add conflicting option note to -dM. + * doc/invoke.texi: Add note about possible conflicts with + -E for -dCHARS and note that -dM will not produce + any results if there is no machine dependent reorg. + 2007-06-28 Geoffrey Keating <geoffk@apple.com> (r126088) * doc/invoke.texi (C++ Dialect Options): Document @@ -94,6 +108,14 @@ regs_invalidated_by_call, rather than just checking the membership of REGNO (REG). +2007-05-18 Geoffrey Keating <geoffk@apple.com> (r124839) + + * dwarf2out.c (print_die): Use '%ld' not '%lu' to print a 'long'. + (output_die): Use 'unsigned long' with %x. + * sched-vis.c (print_value): Use 'unsigned HOST_WIDE_INT' and + HOST_WIDE_INT_PRINT_HEX to print HOST_WIDE_INT. + * tree-dump.c (dump_pointer): Use 'unsigned long' for %lx. + 2007-05-16 Eric Christopher <echristo@apple.com> (r124763) * config/rs6000/rs6000.c (rs6000_emit_prologue): Move altivec register @@ -399,6 +421,12 @@ (override_options): Add PTA_CX16 flag. Set x86_cmpxchg16b for CPUs that have PTA_CX16 set. +2007-01-18 Josh Conner <jconner@apple.com> (r120902) + + PR target/30485 + * config/rs6000/rs6000.c (rs6000_emit_vector_compare): Add + support for UNLE, UNLT, UNGE, and UNGT. + 2007-01-17 Eric Christopher <echristo@apple.com> (r120846) * config.gcc: Support core2 processor. @@ -408,6 +436,14 @@ * c-common.c (vector_types_convertible_p): Treat opaque types as always convertible if they have the same size, but not otherwise. +2007-01-08 Geoffrey Keating <geoffk@apple.com> (r120611) + + * target.h (struct gcc_target): New field library_rtti_comdat. + * target-def.h (TARGET_CXX_LIBRARY_RTTI_COMDAT): New. + (TARGET_CXX): Add TARGET_CXX_LIBRARY_RTTI_COMDAT. + * doc/tm.texi (C++ ABI): Document TARGET_CXX_LIBRARY_RTTI_COMDAT. + * config/darwin.h (TARGET_CXX_LIBRARY_RTTI_COMDAT): Define. + 2007-01-08 Mark Shinwell <shinwell@codesourcery.com> (r120572) * c.opt: Add -flax-vector-conversions. Modified: projects/sendfile/contrib/gcc/c-common.c ============================================================================== --- projects/sendfile/contrib/gcc/c-common.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/c-common.c Mon Dec 23 04:38:56 2013 (r259760) @@ -6014,11 +6014,11 @@ c_parse_error (const char *gmsgid, enum message = NULL; } else - error (gmsgid); + error (gmsgid, ""); if (message) { - error (message); + error (message, ""); free (message); } #undef catenate_messages Modified: projects/sendfile/contrib/gcc/c-convert.c ============================================================================== --- projects/sendfile/contrib/gcc/c-convert.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/c-convert.c Mon Dec 23 04:38:56 2013 (r259760) @@ -80,7 +80,7 @@ convert (tree type, tree expr) if ((invalid_conv_diag = targetm.invalid_conversion (TREE_TYPE (expr), type))) { - error (invalid_conv_diag); + error (invalid_conv_diag, ""); return error_mark_node; } Modified: projects/sendfile/contrib/gcc/c-incpath.c ============================================================================== --- projects/sendfile/contrib/gcc/c-incpath.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/c-incpath.c Mon Dec 23 04:38:56 2013 (r259760) @@ -72,7 +72,7 @@ free_path (struct cpp_dir *path, int rea case REASON_DUP_SYS: fprintf (stderr, _("ignoring duplicate directory \"%s\"\n"), path->name); if (reason == REASON_DUP_SYS) - fprintf (stderr, + fprintf (stderr, "%s", _(" as it is a non-system directory that duplicates a system directory\n")); break; @@ -292,16 +292,16 @@ merge_include_chains (cpp_reader *pfile, { struct cpp_dir *p; - fprintf (stderr, _("#include \"...\" search starts here:\n")); + fprintf (stderr, "%s", _("#include \"...\" search starts here:\n")); for (p = heads[QUOTE];; p = p->next) { if (p == heads[BRACKET]) - fprintf (stderr, _("#include <...> search starts here:\n")); + fprintf (stderr, "%s", _("#include <...> search starts here:\n")); if (!p) break; fprintf (stderr, " %s\n", p->name); } - fprintf (stderr, _("End of search list.\n")); + fprintf (stderr, "%s", _("End of search list.\n")); } } Modified: projects/sendfile/contrib/gcc/c-opts.c ============================================================================== --- projects/sendfile/contrib/gcc/c-opts.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/c-opts.c Mon Dec 23 04:38:56 2013 (r259760) @@ -487,6 +487,12 @@ c_common_handle_option (size_t scode, co cpp_opts->warn_multichar = value; break; + /* APPLE LOCAL begin -Wnewline-eof */ + case OPT_Wnewline_eof: + cpp_opts->warn_newline_at_eof = value; + break; + /* APPLE LOCAL end -Wnewline-eof */ + case OPT_Wnormalized_: if (!value || (arg && strcasecmp (arg, "none") == 0)) cpp_opts->warn_normalize = normalized_none; Modified: projects/sendfile/contrib/gcc/c-typeck.c ============================================================================== --- projects/sendfile/contrib/gcc/c-typeck.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/c-typeck.c Mon Dec 23 04:38:56 2013 (r259760) @@ -2584,7 +2584,7 @@ convert_arguments (tree typelist, tree v else if ((invalid_func_diag = targetm.calls.invalid_arg_for_unprototyped_fn (typelist, fundecl, val))) { - error (invalid_func_diag); + error (invalid_func_diag, ""); return error_mark_node; } else @@ -2781,7 +2781,7 @@ build_unary_op (enum tree_code code, tre if ((invalid_op_diag = targetm.invalid_unary_op (code, TREE_TYPE (xarg)))) { - error (invalid_op_diag); + error (invalid_op_diag, ""); return error_mark_node; } @@ -7819,7 +7819,7 @@ build_binary_op (enum tree_code code, tr if ((invalid_op_diag = targetm.invalid_binary_op (code, type0, type1))) { - error (invalid_op_diag); + error (invalid_op_diag, ""); return error_mark_node; } Modified: projects/sendfile/contrib/gcc/c.opt ============================================================================== --- projects/sendfile/contrib/gcc/c.opt Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/c.opt Mon Dec 23 04:38:56 2013 (r259760) @@ -292,6 +292,12 @@ Wnested-externs C ObjC Var(warn_nested_externs) Warn about \"extern\" declarations not at file scope +; APPLE LOCAL begin -Wnewline-eof +Wnewline-eof +C ObjC C++ ObjC++ +Warn about files missing a newline at the end of the file +; APPLE LOCAL end -Wnewline-eof + Wnon-template-friend C++ ObjC++ Var(warn_nontemplate_friend) Init(1) Warn when non-templatized friend functions are declared within a template Modified: projects/sendfile/contrib/gcc/calls.c ============================================================================== --- projects/sendfile/contrib/gcc/calls.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/calls.c Mon Dec 23 04:38:56 2013 (r259760) @@ -4297,6 +4297,7 @@ store_one_arg (struct arg_data *arg, rtx /* expand_call should ensure this. */ gcc_assert (!arg->locate.offset.var + && arg->locate.size.var == 0 && GET_CODE (size_rtx) == CONST_INT); if (arg->locate.offset.constant > i) @@ -4306,7 +4307,21 @@ store_one_arg (struct arg_data *arg, rtx } else if (arg->locate.offset.constant < i) { - if (i < arg->locate.offset.constant + INTVAL (size_rtx)) + /* Use arg->locate.size.constant instead of size_rtx + because we only care about the part of the argument + on the stack. */ + if (i < (arg->locate.offset.constant + + arg->locate.size.constant)) + sibcall_failure = 1; + } + else + { + /* Even though they appear to be at the same location, + if part of the outgoing argument is in registers, + they aren't really at the same location. Check for + this by making sure that the incoming size is the + same as the outgoing size. */ + if (arg->locate.size.constant != INTVAL (size_rtx)) sibcall_failure = 1; } } Modified: projects/sendfile/contrib/gcc/cfg.c ============================================================================== --- projects/sendfile/contrib/gcc/cfg.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cfg.c Mon Dec 23 04:38:56 2013 (r259760) @@ -830,7 +830,7 @@ dump_cfg_bb_info (FILE *file, basic_bloc else fprintf (file, ", "); first = false; - fputs (bb_bitnames[i], file); + fprintf (file, "%s", bb_bitnames[i]); } if (!first) fprintf (file, ")"); Modified: projects/sendfile/contrib/gcc/collect2.c ============================================================================== --- projects/sendfile/contrib/gcc/collect2.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/collect2.c Mon Dec 23 04:38:56 2013 (r259760) @@ -1562,10 +1562,10 @@ collect_execute (const char *prog, char if (err != 0) { errno = err; - fatal_perror (errmsg); + fatal_perror ("%s", errmsg); } else - fatal (errmsg); + fatal ("%s", errmsg); } return pex; @@ -2050,10 +2050,10 @@ scan_prog_file (const char *prog_name, e if (err != 0) { errno = err; - fatal_perror (errmsg); + fatal_perror ("%s", errmsg); } else - fatal (errmsg); + fatal ("%s", errmsg); } int_handler = (void (*) (int)) signal (SIGINT, SIG_IGN); Modified: projects/sendfile/contrib/gcc/config/darwin.h ============================================================================== --- projects/sendfile/contrib/gcc/config/darwin.h Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/config/darwin.h Mon Dec 23 04:38:56 2013 (r259760) @@ -467,6 +467,10 @@ extern GTY(()) int darwin_ms_struct; with names, so it's safe to make the class data not comdat. */ #define TARGET_CXX_CLASS_DATA_ALWAYS_COMDAT hook_bool_void_false +/* For efficiency, on Darwin the RTTI information that is always + emitted in the standard C++ library should not be COMDAT. */ +#define TARGET_CXX_LIBRARY_RTTI_COMDAT hook_bool_void_false + /* We make exception information linkonce. */ #undef TARGET_USES_WEAK_UNWIND_INFO #define TARGET_USES_WEAK_UNWIND_INFO 1 Modified: projects/sendfile/contrib/gcc/config/rs6000/rs6000.c ============================================================================== --- projects/sendfile/contrib/gcc/config/rs6000/rs6000.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/config/rs6000/rs6000.c Mon Dec 23 04:38:56 2013 (r259760) @@ -11738,11 +11738,20 @@ rs6000_emit_vector_compare (enum rtx_cod try_again = true; break; case NE: - /* Treat A != B as ~(A==B). */ + case UNLE: + case UNLT: + case UNGE: + case UNGT: + /* Invert condition and try again. + e.g., A != B becomes ~(A==B). */ { + enum rtx_code rev_code; enum insn_code nor_code; - rtx eq_rtx = rs6000_emit_vector_compare (EQ, op0, op1, - dest_mode); + rtx eq_rtx; + + rev_code = reverse_condition_maybe_unordered (rcode); + eq_rtx = rs6000_emit_vector_compare (rev_code, op0, op1, + dest_mode); nor_code = one_cmpl_optab->handlers[(int)dest_mode].insn_code; gcc_assert (nor_code != CODE_FOR_nothing); Modified: projects/sendfile/contrib/gcc/cp/ChangeLog.gcc43 ============================================================================== --- projects/sendfile/contrib/gcc/cp/ChangeLog.gcc43 Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/ChangeLog.gcc43 Mon Dec 23 04:38:56 2013 (r259760) @@ -29,6 +29,16 @@ * typeck.c (build_binary_op): Include types in error. +2007-05-18 Geoffrey Keating <geoffk@apple.com> (r124839) + + * mangle.c (write_real_cst): Use 'unsigned long' for %lx. + +2007-05-14 Paolo Carlini <pcarlini@suse.de> (r124724) + + PR c++/29928 + * rtti.c (get_tinfo_decl_dynamic, get_typeid): Try to complete the + type only if is a class type (5.2.8/4). + 2007-05-05 Geoffrey Keating <geoffk@apple.com> (r124467) PR 31775 @@ -62,6 +72,18 @@ * semantics.c (finish_unary_op_expr): Warn only if result overflowed and operands did not. +2006-12-01 Geoffrey Keating <geoffk@apple.com> (r119427) + + * decl.c (poplevel): Check DECL_INITIAL invariant. + (duplicate_decls): Preserve DECL_INITIAL when eliminating + a new definition in favour of an old declaration. + (start_preparsed_function): Define and document value of + DECL_INITIAL before and after routine. + (finish_function): Check DECL_INITIAL invariant. + * parser.c + (cp_parser_function_definition_from_specifiers_and_declarator): + Skip duplicate function definitions. + 2006-10-31 Geoffrey Keating <geoffk@apple.com> (r118360) * name-lookup.c (get_anonymous_namespace_name): New. Modified: projects/sendfile/contrib/gcc/cp/Make-lang.in ============================================================================== --- projects/sendfile/contrib/gcc/cp/Make-lang.in Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/Make-lang.in Mon Dec 23 04:38:56 2013 (r259760) @@ -265,7 +265,7 @@ cp/tree.o: cp/tree.c $(CXX_TREE_H) $(TM_ $(TARGET_H) debug.h cp/ptree.o: cp/ptree.c $(CXX_TREE_H) $(TM_H) cp/rtti.o: cp/rtti.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h convert.h \ - gt-cp-rtti.h + $(TARGET_H) gt-cp-rtti.h cp/except.o: cp/except.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) $(RTL_H) except.h \ toplev.h cp/cfns.h $(EXPR_H) libfuncs.h $(TREE_INLINE_H) $(TARGET_H) cp/expr.o: cp/expr.c $(CXX_TREE_H) $(TM_H) $(RTL_H) $(FLAGS_H) $(EXPR_H) \ Modified: projects/sendfile/contrib/gcc/cp/cvt.c ============================================================================== --- projects/sendfile/contrib/gcc/cp/cvt.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/cvt.c Mon Dec 23 04:38:56 2013 (r259760) @@ -615,7 +615,7 @@ ocp_convert (tree type, tree expr, int c if ((invalid_conv_diag = targetm.invalid_conversion (TREE_TYPE (expr), type))) { - error (invalid_conv_diag); + error (invalid_conv_diag, ""); return error_mark_node; } Modified: projects/sendfile/contrib/gcc/cp/decl.c ============================================================================== --- projects/sendfile/contrib/gcc/cp/decl.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/decl.c Mon Dec 23 04:38:56 2013 (r259760) @@ -758,7 +758,12 @@ poplevel (int keep, int reverse, int fun leave_scope (); if (functionbody) - DECL_INITIAL (current_function_decl) = block; + { + /* The current function is being defined, so its DECL_INITIAL + should be error_mark_node. */ + gcc_assert (DECL_INITIAL (current_function_decl) == error_mark_node); + DECL_INITIAL (current_function_decl) = block; + } else if (block) current_binding_level->blocks = chainon (current_binding_level->blocks, block); @@ -1635,13 +1640,15 @@ duplicate_decls (tree newdecl, tree oldd } /* If the new declaration is a definition, update the file and - line information on the declaration. */ + line information on the declaration, and also make + the old declaration the same definition. */ if (DECL_INITIAL (old_result) == NULL_TREE && DECL_INITIAL (new_result) != NULL_TREE) { DECL_SOURCE_LOCATION (olddecl) = DECL_SOURCE_LOCATION (old_result) = DECL_SOURCE_LOCATION (newdecl); + DECL_INITIAL (old_result) = DECL_INITIAL (new_result); if (DECL_FUNCTION_TEMPLATE_P (newdecl)) DECL_ARGUMENTS (old_result) = DECL_ARGUMENTS (new_result); @@ -10509,7 +10516,13 @@ check_function_type (tree decl, tree cur For C++, we must first check whether that datum makes any sense. For example, "class A local_a(1,2);" means that variable local_a is an aggregate of type A, which should have a constructor - applied to it with the argument list [1, 2]. */ + applied to it with the argument list [1, 2]. + + On entry, DECL_INITIAL (decl1) should be NULL_TREE or error_mark_node, + or may be a BLOCK if the function has been defined previously + in this translation unit. On exit, DECL_INITIAL (decl1) will be + error_mark_node if the function has never been defined, or + a BLOCK if the function has been defined somewhere. */ void start_preparsed_function (tree decl1, tree attrs, int flags) @@ -10638,24 +10651,6 @@ start_preparsed_function (tree decl1, tr cp_apply_type_quals_to_decl (cp_type_quals (restype), resdecl); } - /* Initialize RTL machinery. We cannot do this until - CURRENT_FUNCTION_DECL and DECL_RESULT are set up. We do this - even when processing a template; this is how we get - CFUN set up, and our per-function variables initialized. - FIXME factor out the non-RTL stuff. */ - bl = current_binding_level; - allocate_struct_function (decl1); - current_binding_level = bl; - - /* Even though we're inside a function body, we still don't want to - call expand_expr to calculate the size of a variable-sized array. - We haven't necessarily assigned RTL to all variables yet, so it's - not safe to try to expand expressions involving them. */ - cfun->x_dont_save_pending_sizes_p = 1; - - /* Start the statement-tree, start the tree now. */ - DECL_SAVED_TREE (decl1) = push_stmt_list (); - /* Let the user know we're compiling this function. */ announce_function (decl1); @@ -10701,9 +10696,33 @@ start_preparsed_function (tree decl1, tr maybe_apply_pragma_weak (decl1); } - /* Reset these in case the call to pushdecl changed them. */ + /* Reset this in case the call to pushdecl changed it. */ current_function_decl = decl1; - cfun->decl = decl1; + + gcc_assert (DECL_INITIAL (decl1)); + + /* This function may already have been parsed, in which case just + return; our caller will skip over the body without parsing. */ + if (DECL_INITIAL (decl1) != error_mark_node) + return; + + /* Initialize RTL machinery. We cannot do this until + CURRENT_FUNCTION_DECL and DECL_RESULT are set up. We do this + even when processing a template; this is how we get + CFUN set up, and our per-function variables initialized. + FIXME factor out the non-RTL stuff. */ + bl = current_binding_level; + allocate_struct_function (decl1); + current_binding_level = bl; + + /* Even though we're inside a function body, we still don't want to + call expand_expr to calculate the size of a variable-sized array. + We haven't necessarily assigned RTL to all variables yet, so it's + not safe to try to expand expressions involving them. */ + cfun->x_dont_save_pending_sizes_p = 1; + + /* Start the statement-tree, start the tree now. */ + DECL_SAVED_TREE (decl1) = push_stmt_list (); /* If we are (erroneously) defining a function that we have already defined before, wipe out what we knew before. */ @@ -11212,6 +11231,10 @@ finish_function (int flags) which then got a warning when stored in a ptr-to-function variable. */ gcc_assert (building_stmt_tree ()); + /* The current function is being defined, so its DECL_INITIAL should + be set, and unless there's a multiple definition, it should be + error_mark_node. */ + gcc_assert (DECL_INITIAL (fndecl) == error_mark_node); /* For a cloned function, we've already got all the code we need; there's no need to add any extra bits. */ Modified: projects/sendfile/contrib/gcc/cp/mangle.c ============================================================================== --- projects/sendfile/contrib/gcc/cp/mangle.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/mangle.c Mon Dec 23 04:38:56 2013 (r259760) @@ -1340,7 +1340,7 @@ write_real_cst (const tree value) for (; i != limit; i += dir) { - sprintf (buffer, "%08lx", target_real[i]); + sprintf (buffer, "%08lx", (unsigned long) target_real[i]); write_chars (buffer, 8); } } Modified: projects/sendfile/contrib/gcc/cp/method.c ============================================================================== --- projects/sendfile/contrib/gcc/cp/method.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/method.c Mon Dec 23 04:38:56 2013 (r259760) @@ -407,10 +407,6 @@ use_thunk (tree thunk_fndecl, bool emit_ } } - /* The back-end expects DECL_INITIAL to contain a BLOCK, so we - create one. */ - DECL_INITIAL (thunk_fndecl) = make_node (BLOCK); - /* Set up cloned argument trees for the thunk. */ t = NULL_TREE; for (a = DECL_ARGUMENTS (function); a; a = TREE_CHAIN (a)) @@ -424,17 +420,23 @@ use_thunk (tree thunk_fndecl, bool emit_ } a = nreverse (t); DECL_ARGUMENTS (thunk_fndecl) = a; - BLOCK_VARS (DECL_INITIAL (thunk_fndecl)) = a; if (this_adjusting && targetm.asm_out.can_output_mi_thunk (thunk_fndecl, fixed_offset, virtual_value, alias)) { const char *fnname; + tree fn_block; + current_function_decl = thunk_fndecl; DECL_RESULT (thunk_fndecl) = build_decl (RESULT_DECL, 0, integer_type_node); fnname = XSTR (XEXP (DECL_RTL (thunk_fndecl), 0), 0); + /* The back-end expects DECL_INITIAL to contain a BLOCK, so we + create one. */ + fn_block = make_node (BLOCK); + BLOCK_VARS (fn_block) = a; + DECL_INITIAL (thunk_fndecl) = fn_block; init_function_start (thunk_fndecl); current_function_is_thunk = 1; assemble_start_function (thunk_fndecl, fnname); Modified: projects/sendfile/contrib/gcc/cp/parser.c ============================================================================== --- projects/sendfile/contrib/gcc/cp/parser.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/parser.c Mon Dec 23 04:38:56 2013 (r259760) @@ -15637,6 +15637,16 @@ cp_parser_function_definition_from_speci cp_parser_skip_to_end_of_block_or_statement (parser); fn = error_mark_node; } + else if (DECL_INITIAL (current_function_decl) != error_mark_node) + { + /* Seen already, skip it. An error message has already been output. */ + cp_parser_skip_to_end_of_block_or_statement (parser); + fn = current_function_decl; + current_function_decl = NULL_TREE; + /* If this is a function from a class, pop the nested class. */ + if (current_class_name) + pop_nested_class (); + } else fn = cp_parser_function_definition_after_declarator (parser, /*inline_p=*/false); Modified: projects/sendfile/contrib/gcc/cp/pt.c ============================================================================== --- projects/sendfile/contrib/gcc/cp/pt.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/pt.c Mon Dec 23 04:38:56 2013 (r259760) @@ -8925,7 +8925,7 @@ tsubst_copy_and_build (tree t, /*template_arg_p=*/false, &error_msg); if (error_msg) - error (error_msg); + error ("%s", error_msg); if (!function_p && TREE_CODE (decl) == IDENTIFIER_NODE) decl = unqualified_name_lookup_error (decl); return decl; Modified: projects/sendfile/contrib/gcc/cp/rtti.c ============================================================================== --- projects/sendfile/contrib/gcc/cp/rtti.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/rtti.c Mon Dec 23 04:38:56 2013 (r259760) @@ -32,6 +32,7 @@ Boston, MA 02110-1301, USA. */ #include "assert.h" #include "toplev.h" #include "convert.h" +#include "target.h" /* C++ returns type information to the user in struct type_info objects. We also use type information to implement dynamic_cast and @@ -237,7 +238,7 @@ get_tinfo_decl_dynamic (tree exp) /* Peel off cv qualifiers. */ type = TYPE_MAIN_VARIANT (type); - if (!VOID_TYPE_P (type)) + if (CLASS_TYPE_P (type)) type = complete_type_or_else (type, exp); if (!type) @@ -429,7 +430,7 @@ get_typeid (tree type) that is the operand of typeid are always ignored. */ type = TYPE_MAIN_VARIANT (type); - if (!VOID_TYPE_P (type)) + if (CLASS_TYPE_P (type)) type = complete_type_or_else (type, NULL_TREE); if (!type) @@ -1427,8 +1428,11 @@ emit_support_tinfos (void) comdat_linkage for details.) Since we want these objects to have external linkage so that copies do not have to be emitted in code outside the runtime library, we make them - non-COMDAT here. */ - if (!flag_weak) + non-COMDAT here. + + It might also not be necessary to follow this detail of the + ABI. */ + if (!flag_weak || ! targetm.cxx.library_rtti_comdat ()) { gcc_assert (TREE_PUBLIC (tinfo) && !DECL_COMDAT (tinfo)); DECL_INTERFACE_KNOWN (tinfo) = 1; Modified: projects/sendfile/contrib/gcc/cp/typeck.c ============================================================================== --- projects/sendfile/contrib/gcc/cp/typeck.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/cp/typeck.c Mon Dec 23 04:38:56 2013 (r259760) @@ -3107,7 +3107,7 @@ build_binary_op (enum tree_code code, tr if ((invalid_op_diag = targetm.invalid_binary_op (code, type0, type1))) { - error (invalid_op_diag); + error (invalid_op_diag, ""); return error_mark_node; } @@ -4034,7 +4034,7 @@ build_unary_op (enum tree_code code, tre : code), TREE_TYPE (xarg)))) { - error (invalid_op_diag); + error (invalid_op_diag, ""); return error_mark_node; } Modified: projects/sendfile/contrib/gcc/doc/cppopts.texi ============================================================================== --- projects/sendfile/contrib/gcc/doc/cppopts.texi Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/doc/cppopts.texi Mon Dec 23 04:38:56 2013 (r259760) @@ -645,6 +645,10 @@ touch foo.h; cpp -dM foo.h @noindent will show all the predefined macros. +If you use @option{-dM} without the @option{-E} option, @option{-dM} is +interpreted as a synonym for @option{-fdump-rtl-mach}. +@xref{Debugging Options, , ,gcc}. + @item D @opindex dD Like @samp{M} except in two respects: it does @emph{not} include the Modified: projects/sendfile/contrib/gcc/doc/invoke.texi ============================================================================== --- projects/sendfile/contrib/gcc/doc/invoke.texi Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/doc/invoke.texi Mon Dec 23 04:38:56 2013 (r259760) @@ -169,6 +169,8 @@ in the following sections. -trigraphs -no-integrated-cpp -traditional -traditional-cpp @gol -fallow-single-precision -fcond-mismatch -flax-vector-conversions @gol -fsigned-bitfields -fsigned-char @gol +@c APPLE LOCAL -Wnewline-eof 2001-08-23 --sts ** +-Wnewline-eof (Apple compatible) @gol -funsigned-bitfields -funsigned-char} @item C++ Language Options @@ -2082,6 +2084,12 @@ Inhibit all warning messages. @opindex Wno-import Inhibit warning messages about the use of @samp{#import}. +@c APPLE LOCAL begin -Wnewline-eof 2001-08-23 --sts ** +@item -Wnewline-eof +@opindex Wnewline-eof +Warn about files missing a newline at the end of the file. (Apple compatible) +@c APPLE LOCAL end -Wnewline-eof 2001-08-23 --sts ** + @item -Wchar-subscripts @opindex Wchar-subscripts Warn if an array subscript has type @code{char}. This is a common cause @@ -3675,7 +3683,9 @@ Says to make debugging dumps during comp compiler. The file names for most of the dumps are made by appending a pass number and a word to the @var{dumpname}. @var{dumpname} is generated from the name of the output file, if explicitly specified and it is not -an executable, otherwise it is the basename of the source file. +an executable, otherwise it is the basename of the source file. These +switches may have different effects when @option{-E} is used for +preprocessing. Most debug dumps can be enabled either passing a letter to the @option{-d} option, or with a long @option{-fdump-rtl} switch; here are the possible @@ -3810,7 +3820,7 @@ Dump after modulo scheduling, to @file{@ @opindex dM @opindex fdump-rtl-mach Dump after performing the machine dependent reorganization pass, to -@file{@var{file}.155r.mach}. +@file{@var{file}.155r.mach} if that pass exists. @item -dn @itemx -fdump-rtl-rnreg Modified: projects/sendfile/contrib/gcc/doc/tm.texi ============================================================================== --- projects/sendfile/contrib/gcc/doc/tm.texi Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/doc/tm.texi Mon Dec 23 04:38:56 2013 (r259760) @@ -8953,6 +8953,12 @@ classes whose virtual table will be emit unit will not be COMDAT. @end deftypefn +@deftypefn {Target Hook} bool TARGET_CXX_LIBRARY_RTTI_COMDAT (void) +This hook returns true (the default) if the RTTI information for +the basic types which is defined in the C++ runtime should always +be COMDAT, false if it should not be COMDAT. +@end deftypefn + @deftypefn {Target Hook} bool TARGET_CXX_USE_AEABI_ATEXIT (void) This hook returns true if @code{__aeabi_atexit} (as defined by the ARM EABI) should be used to register static destructors when @option{-fuse-cxa-atexit} Modified: projects/sendfile/contrib/gcc/dwarf2out.c ============================================================================== --- projects/sendfile/contrib/gcc/dwarf2out.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/dwarf2out.c Mon Dec 23 04:38:56 2013 (r259760) @@ -5741,11 +5741,11 @@ print_die (dw_die_ref die, FILE *outfile unsigned ix; print_spaces (outfile); - fprintf (outfile, "DIE %4lu: %s\n", + fprintf (outfile, "DIE %4ld: %s\n", die->die_offset, dwarf_tag_name (die->die_tag)); print_spaces (outfile); fprintf (outfile, " abbrev id: %lu", die->die_abbrev); - fprintf (outfile, " offset: %lu\n", die->die_offset); + fprintf (outfile, " offset: %ld\n", die->die_offset); for (ix = 0; VEC_iterate (dw_attr_node, die->die_attr, ix, a); ix++) { @@ -5793,7 +5793,7 @@ print_die (dw_die_ref die, FILE *outfile if (AT_ref (a)->die_symbol) fprintf (outfile, "die -> label: %s", AT_ref (a)->die_symbol); else - fprintf (outfile, "die -> %lu", AT_ref (a)->die_offset); + fprintf (outfile, "die -> %ld", AT_ref (a)->die_offset); } else fprintf (outfile, "die -> <null>"); @@ -7063,7 +7063,8 @@ output_die (dw_die_ref die) output_die_symbol (die); dw2_asm_output_data_uleb128 (die->die_abbrev, "(DIE (0x%lx) %s)", - die->die_offset, dwarf_tag_name (die->die_tag)); + (unsigned long)die->die_offset, + dwarf_tag_name (die->die_tag)); for (ix = 0; VEC_iterate (dw_attr_node, die->die_attr, ix, a); ix++) { @@ -7245,7 +7246,7 @@ output_die (dw_die_ref die) /* Add null byte to terminate sibling list. */ if (die->die_child != NULL) dw2_asm_output_data (1, 0, "end of children of DIE 0x%lx", - die->die_offset); + (unsigned long) die->die_offset); } /* Output the compilation unit that appears at the beginning of the Modified: projects/sendfile/contrib/gcc/fold-const.c ============================================================================== --- projects/sendfile/contrib/gcc/fold-const.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/fold-const.c Mon Dec 23 04:38:56 2013 (r259760) @@ -992,7 +992,7 @@ fold_overflow_warning (const char* gmsgi } } else if (issue_strict_overflow_warning (wc)) - warning (OPT_Wstrict_overflow, gmsgid); + warning (OPT_Wstrict_overflow, "%s", gmsgid); } /* Return true if the built-in mathematical function specified by CODE Modified: projects/sendfile/contrib/gcc/gcc.c ============================================================================== --- projects/sendfile/contrib/gcc/gcc.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/gcc.c Mon Dec 23 04:38:56 2013 (r259760) @@ -2974,7 +2974,7 @@ execute (void) if (errmsg != NULL) { if (err == 0) - fatal (errmsg); + fatal ("%s", errmsg); else { errno = err; @@ -6525,7 +6525,7 @@ main (int argc, char **argv) if (! verbose_flag) { - printf (_("\nFor bug reporting instructions, please see:\n")); + printf ("%s", _("\nFor bug reporting instructions, please see:\n")); printf ("%s.\n", bug_report_url); return (0); Modified: projects/sendfile/contrib/gcc/gcov.c ============================================================================== --- projects/sendfile/contrib/gcc/gcov.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/gcov.c Mon Dec 23 04:38:56 2013 (r259760) @@ -417,7 +417,7 @@ print_version (void) fnotice (stdout, "gcov (GCC) %s\n", version_string); fprintf (stdout, "Copyright %s 2006 Free Software Foundation, Inc.\n", _("(C)")); - fnotice (stdout, + fnotice (stdout, "%s", _("This is free software; see the source for copying conditions.\n" "There is NO warranty; not even for MERCHANTABILITY or \n" "FITNESS FOR A PARTICULAR PURPOSE.\n\n")); Modified: projects/sendfile/contrib/gcc/sched-vis.c ============================================================================== --- projects/sendfile/contrib/gcc/sched-vis.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/sched-vis.c Mon Dec 23 04:38:56 2013 (r259760) @@ -430,7 +430,10 @@ print_value (char *buf, rtx x, int verbo if (FLOAT_MODE_P (GET_MODE (x))) real_to_decimal (t, CONST_DOUBLE_REAL_VALUE (x), sizeof (t), 0, 1); else - sprintf (t, "<0x%lx,0x%lx>", (long) CONST_DOUBLE_LOW (x), (long) CONST_DOUBLE_HIGH (x)); + sprintf (t, + "<" HOST_WIDE_INT_PRINT_HEX "," HOST_WIDE_INT_PRINT_HEX ">", + (unsigned HOST_WIDE_INT) CONST_DOUBLE_LOW (x), + (unsigned HOST_WIDE_INT) CONST_DOUBLE_HIGH (x)); cur = safe_concat (buf, cur, t); break; case CONST_STRING: Modified: projects/sendfile/contrib/gcc/target-def.h ============================================================================== --- projects/sendfile/contrib/gcc/target-def.h Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/target-def.h Mon Dec 23 04:38:56 2013 (r259760) @@ -587,6 +587,10 @@ Foundation, 51 Franklin Street, Fifth Fl #define TARGET_CXX_CLASS_DATA_ALWAYS_COMDAT hook_bool_void_true #endif +#ifndef TARGET_CXX_LIBRARY_RTTI_COMDAT +#define TARGET_CXX_LIBRARY_RTTI_COMDAT hook_bool_void_true +#endif + #ifndef TARGET_CXX_USE_AEABI_ATEXIT #define TARGET_CXX_USE_AEABI_ATEXIT hook_bool_void_false #endif @@ -606,6 +610,7 @@ Foundation, 51 Franklin Street, Fifth Fl TARGET_CXX_KEY_METHOD_MAY_BE_INLINE, \ TARGET_CXX_DETERMINE_CLASS_DATA_VISIBILITY, \ TARGET_CXX_CLASS_DATA_ALWAYS_COMDAT, \ + TARGET_CXX_LIBRARY_RTTI_COMDAT, \ TARGET_CXX_USE_AEABI_ATEXIT, \ TARGET_CXX_ADJUST_CLASS_AT_DEFINITION \ } Modified: projects/sendfile/contrib/gcc/target.h ============================================================================== --- projects/sendfile/contrib/gcc/target.h Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/target.h Mon Dec 23 04:38:56 2013 (r259760) @@ -783,6 +783,10 @@ struct gcc_target class data for classes whose virtual table will be emitted in only one translation unit will not be COMDAT. */ bool (*class_data_always_comdat) (void); + /* Returns true (the default) if the RTTI for the basic types, + which is always defined in the C++ runtime, should be COMDAT; + false if it should not be COMDAT. */ + bool (*library_rtti_comdat) (void); /* Returns true if __aeabi_atexit should be used to register static destructors. */ bool (*use_aeabi_atexit) (void); Modified: projects/sendfile/contrib/gcc/tlink.c ============================================================================== --- projects/sendfile/contrib/gcc/tlink.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/tlink.c Mon Dec 23 04:38:56 2013 (r259760) @@ -381,7 +381,7 @@ read_repo_file (file *f) FILE *stream = fopen (f->key, "r"); if (tlink_verbose >= 2) - fprintf (stderr, _("collect: reading %s\n"), f->key); + fprintf (stderr, "%s", _("collect: reading %s\n"), f->key); while (fscanf (stream, "%c ", &c) == 1) { Modified: projects/sendfile/contrib/gcc/tree-dump.c ============================================================================== --- projects/sendfile/contrib/gcc/tree-dump.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/tree-dump.c Mon Dec 23 04:38:56 2013 (r259760) @@ -166,7 +166,7 @@ void dump_pointer (dump_info_p di, const char *field, void *ptr) { dump_maybe_newline (di); - fprintf (di->stream, "%-4s: %-8lx ", field, (long) ptr); + fprintf (di->stream, "%-4s: %-8lx ", field, (unsigned long) ptr); di->column += 15; } Modified: projects/sendfile/contrib/gcc/version.c ============================================================================== --- projects/sendfile/contrib/gcc/version.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcc/version.c Mon Dec 23 04:38:56 2013 (r259760) @@ -18,7 +18,7 @@ forward us bugs reported to you, if you determine that they are not bugs in your modifications.) */ -const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>"; +const char bug_report_url[] = "<URL:http://www.freebsd.org/send-pr.html>"; /* The complete version string, assembled from several pieces. BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile. */ Copied: projects/sendfile/contrib/gcclibs/libcpp/ChangeLog.apple (from r259759, head/contrib/gcclibs/libcpp/ChangeLog.apple) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/contrib/gcclibs/libcpp/ChangeLog.apple Mon Dec 23 04:38:56 2013 (r259760, copy of r259759, head/contrib/gcclibs/libcpp/ChangeLog.apple) @@ -0,0 +1,9 @@ +2008-08-04 Bill Wendling <wendling@apple.com> + + Radar 6121572 + * charset.c (_cpp_convert_input): Don't read to.text[-1]. + +2005-02-17 Devang Patel <dpatel@apple.com> + + Radar 3958387 + * libcpp/lex.c (_cpp_get_fresh_line): Check warn_newline_at_eof. Modified: projects/sendfile/contrib/gcclibs/libcpp/charset.c ============================================================================== --- projects/sendfile/contrib/gcclibs/libcpp/charset.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcclibs/libcpp/charset.c Mon Dec 23 04:38:56 2013 (r259760) @@ -1628,6 +1628,7 @@ _cpp_convert_input (cpp_reader *pfile, c terminate with another \r, not an \n, so that we do not mistake the \r\n sequence for a single DOS line ending and erroneously issue the "No newline at end of file" diagnostic. */ + /* APPLE LOCAL don't access to.text[-1] radar 6121572 */ if (to.len > 0 && to.text[to.len - 1] == '\r') to.text[to.len] = '\r'; else Modified: projects/sendfile/contrib/gcclibs/libcpp/include/cpplib.h ============================================================================== --- projects/sendfile/contrib/gcclibs/libcpp/include/cpplib.h Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcclibs/libcpp/include/cpplib.h Mon Dec 23 04:38:56 2013 (r259760) @@ -320,6 +320,11 @@ struct cpp_options /* Nonzero means warn if there are any trigraphs. */ unsigned char warn_trigraphs; + /* APPLE LOCAL begin -Wnewline-eof 2001-08-23 --sts */ + /* Nonzero means warn if no newline at end of file. */ + unsigned char warn_newline_at_eof; + /* APPLE LOCAL end -Wnewline-eof 2001-08-23 --sts */ + /* Nonzero means warn about multicharacter charconsts. */ unsigned char warn_multichar; Modified: projects/sendfile/contrib/gcclibs/libcpp/init.c ============================================================================== --- projects/sendfile/contrib/gcclibs/libcpp/init.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcclibs/libcpp/init.c Mon Dec 23 04:38:56 2013 (r259760) @@ -146,6 +146,10 @@ cpp_create_reader (enum c_lang lang, has pfile = XCNEW (cpp_reader); cpp_set_lang (pfile, lang); + /* APPLE LOCAL begin -Wnewline-eof 2001-08-23 --sts */ + /* Suppress warnings about missing newlines at ends of files. */ + CPP_OPTION (pfile, warn_newline_at_eof) = 0; + /* APPLE LOCAL end -Wnewline-eof 2001-08-23 --sts */ CPP_OPTION (pfile, warn_multichar) = 1; CPP_OPTION (pfile, discard_comments) = 1; CPP_OPTION (pfile, discard_comments_in_macro_exp) = 1; Modified: projects/sendfile/contrib/gcclibs/libcpp/lex.c ============================================================================== --- projects/sendfile/contrib/gcclibs/libcpp/lex.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gcclibs/libcpp/lex.c Mon Dec 23 04:38:56 2013 (r259760) @@ -854,6 +854,14 @@ _cpp_get_fresh_line (cpp_reader *pfile) { /* Clip to buffer size. */ buffer->next_line = buffer->rlimit; + /* APPLE LOCAL begin suppress no newline warning. */ + if ( CPP_OPTION (pfile, warn_newline_at_eof)) + { + cpp_error_with_line (pfile, CPP_DL_PEDWARN, pfile->line_table->highest_line, + CPP_BUF_COLUMN (buffer, buffer->cur), + "no newline at end of file"); + } + /* APPLE LOCAL end suppress no newline warning. */ } return_at_eof = buffer->return_at_eof; Modified: projects/sendfile/contrib/gperf/lib/getline.cc ============================================================================== --- projects/sendfile/contrib/gperf/lib/getline.cc Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/gperf/lib/getline.cc Mon Dec 23 04:38:56 2013 (r259760) @@ -57,7 +57,7 @@ getstr (char **lineptr, size_t *n, FILE for (;;) { - register int c = getc (stream); + int c = getc (stream); /* We always want at least one char left in the buffer, since we always (unless we get an error while reading the first char) Modified: projects/sendfile/contrib/tcpdump/addrtoname.c ============================================================================== --- projects/sendfile/contrib/tcpdump/addrtoname.c Mon Dec 23 01:24:32 2013 (r259759) +++ projects/sendfile/contrib/tcpdump/addrtoname.c Mon Dec 23 04:38:56 2013 (r259760) @@ -33,8 +33,10 @@ static const char rcsid[] _U_ = #endif #ifdef __FreeBSD__ +#ifdef HAVE_LIBCAPSICUM *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312230438.rBN4cvgF092533>