PERFORCE change 62092 for review
Peter Wemm
peter at FreeBSD.org
Thu Sep 23 19:05:23 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=62092
Change 62092 by peter at peter_daintree on 2004/09/24 02:04:25
IFC
Affected files ...
.. //depot/projects/hammer/UPDATING#56 integrate
.. //depot/projects/hammer/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/hammer/contrib/bind9/KNOWN_DEFECTS#1 branch
.. //depot/projects/hammer/contrib/bind9/bin/named/control.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/named/include/named/control.h#2 integrate
.. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#2 integrate
.. //depot/projects/hammer/contrib/bind9/lib/tests/Makefile.in#2 delete
.. //depot/projects/hammer/contrib/bind9/lib/tests/include/Makefile.in#2 delete
.. //depot/projects/hammer/contrib/bind9/lib/tests/include/tests/Makefile.in#2 delete
.. //depot/projects/hammer/contrib/bind9/lib/tests/include/tests/t_api.h#2 delete
.. //depot/projects/hammer/contrib/bind9/lib/tests/t_api.c#2 delete
.. //depot/projects/hammer/contrib/bind9/version#2 integrate
.. //depot/projects/hammer/etc/defaults/periodic.conf#10 integrate
.. //depot/projects/hammer/etc/mtree/BSD.root.dist#12 integrate
.. //depot/projects/hammer/etc/periodic/security/security.functions#4 integrate
.. //depot/projects/hammer/lib/bind/bind/Makefile#2 integrate
.. //depot/projects/hammer/lib/bind/bind9/Makefile#2 integrate
.. //depot/projects/hammer/lib/bind/config.mk#2 integrate
.. //depot/projects/hammer/lib/bind/dns/Makefile#2 integrate
.. //depot/projects/hammer/lib/bind/isc/Makefile#2 integrate
.. //depot/projects/hammer/lib/bind/isccc/Makefile#2 integrate
.. //depot/projects/hammer/lib/bind/isccfg/Makefile#2 integrate
.. //depot/projects/hammer/lib/bind/lwres/Makefile#2 integrate
.. //depot/projects/hammer/lib/csu/arm/crt1.c#3 integrate
.. //depot/projects/hammer/lib/csu/arm/crti.S#2 integrate
.. //depot/projects/hammer/lib/csu/arm/crtn.S#2 integrate
.. //depot/projects/hammer/lib/libc/arm/gen/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/arm/gen/_set_tp.c#1 branch
.. //depot/projects/hammer/lib/libc/arm/gen/setjmp.S#2 integrate
.. //depot/projects/hammer/lib/libc/arm/string/memcmp.S#2 integrate
.. //depot/projects/hammer/lib/libc/arm/string/memcpy_xscale.S#2 integrate
.. //depot/projects/hammer/lib/libc/gen/tls.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/collate.c#4 integrate
.. //depot/projects/hammer/lib/libdevinfo/devinfo.c#3 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_ia64.c#4 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_proc.c#23 edit
.. //depot/projects/hammer/lib/libncp/ncpl_subr.c#7 integrate
.. //depot/projects/hammer/lib/libnetgraph/sock.c#5 integrate
.. //depot/projects/hammer/lib/libstand/stand.h#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#21 integrate
.. //depot/projects/hammer/libexec/named-xfer/Makefile#3 delete
.. //depot/projects/hammer/libexec/rtld-elf/arm/reloc.c#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/arm/rtld_machdep.h#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/arm/rtld_start.S#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/rtld.c#23 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#80 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#6 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#13 integrate
.. //depot/projects/hammer/sbin/reboot/boot_i386.8#7 integrate
.. //depot/projects/hammer/share/examples/diskless/clone_root#2 integrate
.. //depot/projects/hammer/share/man/man5/periodic.conf.5#8 integrate
.. //depot/projects/hammer/share/mk/bsd.cpu.mk#21 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#22 integrate
.. //depot/projects/hammer/sys/amd64/amd64/bios.c#1 branch
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#103 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#108 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#58 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#47 integrate
.. //depot/projects/hammer/sys/amd64/include/db_machdep.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/pc/bios.h#1 branch
.. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#4 integrate
.. //depot/projects/hammer/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/hammer/sys/arm/arm/db_trace.c#6 integrate
.. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#4 integrate
.. //depot/projects/hammer/sys/arm/arm/exception.S#3 integrate
.. //depot/projects/hammer/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/hammer/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/hammer/sys/arm/arm/intr.c#3 integrate
.. //depot/projects/hammer/sys/arm/arm/irq_dispatch.S#2 integrate
.. //depot/projects/hammer/sys/arm/arm/locore.S#3 integrate
.. //depot/projects/hammer/sys/arm/arm/machdep.c#5 integrate
.. //depot/projects/hammer/sys/arm/arm/nexus_io.c#4 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#8 integrate
.. //depot/projects/hammer/sys/arm/arm/support.S#3 integrate
.. //depot/projects/hammer/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/hammer/sys/arm/arm/sys_machdep.c#3 integrate
.. //depot/projects/hammer/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/hammer/sys/arm/arm/uio_machdep.c#3 integrate
.. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#4 integrate
.. //depot/projects/hammer/sys/arm/conf/IQ31244#1 branch
.. //depot/projects/hammer/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/hammer/sys/arm/include/asm.h#2 integrate
.. //depot/projects/hammer/sys/arm/include/asmacros.h#2 integrate
.. //depot/projects/hammer/sys/arm/include/bus.h#4 integrate
.. //depot/projects/hammer/sys/arm/include/intr.h#2 integrate
.. //depot/projects/hammer/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/hammer/sys/arm/include/param.h#4 integrate
.. //depot/projects/hammer/sys/arm/include/pcb.h#4 integrate
.. //depot/projects/hammer/sys/arm/include/pmap.h#4 integrate
.. //depot/projects/hammer/sys/arm/include/profile.h#5 integrate
.. //depot/projects/hammer/sys/arm/include/pte.h#2 integrate
.. //depot/projects/hammer/sys/arm/include/signal.h#5 integrate
.. //depot/projects/hammer/sys/arm/include/sysarch.h#1 branch
.. //depot/projects/hammer/sys/arm/include/vmparam.h#3 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#4 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0.c#4 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_io.c#4 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_irq.S#2 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/std.sa11x0#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/files.i80321#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/files.iq31244#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_intr.h#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_mcu.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_space.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321reg.h#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321var.h#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321reg.h#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321var.h#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/obio.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/obio_space.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/obiovar.h#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/std.i80321#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/std.iq31244#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/xscalereg.h#1 branch
.. //depot/projects/hammer/sys/arm/xscale/xscalevar.h#1 branch
.. //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#8 integrate
.. //depot/projects/hammer/sys/boot/efi/loader/main.c#6 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/Makefile#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/acpi_stub.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/bootinfo.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/conf.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/copy.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/delay.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/devicename.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/efi_stub.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/elf_freebsd.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/exit.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/ldscript.ia64#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/libski.h#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/main.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/pal_stub.S#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/sal_stub.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/skiconsole.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/skifs.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/skiload.cmd#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/ssc.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/start.S#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/time.c#1 branch
.. //depot/projects/hammer/sys/boot/ia64/ski/version#1 branch
.. //depot/projects/hammer/sys/coda/coda_vfsops.c#12 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#13 integrate
.. //depot/projects/hammer/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/hammer/sys/conf/NOTES#68 integrate
.. //depot/projects/hammer/sys/conf/files#84 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#56 integrate
.. //depot/projects/hammer/sys/conf/kern.post.mk#25 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#30 integrate
.. //depot/projects/hammer/sys/conf/ldscript.arm#2 integrate
.. //depot/projects/hammer/sys/conf/options#60 integrate
.. //depot/projects/hammer/sys/conf/options.arm#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#7 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#17 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#22 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#35 integrate
.. //depot/projects/hammer/sys/dev/cp/if_cp.c#10 integrate
.. //depot/projects/hammer/sys/dev/ctau/if_ct.c#12 integrate
.. //depot/projects/hammer/sys/dev/cx/if_cx.c#18 integrate
.. //depot/projects/hammer/sys/dev/em/if_em_hw.c#13 integrate
.. //depot/projects/hammer/sys/dev/fb/vga.c#18 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#17 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#7 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#7 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#24 integrate
.. //depot/projects/hammer/sys/dev/pdq/pdq.c#5 integrate
.. //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#4 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#23 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_port.h#10 integrate
.. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#25 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#9 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#34 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#55 integrate
.. //depot/projects/hammer/sys/ia64/ia64/exception.S#6 integrate
.. //depot/projects/hammer/sys/ia64/ia64/locore.S#6 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#42 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#37 integrate
.. //depot/projects/hammer/sys/ia64/include/atomic.h#2 integrate
.. //depot/projects/hammer/sys/ia64/include/pmap.h#15 integrate
.. //depot/projects/hammer/sys/ia64/include/pte.h#3 integrate
.. //depot/projects/hammer/sys/isa/syscons_isa.c#9 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#14 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#23 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#33 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#35 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_physio.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#65 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#26 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#21 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#22 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#39 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#34 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#53 integrate
.. //depot/projects/hammer/sys/modules/Makefile#55 integrate
.. //depot/projects/hammer/sys/net/if.c#32 integrate
.. //depot/projects/hammer/sys/net/if_arcsubr.c#13 integrate
.. //depot/projects/hammer/sys/net/pfil.c#4 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_fw.c#10 integrate
.. //depot/projects/hammer/sys/netipsec/keydb.h#4 integrate
.. //depot/projects/hammer/sys/pci/viapm.c#7 integrate
.. //depot/projects/hammer/sys/rpc/rpcclnt.h#4 integrate
.. //depot/projects/hammer/sys/sys/conf.h#18 integrate
.. //depot/projects/hammer/sys/sys/proc.h#65 integrate
.. //depot/projects/hammer/sys/sys/resource.h#7 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#27 integrate
.. //depot/projects/hammer/usr.bin/dig/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/dnskeygen/Makefile#2 delete
.. //depot/projects/hammer/usr.bin/dnsquery/Makefile#2 delete
.. //depot/projects/hammer/usr.bin/host/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/nslookup/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/nsupdate/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#55 integrate
.. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#8 integrate
.. //depot/projects/hammer/usr.sbin/dnssec-keygen/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/dnssec-signzone/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/named-checkconf/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/named-checkzone/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/named/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/ndc/Makefile#3 delete
.. //depot/projects/hammer/usr.sbin/rndc-confgen/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/rndc/Makefile#2 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#56 (text+ko) ====
@@ -1859,4 +1859,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.359 2004/09/15 01:08:32 seanc Exp $
+$FreeBSD: src/UPDATING,v 1.361 2004/09/22 20:42:30 andre Exp $
==== //depot/projects/hammer/contrib/bind9/CHANGES#2 (text+ko) ====
@@ -1,4 +1,8 @@
+ --- 9.3.0 released ---
+
+1711. [func] 'rndc unfreeze' has been deprecated by 'rndc thaw'.
+
--- 9.3.0rc4 released ---
1709. [port] solaris: add SMF support.
==== //depot/projects/hammer/contrib/bind9/bin/named/control.c#2 (text+ko) ====
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: control.c,v 1.7.2.2.2.10 2004/03/22 01:52:22 marka Exp $ */
+/* $Id: control.c,v 1.7.2.2.2.10.4.1 2004/09/20 01:00:00 marka Exp $ */
#include <config.h>
@@ -122,7 +122,8 @@
result = ns_server_status(ns_g_server, text);
} else if (command_compare(command, NS_COMMAND_FREEZE)) {
result = ns_server_freeze(ns_g_server, ISC_TRUE, command);
- } else if (command_compare(command, NS_COMMAND_UNFREEZE)) {
+ } else if (command_compare(command, NS_COMMAND_UNFREEZE) ||
+ command_compare(command, NS_COMMAND_THAW)) {
result = ns_server_freeze(ns_g_server, ISC_FALSE, command);
} else if (command_compare(command, NS_COMMAND_RECURSING)) {
result = ns_server_dumprecursing(ns_g_server);
==== //depot/projects/hammer/contrib/bind9/bin/named/include/named/control.h#2 (text+ko) ====
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: control.h,v 1.6.2.2.2.6 2004/03/08 04:04:20 marka Exp $ */
+/* $Id: control.h,v 1.6.2.2.2.6.6.1 2004/09/20 01:00:01 marka Exp $ */
#ifndef NAMED_CONTROL_H
#define NAMED_CONTROL_H 1
@@ -47,6 +47,7 @@
#define NS_COMMAND_STATUS "status"
#define NS_COMMAND_FREEZE "freeze"
#define NS_COMMAND_UNFREEZE "unfreeze"
+#define NS_COMMAND_THAW "thaw"
#define NS_COMMAND_RECURSING "recursing"
#define NS_COMMAND_NULL "null"
==== //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#2 (text+ko) ====
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: rndc.c,v 1.77.2.5.2.12 2004/03/08 04:04:23 marka Exp $ */
+/* $Id: rndc.c,v 1.77.2.5.2.12.6.1 2004/09/20 01:00:01 marka Exp $ */
/*
* Principal Author: DCL
@@ -99,7 +99,7 @@
Retransfer a single zone without checking serial number.\n\
freeze zone [class [view]]\n\
Suspend updates to a dynamic zone.\n\
- unfreeze zone [class [view]]\n\
+ thaw zone [class [view]]\n\
Enable updates to a frozen dynamic zone and reload it.\n\
reconfig Reload configuration file and new zones only.\n\
stats Write server statistics to the statistics file.\n\
==== //depot/projects/hammer/contrib/bind9/version#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $Id: version,v 1.26.2.17.2.10 2004/09/01 07:29:40 marka Exp $
+# $Id: version,v 1.26.2.17.2.10.4.1 2004/09/20 01:01:01 marka Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=3
PATCHVER=0
-RELEASETYPE=rc
-RELEASEVER=4
+RELEASETYPE=
+RELEASEVER=
==== //depot/projects/hammer/etc/defaults/periodic.conf#10 (text+ko) ====
@@ -10,7 +10,7 @@
# values set in this file. This eases the upgrade path when defaults
# are changed and new features are added.
#
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.29 2004/05/19 09:18:07 joe Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.30 2004/09/23 02:00:51 jkoshy Exp $
#
# What files override these defaults ?
@@ -128,6 +128,7 @@
daily_status_security_output="root" # user or /file
daily_status_security_noamd="NO" # Don't check amd mounts
daily_status_security_logdir="/var/log" # Directory for logs
+daily_status_security_diff_flags="-b -u" # flags for diff output
# 100.chksetuid
daily_status_security_chksetuid_enable="YES"
==== //depot/projects/hammer/etc/mtree/BSD.root.dist#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.69 2004/09/21 19:01:41 des Exp $
+# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.70 2004/09/23 19:33:54 des Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -32,6 +32,8 @@
..
mtree
..
+ namedb
+ ..
ntp mode=0700
..
pam.d
==== //depot/projects/hammer/etc/periodic/security/security.functions#4 (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/security.functions,v 1.3 2003/06/30 22:06:26 mtm Exp $
+# $FreeBSD: src/etc/periodic/security/security.functions,v 1.4 2004/09/23 02:00:51 jkoshy Exp $
#
#
@@ -67,7 +67,8 @@
[ $rc -lt 1 ] && rc=1
echo ""
echo "${msg}"
- diff -b ${LOG}/${label}.today ${tmpf} | eval "${filter}"
+ diff ${daily_status_security_diff_flags} ${LOG}/${label}.today \
+ ${tmpf} | eval "${filter}"
mv ${LOG}/${label}.today ${LOG}/${label}.yesterday || rc=3
mv ${tmpf} ${LOG}/${label}.today || rc=3
fi
==== //depot/projects/hammer/lib/bind/bind/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/bind/Makefile,v 1.1 2004/09/21 19:01:42 des Exp $
+# $FreeBSD: src/lib/bind/bind/Makefile,v 1.2 2004/09/22 12:13:54 des Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_DIR= ${.CURDIR}/..
@@ -60,8 +60,8 @@
CFLAGS+= -I${SRCDIR}/port/freebsd/include -I${SRCDIR}/include
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/..
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+DPADD= ${PTHREAD_DPADD}
+LDADD= ${PTHREAD_LDADD}
#INCS= ${SRCDIR}/include/isc/assertions.h \
# ${SRCDIR}/include/isc/ctl.h \
==== //depot/projects/hammer/lib/bind/bind9/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.1 2004/09/21 19:01:42 des Exp $
+# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.2 2004/09/22 12:13:55 des Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_DIR= ${.CURDIR}/..
@@ -13,8 +13,8 @@
CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -I${.CURDIR}/..
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+DPADD= ${PTHREAD_DPADD}
+LDADD= ${PTHREAD_LDADD}
INCS= ${SRCDIR}/include/bind9/check.h \
${SRCDIR}/include/bind9/getaddresses.h \
==== //depot/projects/hammer/lib/bind/config.mk#2 (text+ko) ====
@@ -1,54 +1,82 @@
-# $FreeBSD: src/lib/bind/config.mk,v 1.1 2004/09/21 19:01:42 des Exp $
+# $FreeBSD: src/lib/bind/config.mk,v 1.7 2004/09/23 07:52:51 des Exp $
+
+# BIND version number
+.if defined(BIND_DIR) && exists(${BIND_DIR}/version)
+.include "${BIND_DIR}/version"
+BIND_VERSION= ${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
+CFLAGS+= -DVERSION='"${BIND_VERSION}"'
+.endif
-CFLAGS+= -DVERSION='"9.3.0rc4"'
+CFLAGS+= -DHAVE_CONFIG_H
+# Get version numbers (for libraries)
.if defined(SRCDIR) && exists(${SRCDIR}/api)
.include "${SRCDIR}/api"
-.endif
-
-.if defined(LIB_BIND_DIR) && exists(${LIB_BIND_DIR}/config.h)
-CFLAGS+= -I${LIB_BIND_DIR}
-.endif
-
-.if defined(LIBINTERFACE)
CFLAGS+= -DLIBINTERFACE=${LIBINTERFACE}
SHLIB_MAJOR= ${LIBINTERFACE}
-.endif
-
-.if defined(LIBREVISION)
CFLAGS+= -DLIBREVISION=${LIBREVISION}
SHLIB_MINOR= ${LIBINTERFACE}
-.endif
-
-.if defined(LIBAGE)
CFLAGS+= -DLIBAGE=${LIBAGE}
.endif
-CFLAGS+= -DHAVE_CONFIG_H
-
-# GSSAPI support is incomplete in 9.3.0rc4
+# GSSAPI support is incomplete in 9.3.0
#.if !defined(NO_KERBEROS)
#CFLAGS+= -DGSSAPI
#.endif
+# Enable IPv6 support if available
.if !defined(NOINET6)
CFLAGS+= -DWANT_IPV6
.endif
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc64
+# Enable crypto if available
+.if !defined(NOCRYPT)
+CFLAGS+= -DOPENSSL
+.endif
+
+# Enable MD5 - BIND has its own implementation
+CFLAGS+= -DUSE_MD5
+
+# Endianness
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
CFLAGS+= -DWORDS_BIGENDIAN
.endif
-LOCALSTATEDIR= /var/run
-SYSCONFDIR= /etc
-
+# Default file locations
+LOCALSTATEDIR= /var
+SYSCONFDIR= /etc/namedb
CFLAGS+= -DNS_LOCALSTATEDIR='"${LOCALSTATEDIR}"'
CFLAGS+= -DNS_SYSCONFDIR='"${SYSCONFDIR}"'
CFLAGS+= -DNAMED_CONFFILE='"${SYSCONFDIR}/named.conf"'
CFLAGS+= -DRNDC_CONFFILE='"${SYSCONFDIR}/rndc.conf"'
CFLAGS+= -DRNDC_KEYFILE='"${SYSCONFDIR}/rndc.key"'
+# Add correct include path for config.h
+.if defined(LIB_BIND_DIR) && exists(${LIB_BIND_DIR}/config.h)
+CFLAGS+= -I${LIB_BIND_DIR}
+.endif
+
+# Link against BIND libraries
BIND_DPADD= ${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
- ${LIBISC} ${LIBLWRES} ${LIBCRYPTO} ${LIBPTHREAD}
-BIND_LDADD= -lbind9 -ldns -lisccc -lisccfg -lisc -llwres \
- -lcrypto -lpthread
+ ${LIBISC} ${LIBLWRES}
+BIND_LDADD= -lbind9 -ldns -lisccc -lisccfg -lisc -llwres
+
+# Link against crypto library
+.if !defined(NOCRYPT)
+CRYPTO_DPADD= ${LIBCRYPTO}
+CRYPTO_LDADD= -lcrypto
+.endif
+
+# Link against POSIX threads library
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
+.if defined(NOLIBC_R)
+.error "BIND requires libpthread - define NO_BIND, or undefine NOLIBC_R"
+.endif
+.else
+.if defined(NOLIBPTHREAD)
+.error "BIND requires libpthread - define NO_BIND, or undefine NOLIBPTHREAD"
+.endif
+.endif
+
+PTHREAD_DPADD= ${LIBPTHREAD}
+PTHREAD_LDADD= -lpthread
==== //depot/projects/hammer/lib/bind/dns/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/dns/Makefile,v 1.1 2004/09/21 19:01:43 des Exp $
+# $FreeBSD: src/lib/bind/dns/Makefile,v 1.2 2004/09/22 12:13:55 des Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_DIR= ${.CURDIR}/..
@@ -36,8 +36,8 @@
CFLAGS+= -I${SRCDIR}/sec/dst/include -I${SRCDIR}/include -I${SRCDIR}
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/..
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD= ${CRYPTO_LDADD} ${PTHREAD_LDADD}
DNSINCS= ${SRCDIR}/include/dns/acl.h \
${SRCDIR}/include/dns/adb.h \
==== //depot/projects/hammer/lib/bind/isc/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/isc/Makefile,v 1.1 2004/09/21 19:01:43 des Exp $
+# $FreeBSD: src/lib/bind/isc/Makefile,v 1.2 2004/09/22 12:13:55 des Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_DIR= ${.CURDIR}/..
@@ -37,8 +37,8 @@
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include
CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -I${.CURDIR}/..
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+DPADD= ${PTHREAD_DPADD}
+LDADD= ${PTHREAD_LDADD}
INCS= ${SRCDIR}/include/isc/app.h \
${SRCDIR}/include/isc/assertions.h \
==== //depot/projects/hammer/lib/bind/isccc/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.1 2004/09/21 19:01:43 des Exp $
+# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.2 2004/09/22 12:13:55 des Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_DIR= ${.CURDIR}/..
@@ -15,8 +15,8 @@
CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -I${.CURDIR}/..
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+DPADD= ${PTHREAD_DPADD}
+LDADD= ${PTHREAD_LDADD}
INCS= ${SRCDIR}/include/isccc/alist.h \
${SRCDIR}/include/isccc/base64.h \
==== //depot/projects/hammer/lib/bind/isccfg/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.1 2004/09/21 19:01:44 des Exp $
+# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.2 2004/09/22 12:13:55 des Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_DIR= ${.CURDIR}/..
@@ -13,8 +13,8 @@
CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -I${.CURDIR}/..
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+DPADD= ${PTHREAD_DPADD}
+LDADD= ${PTHREAD_LDADD}
INCS= ${SRCDIR}/include/isccfg/cfg.h \
${SRCDIR}/include/isccfg/grammar.h \
==== //depot/projects/hammer/lib/bind/lwres/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.1 2004/09/21 19:01:44 des Exp $
+# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.2 2004/09/22 12:13:55 des Exp $
BIND_DIR= ${.CURDIR}/../../../contrib/bind9
LIB_BIND_DIR= ${.CURDIR}/..
@@ -18,8 +18,8 @@
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/..
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+DPADD= ${PTHREAD_DPADD}
+LDADD= ${PTHREAD_LDADD}
INCS= ${SRCDIR}/include/lwres/context.h \
${SRCDIR}/include/lwres/int.h \
==== //depot/projects/hammer/lib/csu/arm/crt1.c#3 (text+ko) ====
@@ -96,9 +96,8 @@
" b __start ");
/* ARGSUSED */
void
-__start(int argc, char **argv, char **env,
- const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void),
- struct ps_strings *ps_strings)
+__start(int argc, char **argv, char **env, struct ps_strings *ps_strings,
+ const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void))
{
const char *s;
@@ -118,7 +117,6 @@
atexit(cleanup);
else
_init_tls();
-
#ifdef GCRT
atexit(_mcleanup);
#endif
@@ -136,4 +134,4 @@
__asm__(".previous");
#endif
-__asm__(".ident\t\"$FreeBSD: src/lib/csu/arm/crt1.c,v 1.2 2004/08/15 16:18:51 dfr Exp $\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/arm/crt1.c,v 1.3 2004/09/23 23:00:51 cognet Exp $\"");
==== //depot/projects/hammer/lib/csu/arm/crti.S#2 (text+ko) ====
@@ -1,5 +1,21 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/csu/arm/crti.S,v 1.1 2004/05/14 12:19:04 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/csu/arm/crti.S,v 1.2 2004/09/23 23:00:51 cognet Exp $");
+
+ .section .init,"ax",%progbits
+ .align 4
+ .globl _init
+ .type _init,%function
+_init:
+ mov ip, sp
+ stmdb sp!, {fp, ip, lr, pc}
+ sub fp, ip, #4
+
+ .section .fini,"ax",%progbits
+ .align 4
+ .globl _fini
+ .type _fini,%function
+_fini:
+ mov ip, sp
+ stmdb sp!, {fp, ip, lr, pc}
+ sub fp, ip, #4
-ENTRY(_init)
-ENTRY(_fini)
==== //depot/projects/hammer/lib/csu/arm/crtn.S#2 (text+ko) ====
@@ -1,4 +1,9 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/csu/arm/crtn.S,v 1.1 2004/05/14 12:19:04 cognet Exp $");
-.section init
-.section fini
+__FBSDID("$FreeBSD: src/lib/csu/arm/crtn.S,v 1.2 2004/09/23 23:00:51 cognet Exp $");
+ .section .init,"ax",%progbits
+ ldmea fp, {fp, sp, pc}
+ mov pc, lr
+
+ .section .fini,"ax",%progbits
+ ldmea fp, {fp, sp, pc}
+ mov pc, lr
==== //depot/projects/hammer/lib/libc/arm/gen/Makefile.inc#4 (text+ko) ====
@@ -1,6 +1,6 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.3 2004/07/18 21:23:38 das Exp $
+# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.4 2004/09/23 23:12:57 cognet Exp $
-SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.c \
+SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
infinity.c ldexp.c makecontext.c modf.c \
setjmp.S signalcontext.c sigsetjmp.S divsi3.S
==== //depot/projects/hammer/lib/libc/arm/gen/setjmp.S#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.1 2004/05/14 12:04:30 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.2 2004/09/23 23:13:46 cognet Exp $");
/*
* C library -- setjmp, longjmp
*
@@ -48,16 +48,14 @@
ENTRY(setjmp)
/* Block all signals and retrieve the old signal mask */
stmfd sp!, {r0, r14}
- mov r0, #0x00000000
+ add r2, r0, #4 /* oset */
+ mov r0, #0x00000001 /* SIG_BLOCK */
+ mov r1, #0 /* set */
- bl PIC_SYM(_C_LABEL(sigblock), PLT)
- mov r1, r0
+ bl PIC_SYM(_C_LABEL(sigprocmask), PLT)
ldmfd sp!, {r0, r14}
- /* Store signal mask */
- str r1, [r0, #(25 * 4)]
-
ldr r1, .Lsetjmp_magic
str r1, [r0], #4
@@ -88,14 +86,16 @@
bne botch
/* Fetch signal mask */
- ldr r2, [r0, #(25 * 4)]
+ add r2, r0, #4
/* Set signal mask */
stmfd sp!, {r0, r1, r14}
sub sp, sp, #4 /* align the stack */
- mov r0, r2
- bl PIC_SYM(_C_LABEL(sigsetmask), PLT)
+ mov r1, r2
+ mov r0, #3 /* SIG_SETMASK */
+ mov r2, #0
+ bl PIC_SYM(_C_LABEL(sigprocmask), PLT)
add sp, sp, #4 /* unalign the stack */
ldmfd sp!, {r0, r1, r14}
==== //depot/projects/hammer/lib/libc/arm/string/memcmp.S#2 (text+ko) ====
@@ -64,7 +64,7 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcmp.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcmp.S,v 1.2 2004/09/23 23:10:56 cognet Exp $");
ENTRY(memcmp)
mov ip, r0
@@ -83,8 +83,8 @@
bne .Lmemcmp_bytewise2 /* Badly aligned. Do it the slow way */
/* Word-align the addresses, if necessary */
- and r3, r1, #0x03
- rsbs r3, r3, #0x03
+ sub r3, r1, #0x05
+ ands r3, r3, #0x03
add r3, r3, r3, lsl #1
addne pc, pc, r3, lsl #3
nop
==== //depot/projects/hammer/lib/libc/arm/string/memcpy_xscale.S#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy_xscale.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy_xscale.S,v 1.2 2004/09/23 23:11:32 cognet Exp $");
/* LINTSTUB: Func: void *memcpy(void *dst, const void *src, size_t len) */
ENTRY(memcpy)
@@ -135,7 +135,7 @@
.Lmemcpy_w_lessthan128:
adds r2, r2, #0x80 /* Adjust for extra sub */
ldmeqfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x20
blt .Lmemcpy_w_lessthan32
@@ -160,7 +160,7 @@
.Lmemcpy_w_lessthan32:
adds r2, r2, #0x20 /* Adjust for extra sub */
ldmeqfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
and r4, r2, #0x18
rsbs r4, r4, #0x18
@@ -187,11 +187,11 @@
/* Less than 8 bytes remaining */
ldmfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x04
ldrge ip, [r1], #0x04
strge ip, [r3], #0x04
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
addlt r2, r2, #0x04
ldrb ip, [r1], #0x01
cmp r2, #0x02
@@ -200,7 +200,7 @@
ldrgtb ip, [r1]
strgeb r2, [r3], #0x01
strgtb ip, [r3]
- mov pc, lr
+ bx lr
/*
@@ -254,7 +254,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x04
sublt r1, r1, #0x03
blt .Lmemcpy_bad_done
@@ -315,7 +315,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x04
sublt r1, r1, #0x02
blt .Lmemcpy_bad_done
@@ -376,7 +376,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x04
sublt r1, r1, #0x01
blt .Lmemcpy_bad_done
@@ -401,7 +401,7 @@
.Lmemcpy_bad_done:
ldmfd sp!, {r4-r7}
adds r2, r2, #0x04
- moveq pc, lr
+ bxeq lr
ldrb ip, [r1], #0x01
cmp r2, #0x02
ldrgeb r2, [r1], #0x01
@@ -409,7 +409,7 @@
ldrgtb ip, [r1]
strgeb r2, [r3], #0x01
strgtb ip, [r3]
- mov pc, lr
+ bx lr
/*
@@ -421,7 +421,7 @@
#ifndef _STANDALONE
add pc, pc, r2, lsl #2
nop
- mov pc, lr /* 0x00 */
+ bx lr /* 0x00 */
b .Lmemcpy_bytewise /* 0x01 */
b .Lmemcpy_bytewise /* 0x02 */
b .Lmemcpy_bytewise /* 0x03 */
@@ -442,7 +442,7 @@
strb ip, [r3], #0x01
ldrneb ip, [r1], #0x01
bne 1b
- mov pc, lr
+ bx lr
#ifndef _STANDALONE
/******************************************************************************
@@ -463,7 +463,7 @@
*/
ldr r2, [r1]
str r2, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -479,7 +479,7 @@
orr r3, r3, r2, lsl #24 /* r3 = 3210 */
#endif
str r3, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -494,7 +494,7 @@
#endif
orr r3, r2, r3, lsl #16
str r3, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -510,7 +510,7 @@
orr r3, r3, r2, lsl #8 /* r3 = 3210 */
#endif
str r3, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -529,7 +529,7 @@
strb r1, [r0, #0x03]
#endif
strh r3, [r0, #0x01]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -541,7 +541,7 @@
strb r2, [r0]
strh r3, [r0, #0x01]
strb r1, [r0, #0x03]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -562,7 +562,7 @@
#endif
strh r2, [r0, #0x01]
strb r3, [r0, #0x03]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -574,7 +574,7 @@
strb r2, [r0]
strh r3, [r0, #0x01]
strb r1, [r0, #0x03]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list