PERFORCE change 144453 for review
Peter Wemm
peter at FreeBSD.org
Wed Jul 2 02:29:55 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144453
Change 144453 by peter at peter_daintree on 2008/07/02 02:29:27
IFC @144452
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#137 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#54 integrate
.. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#14 integrate
.. //depot/projects/hammer/etc/devd.conf#33 integrate
.. //depot/projects/hammer/etc/periodic/security/800.loginfail#7 integrate
.. //depot/projects/hammer/etc/rc.d/lockd#6 integrate
.. //depot/projects/hammer/etc/rc.d/statd#5 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#82 integrate
.. //depot/projects/hammer/gnu/lib/Makefile#8 integrate
.. //depot/projects/hammer/gnu/lib/csu/Makefile#12 integrate
.. //depot/projects/hammer/gnu/lib/libssp/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/contrib/Makefile#5 integrate
.. //depot/projects/hammer/lib/csu/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#20 integrate
.. //depot/projects/hammer/lib/libarchive/test/Makefile#12 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_compat_zip_1.zip.uu#2 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_zip.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_zip.zip.uu#1 branch
.. //depot/projects/hammer/lib/libc/Makefile#31 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#8 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#10 integrate
.. //depot/projects/hammer/lib/libc/gen/glob.c#7 integrate
.. //depot/projects/hammer/lib/libc/i386/gen/_setjmp.S#3 integrate
.. //depot/projects/hammer/lib/libc/i386/gen/setjmp.S#3 integrate
.. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#14 integrate
.. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#18 integrate
.. //depot/projects/hammer/lib/libc/stdio/printf-pos.c#1 branch
.. //depot/projects/hammer/lib/libc/stdio/printflocal.h#1 branch
.. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#26 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#22 integrate
.. //depot/projects/hammer/lib/libc/stdlib/system.3#3 integrate
.. //depot/projects/hammer/lib/libc/sys/mkdir.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/socket.2#7 integrate
.. //depot/projects/hammer/lib/libstand/Makefile#21 integrate
.. //depot/projects/hammer/lib/libthr/Makefile#28 integrate
.. //depot/projects/hammer/lib/libutil/Makefile#18 integrate
.. //depot/projects/hammer/lib/libutil/hexdump.3#1 branch
.. //depot/projects/hammer/lib/libutil/hexdump.c#1 branch
.. //depot/projects/hammer/lib/libutil/libutil.h#11 integrate
.. //depot/projects/hammer/lib/msun/man/cos.3#4 integrate
.. //depot/projects/hammer/libexec/rtld-elf/Makefile#19 integrate
.. //depot/projects/hammer/release/Makefile#100 integrate
.. //depot/projects/hammer/release/picobsd/build/picobsd#8 integrate
.. //depot/projects/hammer/release/scripts/src-install.sh#6 integrate
.. //depot/projects/hammer/rescue/librescue/Makefile#9 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#39 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#11 integrate
.. //depot/projects/hammer/sbin/devfs/devfs.8#14 integrate
.. //depot/projects/hammer/sbin/dhclient/dhclient.c#15 integrate
.. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#7 integrate
.. //depot/projects/hammer/sbin/sconfig/sconfig.c#6 integrate
.. //depot/projects/hammer/share/man/man4/aac.4#17 integrate
.. //depot/projects/hammer/share/man/man5/src.conf.5#19 integrate
.. //depot/projects/hammer/share/mk/bsd.cpu.mk#36 integrate
.. //depot/projects/hammer/share/mk/bsd.sys.mk#17 integrate
.. //depot/projects/hammer/sys/amd64/include/iodev.h#2 integrate
.. //depot/projects/hammer/sys/amd64/include/memdev.h#2 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#67 integrate
.. //depot/projects/hammer/sys/amd64/include/vmparam.h#28 integrate
.. //depot/projects/hammer/sys/arm/include/memdev.h#2 integrate
.. //depot/projects/hammer/sys/boot/Makefile.inc#1 branch
.. //depot/projects/hammer/sys/boot/arm/Makefile.inc#1 branch
.. //depot/projects/hammer/sys/boot/arm/at91/Makefile.inc#4 integrate
.. //depot/projects/hammer/sys/boot/efi/Makefile.inc#4 integrate
.. //depot/projects/hammer/sys/boot/i386/Makefile.inc#8 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#23 integrate
.. //depot/projects/hammer/sys/boot/i386/loader/Makefile#16 integrate
.. //depot/projects/hammer/sys/boot/ia64/Makefile.inc#4 integrate
.. //depot/projects/hammer/sys/boot/ia64/common/Makefile#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/efi/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/ofw/Makefile.inc#1 branch
.. //depot/projects/hammer/sys/boot/pc98/Makefile.inc#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/Makefile#10 integrate
.. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#13 integrate
.. //depot/projects/hammer/sys/boot/powerpc/Makefile.inc#1 branch
.. //depot/projects/hammer/sys/boot/powerpc/ofw/Makefile#4 integrate
.. //depot/projects/hammer/sys/boot/sparc64/Makefile.inc#2 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/Makefile#10 integrate
.. //depot/projects/hammer/sys/boot/uboot/Makefile.inc#1 branch
.. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#20 delete
.. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.h#3 delete
.. //depot/projects/hammer/sys/conf/NOTES#147 integrate
.. //depot/projects/hammer/sys/conf/files#184 integrate
.. //depot/projects/hammer/sys/conf/kern.mk#27 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#54 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#33 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#12 integrate
.. //depot/projects/hammer/sys/dev/ce/ceddk.h#2 integrate
.. //depot/projects/hammer/sys/dev/ce/if_ce.c#7 integrate
.. //depot/projects/hammer/sys/dev/cp/cpddk.h#5 integrate
.. //depot/projects/hammer/sys/dev/cp/if_cp.c#26 integrate
.. //depot/projects/hammer/sys/dev/ctau/ctddk.h#3 integrate
.. //depot/projects/hammer/sys/dev/ctau/if_ct.c#29 integrate
.. //depot/projects/hammer/sys/dev/cx/cxddk.h#3 integrate
.. //depot/projects/hammer/sys/dev/cx/if_cx.c#37 integrate
.. //depot/projects/hammer/sys/dev/io/iodev.c#2 integrate
.. //depot/projects/hammer/sys/dev/mfi/mfi.c#16 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#24 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_user.c#2 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/atiixp.h#5 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#105 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#31 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#26 integrate
.. //depot/projects/hammer/sys/geom/virstor/g_virstor.c#2 integrate
.. //depot/projects/hammer/sys/i386/include/iodev.h#2 integrate
.. //depot/projects/hammer/sys/i386/include/memdev.h#2 integrate
.. //depot/projects/hammer/sys/ia64/include/memdev.h#2 integrate
.. //depot/projects/hammer/sys/kern/kern_cpuset.c#7 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#83 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#50 integrate
.. //depot/projects/hammer/sys/kern/kern_lockf.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_xxx.c#15 integrate
.. //depot/projects/hammer/sys/kern/stack_protector.c#1 branch
.. //depot/projects/hammer/sys/kern/uipc_sem.c#23 integrate
.. //depot/projects/hammer/sys/kern/uipc_shm.c#4 integrate
.. //depot/projects/hammer/sys/mips/include/iodev.h#2 integrate
.. //depot/projects/hammer/sys/mips/include/memdev.h#2 integrate
.. //depot/projects/hammer/sys/modules/nfslockd/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/pecoff/Makefile#5 delete
.. //depot/projects/hammer/sys/modules/ralfw/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/sem/Makefile#3 integrate
.. //depot/projects/hammer/sys/net/if.c#77 integrate
.. //depot/projects/hammer/sys/net/if_bridge.c#41 integrate
.. //depot/projects/hammer/sys/net/if_gre.c#38 integrate
.. //depot/projects/hammer/sys/net/if_loop.c#35 integrate
.. //depot/projects/hammer/sys/net/if_var.h#48 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#56 integrate
.. //depot/projects/hammer/sys/netinet6/in6_rmx.c#15 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_ipsec.c#6 integrate
.. //depot/projects/hammer/sys/netipsec/key.c#21 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs.h#23 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_node.c#27 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#58 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#62 integrate
.. //depot/projects/hammer/sys/nfsclient/nfsmount.h#12 integrate
.. //depot/projects/hammer/sys/nfsclient/nfsnode.h#22 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#26 integrate
.. //depot/projects/hammer/sys/nlm/nlm.h#2 integrate
.. //depot/projects/hammer/sys/nlm/nlm_advlock.c#1 branch
.. //depot/projects/hammer/sys/nlm/nlm_prot.h#2 integrate
.. //depot/projects/hammer/sys/nlm/nlm_prot_clnt.c#3 integrate
.. //depot/projects/hammer/sys/nlm/nlm_prot_impl.c#5 integrate
.. //depot/projects/hammer/sys/nlm/nlm_prot_server.c#3 integrate
.. //depot/projects/hammer/sys/powerpc/include/memdev.h#2 integrate
.. //depot/projects/hammer/sys/rpc/auth_unix.c#3 integrate
.. //depot/projects/hammer/sys/rpc/authunix_prot.c#3 integrate
.. //depot/projects/hammer/sys/rpc/clnt.h#2 integrate
.. //depot/projects/hammer/sys/rpc/clnt_dg.c#3 integrate
.. //depot/projects/hammer/sys/rpc/clnt_rc.c#4 integrate
.. //depot/projects/hammer/sys/rpc/clnt_vc.c#3 integrate
.. //depot/projects/hammer/sys/rpc/rpcb_clnt.c#3 integrate
.. //depot/projects/hammer/sys/rpc/svc_vc.c#3 integrate
.. //depot/projects/hammer/sys/security/mac/mac_framework.h#13 integrate
.. //depot/projects/hammer/sys/security/mac/mac_policy.h#14 integrate
.. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#8 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#48 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#47 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#31 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#50 integrate
.. //depot/projects/hammer/sys/sparc64/include/in_cksum.h#4 integrate
.. //depot/projects/hammer/sys/sparc64/include/memdev.h#2 integrate
.. //depot/projects/hammer/sys/sun4v/include/in_cksum.h#2 integrate
.. //depot/projects/hammer/sys/sun4v/include/memdev.h#2 integrate
.. //depot/projects/hammer/sys/sys/fcntl.h#9 integrate
.. //depot/projects/hammer/sys/sys/file.h#20 integrate
.. //depot/projects/hammer/sys/sys/ksem.h#2 integrate
.. //depot/projects/hammer/sys/sys/lockf.h#9 integrate
.. //depot/projects/hammer/sys/sys/param.h#114 integrate
.. //depot/projects/hammer/sys/sys/priv.h#9 integrate
.. //depot/projects/hammer/sys/sys/semaphore.h#2 integrate
.. //depot/projects/hammer/sys/sys/user.h#26 integrate
.. //depot/projects/hammer/tools/build/options/WITHOUT_SSP#2 integrate
.. //depot/projects/hammer/tools/regression/file/flock/flock.c#2 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/Makefile#5 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-print-positional.c#1 branch
.. //depot/projects/hammer/tools/regression/posixsem/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/posixsem/posixsem.c#1 branch
.. //depot/projects/hammer/tools/regression/posixsem/posixsem.t#1 branch
.. //depot/projects/hammer/tools/regression/posixsem/test.c#1 branch
.. //depot/projects/hammer/tools/regression/posixsem/test.h#1 branch
.. //depot/projects/hammer/tools/regression/posixshm/test.c#2 integrate
.. //depot/projects/hammer/usr.bin/cpio/cpio.c#4 integrate
.. //depot/projects/hammer/usr.bin/gzip/gzip.1#5 integrate
.. //depot/projects/hammer/usr.bin/gzip/unbzip2.c#2 integrate
.. //depot/projects/hammer/usr.bin/gzip/znew#3 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#35 integrate
.. //depot/projects/hammer/usr.bin/procstat/procstat_files.c#4 integrate
.. //depot/projects/hammer/usr.bin/su/su.1#13 integrate
.. //depot/projects/hammer/usr.bin/tar/write.c#33 integrate
.. //depot/projects/hammer/usr.bin/unzip/unzip.1#2 integrate
.. //depot/projects/hammer/usr.bin/unzip/unzip.c#2 integrate
.. //depot/projects/hammer/usr.sbin/config/mkmakefile.c#17 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/cron.8#6 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/cron.c#7 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/cron.h#6 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/do_command.c#8 integrate
.. //depot/projects/hammer/usr.sbin/mountd/exports.5#9 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.conf.5#7 integrate
.. //depot/projects/hammer/usr.sbin/ngctl/main.c#11 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#11 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#16 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#13 integrate
.. //depot/projects/hammer/usr.sbin/rpc.statd/file.c#4 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#14 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#10 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#137 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.606 2008/06/18 13:52:58 obrien Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.607 2008/06/25 21:33:28 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -225,6 +225,7 @@
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
+ -DWITHOUT_SSP \
-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
@@ -235,7 +236,7 @@
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \
- -DNO_WARNS -DNO_CTF
+ -DNO_WARNS -DNO_CTF -DWITHOUT_SSP
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -452,7 +453,7 @@
.if ${MK_KERBEROS} != "no"
.for _t in obj depend all
cd ${.CURDIR}/kerberos5/tools; \
- MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t}
+ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= ${_t}
.endfor
.endif
.for _t in obj includes
@@ -480,7 +481,7 @@
.endfor
.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
cd ${.CURDIR}/${_dir}; \
- MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools
+ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= build-tools
.endfor
cd ${.CURDIR}; \
${LIB32WMAKE} -f Makefile.inc1 libraries
@@ -772,14 +773,14 @@
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${_kernel}; \
MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
- ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF \
+ ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \
-f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
.for target in obj depend all
cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
- ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF ${target}
+ ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target}
.endfor
.endif
.if !defined(NO_KERNELDEPEND)
==== //depot/projects/hammer/ObsoleteFiles.inc#54 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.143 2008/06/14 10:42:18 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.144 2008/07/01 21:54:08 danger Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20080701: wpa_supplicant.conf moved to share/examples/etc/
+OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
+OLD_DIRS+=usr/share/examples/wpa_supplicant
# 20080614: sgtty removed
OLD_FILES+=usr/include/sys/ttychars.h
OLD_FILES+=usr/include/sys/ttydev.h
==== //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#14 (text+ko) ====
@@ -22,7 +22,7 @@
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.73 2007/05/19 02:30:20 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.75 2008/06/28 15:28:17 obrien Exp $ */
#undef CC1_SPEC
#define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
@@ -54,7 +54,7 @@
/* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h
but trashed by config/<cpu>/<file.h>. */
-#undef STARTFILE_SPEC
+#undef STARTFILE_SPEC
#define STARTFILE_SPEC FBSD_STARTFILE_SPEC
/* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. */
@@ -78,13 +78,13 @@
#undef WCHAR_TYPE_SIZE
#define WCHAR_TYPE_SIZE (TARGET_64BIT ? 32 : BITS_PER_WORD)
-#undef SUBTARGET_EXTRA_SPECS /* i386.h bogusly defines it. */
+#undef SUBTARGET_EXTRA_SPECS /* i386.h bogusly defines it. */
#define SUBTARGET_EXTRA_SPECS \
{ "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER }
#define TARGET_VERSION fprintf (stderr, " (i386 FreeBSD/ELF)");
-#define TARGET_ELF 1
+#define TARGET_ELF 1
/* This goes away when the math emulator is fixed. */
#undef TARGET_SUBTARGET_DEFAULT
@@ -101,7 +101,7 @@
/* FreeBSD sets the rounding precision of the FPU to 53 bits. Let the
compiler get the contents of <float.h> and std::numeric_limits correct. */
-#undef TARGET_96_ROUND_53_LONG_DOUBLE
+#undef TARGET_96_ROUND_53_LONG_DOUBLE
#define TARGET_96_ROUND_53_LONG_DOUBLE (!TARGET_64BIT)
/* Tell final.c that we don't need a label passed to mcount. */
@@ -110,7 +110,7 @@
/* Output assembler code to FILE to begin profiling of the current function.
LABELNO is an optional label. */
-#undef MCOUNT_NAME
+#undef MCOUNT_NAME
#define MCOUNT_NAME ".mcount"
/* Output assembler code to FILE to end profiling of the current function. */
@@ -145,7 +145,7 @@
else \
fprintf ((FILE), "%s", xname); \
} \
- else \
+ else \
{ \
if (xname[0] == '%') \
xname += 2; \
@@ -191,7 +191,7 @@
uninitialized global data will be output in the data section if
`-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be
used. */
-#undef BSS_SECTION_ASM_OP
+#undef BSS_SECTION_ASM_OP
#define BSS_SECTION_ASM_OP "\t.section\t.bss"
/* Like `ASM_OUTPUT_BSS' except takes the required alignment as a
@@ -202,7 +202,7 @@
Try to use function `asm_output_aligned_bss' defined in file
`varasm.c' when defining this macro. */
-#undef ASM_OUTPUT_ALIGNED_BSS
+#undef ASM_OUTPUT_ALIGNED_BSS
#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
@@ -230,7 +230,7 @@
assemble_name (asm_out_file, NAME); \
fputc ('-', asm_out_file); \
assemble_name (asm_out_file, \
- XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \
+ XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \
fprintf (asm_out_file, "\n"); \
} while (0)
==== //depot/projects/hammer/etc/devd.conf#33 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.41 2008/06/15 13:26:25 kmacy Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.42 2008/06/27 12:04:36 rpaulo Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -255,6 +255,28 @@
action "/etc/rc.resume acpi $notify";
};
+# The next blocks enable volume hotkeys that can be found on the Asus EeePC
+notify 0 {
+ match "system" "ACPI";
+ match "subsystem" "ASUS-Eee";
+ match "notify" "0x13";
+ action "mixer 0";
+};
+
+notify 0 {
+ match "system" "ACPI";
+ match "subsystem" "ASUS-Eee";
+ match "notify" "0x14";
+ action "mixer vol -10";
+};
+
+notify 0 {
+ match "system" "ACPI";
+ match "subsystem" "ASUS-Eee";
+ match "notify" "0x15";
+ action "mixer vol +10";
+};
+
/* EXAMPLES TO END OF FILE
# The following might be an example of something that a vendor might
==== //depot/projects/hammer/etc/periodic/security/800.loginfail#7 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $
+# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.9 2008/06/30 08:01:47 mtm Exp $
#
# Show login failures
@@ -59,7 +59,7 @@
[Yy][Ee][Ss])
echo ""
echo "${host} login failures:"
- n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" |
+ n=$(catmsgs | egrep -ia "^$yesterday.*: .*(fail|invalid|bad|illegal)" |
tee /dev/stderr | wc -l)
[ $n -gt 0 ] && rc=1 || rc=0;;
*) rc=0;;
==== //depot/projects/hammer/etc/rc.d/lockd#6 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
-# $FreeBSD: src/etc/rc.d/lockd,v 1.20 2008/06/23 04:05:39 mtm Exp $
+# $FreeBSD: src/etc/rc.d/lockd,v 1.21 2008/06/27 15:45:17 mtm Exp $
#
# PROVIDE: lockd
@@ -15,7 +15,7 @@
rcvar=rpc_lockd_enable
command="/usr/sbin/rpc.${name}"
start_precmd='lockd_precmd'
-stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
status_precmd=$stop_precmd
# Make sure that we are either an NFS client or server, and that we get
@@ -26,7 +26,7 @@
local ret
ret=0
- if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable
+ if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable
then
ret=1
fi
==== //depot/projects/hammer/etc/rc.d/statd#5 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp
-# $FreeBSD: src/etc/rc.d/statd,v 1.19 2008/06/23 04:05:39 mtm Exp $
+# $FreeBSD: src/etc/rc.d/statd,v 1.20 2008/06/27 15:45:17 mtm Exp $
#
# PROVIDE: statd
@@ -15,7 +15,7 @@
rcvar=rpc_statd_enable
command="/usr/sbin/rpc.${name}"
start_precmd='statd_precmd'
-stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
status_precmd=$stop_precmd
# Make sure that we are either an NFS client or server, and that we get
@@ -26,7 +26,7 @@
local ret
ret=0
- if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable
+ if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable
then
ret=1
fi
==== //depot/projects/hammer/games/fortune/datfiles/fortunes#82 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.264 2008/06/23 20:27:37 phk Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.265 2008/06/25 04:56:08 wollman Exp $
%
=======================================================================
|| ||
@@ -14259,7 +14259,7 @@
The computer assumes that all behavior is in pursuit of an ultimate
goal. Whenever a motorist changes his or her mind and veers off
course, the GPS lady issues that snippy announcement: "Recalculating!"
- -- Joel Achenbach (www.slate.com, 20 jun 2008)
+ -- Joel Achenbach (www.slate.com, 20 Jun 2008)
%
Computers don't actually think.
You just think they think.
==== //depot/projects/hammer/gnu/lib/Makefile#8 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/gnu/lib/Makefile,v 1.42 2007/05/19 04:25:54 kan Exp $
+# $FreeBSD: src/gnu/lib/Makefile,v 1.43 2008/06/25 21:33:28 ru Exp $
.include <bsd.own.mk>
-SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline
+SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp
# libsupc++ uses libstdc++ headers, although 'make includes' should
# have taken care of that already.
@@ -14,8 +14,4 @@
SUBDIR+= libobjc
.endif
-.if ${MK_SSP} != "no"
-SUBDIR+= libssp
-.endif
-
.include <bsd.subdir.mk>
==== //depot/projects/hammer/gnu/lib/csu/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.28 2008/01/24 07:43:09 ru Exp $
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
@@ -19,6 +19,7 @@
-I${CCDIR}/cc_tools
CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG}
MKDEP= -DCRT_BEGIN
+WITHOUT_SSP=
.if ${MACHINE_ARCH} == "ia64"
BEGINSRC= crtbegin.asm
==== //depot/projects/hammer/gnu/lib/libssp/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libssp/Makefile,v 1.2 2007/05/22 10:40:58 ru Exp $
+# $FreeBSD: src/gnu/lib/libssp/Makefile,v 1.3 2008/06/25 21:33:28 ru Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
@@ -10,6 +10,7 @@
SHLIB_MAJOR= 0
SHLIBDIR?= /lib
NO_PROFILE=
+WITHOUT_SSP=
SRCS= ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \
==== //depot/projects/hammer/gnu/usr.bin/cvs/contrib/Makefile#5 (text+ko) ====
@@ -1,6 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.20 2008/01/16 17:15:59 obrien Exp $
-
-.POSIX:
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.21 2008/06/27 14:59:23 obrien Exp $
.include "../Makefile.inc"
@@ -21,6 +19,10 @@
.SUFFIXES: .sh .pl .in
+# Prevent Makefile.in from overwriting Makefile through the suffix rules.
+Makefile:
+ @:
+
.sh:
cp ${.IMPSRC} ${.TARGET}
==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#20 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.24 2008/06/15 05:15:53 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.26 2008/06/30 16:19:26 des Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -53,6 +53,9 @@
int64_t entry_compressed_bytes_read;
int64_t entry_uncompressed_bytes_read;
+ /* Running CRC32 of the decompressed data */
+ unsigned long entry_crc32;
+
unsigned version;
unsigned system;
unsigned flags;
@@ -70,7 +73,7 @@
char end_of_entry;
char end_of_entry_cleanup;
- long crc32;
+ unsigned long crc32;
ssize_t filename_length;
ssize_t extra_length;
int64_t uncompressed_size;
@@ -299,6 +302,7 @@
zip->end_of_entry_cleanup = 0;
zip->entry_uncompressed_bytes_read = 0;
zip->entry_compressed_bytes_read = 0;
+ zip->entry_crc32 = crc32(0, NULL, 0);
if ((h = __archive_read_ahead(a, 4)) == NULL)
return (ARCHIVE_FATAL);
@@ -523,14 +527,13 @@
"ZIP uncompressed data is wrong size");
return (ARCHIVE_WARN);
}
-/* TODO: Compute CRC. */
-/*
- if (zip->crc32 != zip->entry_crc32_calculated) {
+ /* Check computed CRC against header */
+ if (zip->crc32 != zip->entry_crc32) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "ZIP data CRC error");
+ "ZIP bad CRC: 0x%lx should be 0x%lx",
+ zip->entry_crc32, zip->crc32);
return (ARCHIVE_WARN);
}
-*/
/* End-of-entry cleanup done. */
zip->end_of_entry_cleanup = 1;
}
@@ -570,6 +573,11 @@
}
break;
}
+ /* Update checksum */
+ if (r == ARCHIVE_OK && *size) {
+ zip->entry_crc32 =
+ crc32(zip->entry_crc32, *buff, *size);
+ }
return (r);
}
==== //depot/projects/hammer/lib/libarchive/test/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.21 2008/06/15 05:05:53 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.23 2008/06/26 11:58:26 des Exp $
# Where to find the libarchive sources
LA_SRCDIR=${.CURDIR}/..
@@ -72,7 +72,7 @@
# Build the test program using all libarchive sources + the test sources.
SRCS= ${LA_SRCS} \
${TESTS} \
- ${.OBJDIR}/list.h \
+ list.h \
main.c \
read_open_memory.c
@@ -84,19 +84,19 @@
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
LDADD= -lz -lbz2
CFLAGS+= -static -g
-CFLAGS+= -I${LA_SRCDIR}
+CFLAGS+= -I${LA_SRCDIR} -I.
# Uncomment to link against dmalloc
-LDADD+= -L/usr/local/lib -ldmalloc
-CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
-WARNS=6
+#LDADD+= -L/usr/local/lib -ldmalloc
+#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
+#WARNS=6
# Build libarchive_test and run it.
check test: libarchive_test
./libarchive_test -v -r ${.CURDIR}
# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines
-${.OBJDIR}/list.h: ${TESTS} Makefile
+list.h: ${TESTS} Makefile
(cd ${.CURDIR}; cat ${TESTS}) | grep DEFINE_TEST > list.h
CLEANFILES += *.out *.o *.core *~ list.h
==== //depot/projects/hammer/lib/libarchive/test/test_compat_zip_1.zip.uu#2 (text+ko) ====
@@ -1,3 +1,4 @@
+$FreeBSD: src/lib/libarchive/test/test_compat_zip_1.zip.uu,v 1.2 2008/06/30 15:49:12 des Exp $
begin 644 test_compat_zip_1.zip
M4$L#!!0`"``(``B$@S<````````````````4````345402U)3D8O34%.249%
M4U0N34;S3<S+3$LM+M$-2RTJSLS/LU(PU#/@Y7+,0Q)Q+$A,SDA5`(H!)<U!
==== //depot/projects/hammer/lib/libarchive/test/test_read_format_zip.c#4 (text+ko) ====
@@ -23,28 +23,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.3 2008/01/01 22:28:04 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.5 2008/06/26 11:50:11 des Exp $");
-static unsigned char archive[] = {
-'P','K',3,4,10,0,0,0,0,0,'Y','f',179,'6',0,0,0,0,0,0,0,0,0,0,0,0,4,0,21,0,
-'d','i','r','/','U','T',9,0,3,25,'U','O','F',25,'U','O','F','U','x',4,0,232,
-3,232,3,'P','K',3,4,20,0,0,0,8,0,'o','f',179,'6',':','7','f','=',10,0,0,0,
-18,0,0,0,5,0,21,0,'f','i','l','e','1','U','T',9,0,3,'A','U','O','F',172,'[',
-'O','F','U','x',4,0,232,3,232,3,203,'H',205,201,201,231,202,'@','"',1,'P',
-'K',3,4,20,0,0,0,8,0,'Z','j',179,'6',':','7','f','=',10,0,0,0,18,0,0,0,5,
-0,21,0,'f','i','l','e','2','U','T',9,0,3,172,'[','O','F',172,'[','O','F',
-'U','x',4,0,232,3,232,3,203,'H',205,201,201,231,202,'@','"',1,'P','K',1,2,
-23,3,10,0,0,0,0,0,'Y','f',179,'6',0,0,0,0,0,0,0,0,0,0,0,0,4,0,13,0,0,0,0,
-0,0,0,16,0,237,'A',0,0,0,0,'d','i','r','/','U','T',5,0,3,25,'U','O','F','U',
-'x',0,0,'P','K',1,2,23,3,20,0,0,0,8,0,'o','f',179,'6',':','7','f','=',10,
-0,0,0,18,0,0,0,5,0,13,0,0,0,0,0,1,0,0,0,164,129,'7',0,0,0,'f','i','l','e',
-'1','U','T',5,0,3,'A','U','O','F','U','x',0,0,'P','K',1,2,23,3,20,0,0,0,8,
-0,'Z','j',179,'6',':','7','f','=',10,0,0,0,18,0,0,0,5,0,13,0,0,0,0,0,1,0,
-0,0,164,129,'y',0,0,0,'f','i','l','e','2','U','T',5,0,3,172,'[','O','F','U',
-'x',0,0,'P','K',5,6,0,0,0,0,3,0,3,0,191,0,0,0,187,0,0,0,0,0};
-
DEFINE_TEST(test_read_format_zip)
{
+ const char *refname = "test_read_format_zip.zip";
struct archive_entry *ae;
struct archive *a;
char *buff[128];
@@ -52,10 +35,11 @@
size_t s;
off_t o;
+ extract_reference_file(refname);
assert((a = archive_read_new()) != NULL);
assertA(0 == archive_read_support_compression_all(a));
assertA(0 == archive_read_support_format_all(a));
- assertA(0 == archive_read_open_memory(a, archive, sizeof(archive)));
+ assertA(0 == archive_read_open_filename(a, refname, 10240));
assertA(0 == archive_read_next_header(a, &ae));
assertEqualString("dir/", archive_entry_pathname(ae));
assertEqualInt(1179604249, archive_entry_mtime(ae));
@@ -67,17 +51,18 @@
assertEqualString("file1", archive_entry_pathname(ae));
assertEqualInt(1179604289, archive_entry_mtime(ae));
assertEqualInt(18, archive_entry_size(ae));
- assertEqualInt(18, archive_read_data(a, buff, 18));
+ assertEqualInt(18, archive_read_data(a, buff, 19));
assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18));
assertA(0 == archive_read_next_header(a, &ae));
assertEqualString("file2", archive_entry_pathname(ae));
assertEqualInt(1179605932, archive_entry_mtime(ae));
assertEqualInt(18, archive_entry_size(ae));
- assertEqualInt(18, archive_read_data(a, buff, 18));
+ assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19));
assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18));
assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE);
assertA(archive_format(a) == ARCHIVE_FORMAT_ZIP);
assert(0 == archive_read_close(a));
+
#if ARCHIVE_API_VERSION > 1
assert(0 == archive_read_finish(a));
#else
==== //depot/projects/hammer/lib/libc/Makefile#31 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.74 2008/06/25 21:33:28 ru Exp $
SHLIBDIR?= /lib
@@ -122,3 +122,9 @@
# Disable warnings in contributed sources.
CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/}
+# XXX For now, we don't allow libc to be compiled with
+# -fstack-protector-all because it breaks rtld. We may want to make a librtld
+# in the future to circumvent this.
+SSP_CFLAGS:= ${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/}
+# Disable stack protection for SSP symbols.
+SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/}
==== //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#8 (text+ko) ====
@@ -34,7 +34,7 @@
.asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.19 2007/01/09 00:27:48 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.20 2008/06/28 17:55:43 das Exp $");
/*
* C library -- _setjmp, _longjmp
@@ -58,6 +58,7 @@
movq %r14,48(%rax) /* 6; r14 */
movq %r15,56(%rax) /* 7; r15 */
fnstcw 64(%rax) /* 8; fpu cw */
+ stmxcsr 68(%rax) /* and mxcsr */
xorq %rax,%rax
ret
@@ -65,6 +66,15 @@
.set CNAME(_longjmp),CNAME(___longjmp)
ENTRY(___longjmp)
movq %rdi,%rdx
+ /* Restore the mxcsr, but leave exception flags intact. */
+ stmxcsr -4(%rsp)
+ movl 68(%rdx),%eax
+ andl $0xffffffc0,%eax
+ movl -4(%rsp),%edi
+ andl $0x3f,%edi
+ xorl %eax,%edi
+ movl %edi,-4(%rsp)
+ ldmxcsr -4(%rsp)
movq %rsi,%rax /* retval */
movq 0(%rdx),%rcx
movq 8(%rdx),%rbx
@@ -74,7 +84,6 @@
movq 40(%rdx),%r13
movq 48(%rdx),%r14
movq 56(%rdx),%r15
- fninit
fldcw 64(%rdx)
testq %rax,%rax
jnz 1f
==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#10 (text+ko) ====
@@ -34,7 +34,7 @@
.asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.27 2007/01/09 00:27:48 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.28 2008/06/28 17:55:43 das Exp $");
/*
* C library -- _setjmp, _longjmp
@@ -67,6 +67,7 @@
movq %r14,48(%rcx) /* 6; r14 */
movq %r15,56(%rcx) /* 7; r15 */
fnstcw 64(%rcx) /* 8; fpu cw */
+ stmxcsr 68(%rcx) /* and mxcsr */
xorq %rax,%rax
ret
@@ -83,6 +84,15 @@
popq %rsi
popq %rdi /* jmpbuf */
movq %rdi,%rdx
+ /* Restore the mxcsr, but leave exception flags intact. */
+ stmxcsr -4(%rsp)
+ movl 68(%rdx),%eax
+ andl $0xffffffc0,%eax
+ movl -4(%rsp),%edi
+ andl $0x3f,%edi
+ xorl %eax,%edi
+ movl %edi,-4(%rsp)
+ ldmxcsr -4(%rsp)
movq %rsi,%rax /* retval */
movq 0(%rdx),%rcx
movq 8(%rdx),%rbx
@@ -92,7 +102,6 @@
movq 40(%rdx),%r13
movq 48(%rdx),%r14
movq 56(%rdx),%r15
- fninit
fldcw 64(%rdx)
testq %rax,%rax
jnz 1f
==== //depot/projects/hammer/lib/libc/gen/glob.c#7 (text+ko) ====
@@ -34,7 +34,7 @@
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.26 2007/01/09 00:27:54 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.27 2008/06/26 07:12:35 mtm Exp $");
/*
* glob(3) -- a superset of the one defined in POSIX 1003.2.
@@ -143,7 +143,7 @@
static int g_Ctoc(const Char *, char *, size_t);
static int g_lstat(Char *, struct stat *, glob_t *);
static DIR *g_opendir(Char *, glob_t *);
-static Char *g_strchr(Char *, wchar_t);
+static const Char *g_strchr(const Char *, wchar_t);
#ifdef notdef
static Char *g_strcat(Char *, const Char *);
#endif
@@ -246,7 +246,7 @@
if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS)
return glob0(pattern, pglob, limit);
- while ((ptr = (const Char *) g_strchr((Char *) ptr, LBRACE)) != NULL)
+ while ((ptr = g_strchr(ptr, LBRACE)) != NULL)
if (!globexp2(ptr, pattern, pglob, &rv, limit))
return rv;
@@ -449,7 +449,7 @@
if (c == NOT)
++qpatnext;
if (*qpatnext == EOS ||
- g_strchr((Char *) qpatnext+1, RBRACKET) == NULL) {
+ g_strchr(qpatnext+1, RBRACKET) == NULL) {
*bufnext++ = LBRACKET;
if (c == NOT)
--qpatnext;
@@ -859,8 +859,8 @@
return(stat(buf, sb));
}
-static Char *
-g_strchr(Char *str, wchar_t ch)
+static const Char *
+g_strchr(const Char *str, wchar_t ch)
{
do {
==== //depot/projects/hammer/lib/libc/i386/gen/_setjmp.S#3 (text+ko) ====
@@ -34,7 +34,7 @@
.asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.17 2007/01/09 00:27:58 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.18 2008/06/28 17:58:06 das Exp $");
/*
* C library -- _setjmp, _longjmp
@@ -70,7 +70,6 @@
movl 12(%edx),%ebp
movl 16(%edx),%esi
movl 20(%edx),%edi
- fninit
fldcw 24(%edx)
testl %eax,%eax
jnz 1f
==== //depot/projects/hammer/lib/libc/i386/gen/setjmp.S#3 (text+ko) ====
@@ -34,7 +34,7 @@
.asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.23 2007/01/09 00:27:58 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.24 2008/06/28 17:58:06 das Exp $");
/*
* C library -- _setjmp, _longjmp
@@ -90,7 +90,6 @@
movl 12(%edx),%ebp
movl 16(%edx),%esi
movl 20(%edx),%edi
- fninit
fldcw 24(%edx)
testl %eax,%eax
jnz 1f
==== //depot/projects/hammer/lib/libc/net/getaddrinfo.3#14 (text+ko) ====
@@ -16,9 +16,9 @@
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.33 2007/06/06 19:24:02 remko Exp $
+.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.34 2008/07/01 22:59:20 danger Exp $
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list