CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 12 10:25:05 UTC 2013
Modified Files:
src/sys/rump: listsrcdirs
Log Message:
building ARM rump kernels now requires sys/arch/arm/arm32
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/listsrcdirs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/listsrcdirs
diff -u src/sys/rump/listsrcdirs:1.6 src/sys/rump/listsrcdirs:1.7
--- src/sys/rump/listsrcdirs:1.6 Sun Aug 11 09:10:47 2013
+++ src/sys/rump/listsrcdirs Mon Aug 12 10:25:05 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: listsrcdirs,v 1.6 2013/08/11 09:10:47 pooka Exp $
+# $NetBSD: listsrcdirs,v 1.7 2013/08/12 10:25:05 pooka Exp $
#
#
@@ -41,6 +41,7 @@ if [ ${1} = '-c' ]; then
for x in amd64 i386 x86 arm evbarm sparc sparc64 powerpc evbppc; do
precho src/sys/arch/${x}/ include ${x} Makefile
done
+ echo src/sys/arch/arm/arm32
echo src/sys/arch/Makefile
else
echo src/sys
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 12 10:30:35 UTC 2013
Removed Files:
src/sys/rump: VERSION
Log Message:
This file has been obsoleted by ./buildrump.sh checkout{cvs,git}
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r0 src/sys/rump/VERSION
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/libexec/getty
Module Name:src
Committed By: joerg
Date: Mon Aug 12 13:54:33 UTC 2013
Modified Files:
src/libexec/getty: main.c
Log Message:
Use __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/libexec/getty/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/getty/main.c
diff -u src/libexec/getty/main.c:1.63 src/libexec/getty/main.c:1.64
--- src/libexec/getty/main.c:1.63 Sun Aug 11 09:16:42 2013
+++ src/libexec/getty/main.c Mon Aug 12 13:54:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.63 2013/08/11 09:16:42 martin Exp $ */
+/* $NetBSD: main.c,v 1.64 2013/08/12 13:54:33 joerg Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = from: @(#)main.c 8.1 (Berkeley) 6/20/93;
#else
-__RCSID($NetBSD: main.c,v 1.63 2013/08/11 09:16:42 martin Exp $);
+__RCSID($NetBSD: main.c,v 1.64 2013/08/12 13:54:33 joerg Exp $);
#endif
#endif /* not lint */
@@ -137,7 +137,7 @@ static void clearscreen(void);
sigjmp_buf timeout;
-static void
+__dead static void
/*ARGSUSED*/
dingdong(int signo)
{
@@ -149,7 +149,7 @@ dingdong(int signo)
sigjmp_buf intrupt;
-static void
+__dead static void
/*ARGSUSED*/
interrupt(int signo)
{
@@ -161,7 +161,7 @@ interrupt(int signo)
/*
* Action to take when getty is running too long.
*/
-static void
+__dead static void
/*ARGSUSED*/
timeoverrun(int signo)
{
CVS commit: src/usr.bin
Module Name:src
Committed By: joerg
Date: Mon Aug 12 14:03:18 UTC 2013
Modified Files:
src/usr.bin/audiocfg: main.c
src/usr.bin/checknr: checknr.c
src/usr.bin/rpcgen: rpc_main.c rpc_util.h
Log Message:
Add more __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/audiocfg/main.c
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/checknr/checknr.c
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/rpcgen/rpc_main.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/rpcgen/rpc_util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/audiocfg/main.c
diff -u src/usr.bin/audiocfg/main.c:1.6 src/usr.bin/audiocfg/main.c:1.7
--- src/usr.bin/audiocfg/main.c:1.6 Fri Sep 3 19:20:37 2010
+++ src/usr.bin/audiocfg/main.c Mon Aug 12 14:03:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.6 2010/09/03 19:20:37 jmcneill Exp $ */
+/* $NetBSD: main.c,v 1.7 2013/08/12 14:03:18 joerg Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -37,7 +37,7 @@
#include audiodev.h
#include drvctl.h
-static void
+__dead static void
usage(const char *p)
{
fprintf(stderr, usage: %s list\n, p);
Index: src/usr.bin/checknr/checknr.c
diff -u src/usr.bin/checknr/checknr.c:1.23 src/usr.bin/checknr/checknr.c:1.24
--- src/usr.bin/checknr/checknr.c:1.23 Sun Aug 11 06:45:23 2013
+++ src/usr.bin/checknr/checknr.c Mon Aug 12 14:03:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: checknr.c,v 1.23 2013/08/11 06:45:23 dholland Exp $ */
+/* $NetBSD: checknr.c,v 1.24 2013/08/12 14:03:18 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)checknr.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: checknr.c,v 1.23 2013/08/11 06:45:23 dholland Exp $);
+__RCSID($NetBSD: checknr.c,v 1.24 2013/08/12 14:03:18 joerg Exp $);
#endif
#endif /* not lint */
@@ -210,7 +210,7 @@ static void nomatch(const char *);
static void pe(int);
static void process(FILE *);
static void prop(int);
-static void usage(void);
+static void usage(void) __dead;
int
main(int argc, char **argv)
Index: src/usr.bin/rpcgen/rpc_main.c
diff -u src/usr.bin/rpcgen/rpc_main.c:1.36 src/usr.bin/rpcgen/rpc_main.c:1.37
--- src/usr.bin/rpcgen/rpc_main.c:1.36 Sun Aug 11 08:03:10 2013
+++ src/usr.bin/rpcgen/rpc_main.c Mon Aug 12 14:03:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_main.c,v 1.36 2013/08/11 08:03:10 dholland Exp $ */
+/* $NetBSD: rpc_main.c,v 1.37 2013/08/12 14:03:18 joerg Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI;
#else
-__RCSID($NetBSD: rpc_main.c,v 1.36 2013/08/11 08:03:10 dholland Exp $);
+__RCSID($NetBSD: rpc_main.c,v 1.37 2013/08/12 14:03:18 joerg Exp $);
#endif
#endif
@@ -171,8 +171,8 @@ static void addarg __P((const char *));
static void putarg __P((int, const char *));
static void checkfiles __P((const char *, const char *));
static int parseargs __P((int, char *[], struct commandline *));
-static void usage __P((void));
-static void options_usage __P((void));
+static void usage(void) __dead;
+static void options_usage(void) __dead;
int
main(int argc, char *argv[])
Index: src/usr.bin/rpcgen/rpc_util.h
diff -u src/usr.bin/rpcgen/rpc_util.h:1.6 src/usr.bin/rpcgen/rpc_util.h:1.7
--- src/usr.bin/rpcgen/rpc_util.h:1.6 Sun Aug 11 08:03:10 2013
+++ src/usr.bin/rpcgen/rpc_util.h Mon Aug 12 14:03:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_util.h,v 1.6 2013/08/11 08:03:10 dholland Exp $ */
+/* $NetBSD: rpc_util.h,v 1.7 2013/08/12 14:03:18 joerg Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -113,12 +113,12 @@ int isvectordef __P((const char *, relat
char *locase __P((const char *));
void pvname_svc __P((const char *, const char *));
void pvname __P((const char *, const char *));
-void error __P((const char *));
-void crash __P((void));
+void error(const char *) __dead;
+void crash(void) __dead;
void record_open __P((const char *));
-void expected1 __P((tok_kind));
-void expected2 __P((tok_kind, tok_kind ));
-void expected3 __P((tok_kind, tok_kind, tok_kind));
+void expected1(tok_kind) __dead;
+void expected2(tok_kind, tok_kind) __dead;
+void expected3(tok_kind, tok_kind, tok_kind) __dead;
void tabify __P((FILE *, int));
char *make_argname __P((const char *, const char *));
void add_type __P((int, const char *));
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: riz Date: Mon Aug 12 15:08:13 UTC 2013 Modified Files: src/sys/arch/arm/arm: cpu_in_cksum.S Log Message: Fix up some missed unified syntax. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/cpu_in_cksum.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/cpu_in_cksum.S diff -u src/sys/arch/arm/arm/cpu_in_cksum.S:1.3 src/sys/arch/arm/arm/cpu_in_cksum.S:1.4 --- src/sys/arch/arm/arm/cpu_in_cksum.S:1.3 Sun Aug 11 03:00:05 2013 +++ src/sys/arch/arm/arm/cpu_in_cksum.S Mon Aug 12 15:08:13 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_in_cksum.S,v 1.3 2013/08/11 03:00:05 matt Exp $ */ +/* $NetBSD: cpu_in_cksum.S,v 1.4 2013/08/12 15:08:13 riz Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include machine/asm.h -RCSID($NetBSD: cpu_in_cksum.S,v 1.3 2013/08/11 03:00:05 matt Exp $) +RCSID($NetBSD: cpu_in_cksum.S,v 1.4 2013/08/12 15:08:13 riz Exp $) #include assym.h @@ -226,7 +226,7 @@ ASENTRY_NP(L_cksumdata) adcs r2, r2, r5 adc r2, r2, #0x00 subs r1, r1, #0x40 - ldrged r4, [r0], #0x08 + ldrdge r4, [r0], #0x08 bge .Lcksumdata_bigloop adds r2, r2, r6 /* r6/r7 still need summing */ @@ -275,7 +275,7 @@ ASENTRY_NP(L_cksumdata) cmp r1, #0x20 #ifdef __XSCALE__ - ldrged r4, [r0], #0x08 /* Avoid stalling pld and result */ + ldrdge r4, [r0], #0x08 /* Avoid stalling pld and result */ blt .Lcksumdata_less_than_32 pld [r0, #0x18] ldrd r6, [r0], #0x08
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: yamt
Date: Mon Aug 12 15:40:34 UTC 2013
Modified Files:
src/sys/arch/x86/x86: ipmi.c
Log Message:
fix validness check of sensor value
this change is intended to mirror what ipmitool does.
(their macros for these bits are IS_READING_UNAVAILABLE and
IS_SCANNING_DISABLED.)
see also:
second-gen-interface-spec-v2-rev1-4
Table 35-15, Get Sensor Reading Command
might fix PR/46833 from Francois Tigeot
reviewed by Masanobu SAITOH and Tom Ivar Helbekkmo
tested by Tom Ivar Helbekkmo
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/x86/ipmi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.54 src/sys/arch/x86/x86/ipmi.c:1.55
--- src/sys/arch/x86/x86/ipmi.c:1.54 Tue Mar 19 06:34:28 2013
+++ src/sys/arch/x86/x86/ipmi.c Mon Aug 12 15:40:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.54 2013/03/19 06:34:28 msaitoh Exp $ */
+/* $NetBSD: ipmi.c,v 1.55 2013/08/12 15:40:34 yamt Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipmi.c,v 1.54 2013/03/19 06:34:28 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipmi.c,v 1.55 2013/08/12 15:40:34 yamt Exp $);
#include sys/types.h
#include sys/param.h
@@ -146,7 +146,11 @@ int ipmi_enabled = 0;
#define IPMI_ENTITY_PWRSUPPLY 0x0A
-#define IPMI_INVALID_SENSOR (1L 5)
+#define IPMI_SENSOR_SCANNING_ENABLED (1L 6)
+#define IPMI_SENSOR_UNAVAILABLE (1L 5)
+#define IPMI_INVALID_SENSOR_P(x) \
+ (((x) (IPMI_SENSOR_SCANNING_ENABLED|IPMI_SENSOR_UNAVAILABLE)) \
+ != IPMI_SENSOR_SCANNING_ENABLED)
#define IPMI_SDR_TYPEFULL 1
#define IPMI_SDR_TYPECOMPACT 2
@@ -1716,7 +1720,7 @@ read_sensor(struct ipmi_softc *sc, struc
s1-m, s1-m_tolerance, s1-b, s1-b_accuracy, s1-rbexp, s1-linear);
dbg_printf(10, values=%.2x %.2x %.2x %.2x %s\n,
data[0],data[1],data[2],data[3], edata-desc);
- if (data[1] IPMI_INVALID_SENSOR) {
+ if (IPMI_INVALID_SENSOR_P(data[1])) {
/* Check if sensor is valid */
edata-state = ENVSYS_SINVALID;
} else {
CVS commit: src/sys/arch/acorn26/acorn26
Module Name:src
Committed By: matt
Date: Mon Aug 12 16:02:50 UTC 2013
Modified Files:
src/sys/arch/acorn26/acorn26: bus_asm.S locore.S
Log Message:
Convert to unified syntax
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn26/acorn26/bus_asm.S
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/acorn26/acorn26/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/bus_asm.S
diff -u src/sys/arch/acorn26/acorn26/bus_asm.S:1.5 src/sys/arch/acorn26/acorn26/bus_asm.S:1.6
--- src/sys/arch/acorn26/acorn26/bus_asm.S:1.5 Wed Oct 4 20:14:44 2006
+++ src/sys/arch/acorn26/acorn26/bus_asm.S Mon Aug 12 16:02:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_asm.S,v 1.5 2006/10/04 20:14:44 bjh21 Exp $ */
+/* $NetBSD: bus_asm.S,v 1.6 2013/08/12 16:02:50 matt Exp $ */
/*
* Copyright (c) 2006 Ben Harris
@@ -59,7 +59,7 @@
*/
#include machine/asm.h
-RCSID($NetBSD: bus_asm.S,v 1.5 2006/10/04 20:14:44 bjh21 Exp $)
+RCSID($NetBSD: bus_asm.S,v 1.6 2013/08/12 16:02:50 matt Exp $)
/*
* bus_space I/O functions for podulebus
@@ -109,7 +109,7 @@ ENTRY(iobus_bs_rm_1)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r0]
@@ -128,7 +128,7 @@ ENTRY(iobus_bs_rm_2)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldr r1, [r0]
@@ -153,7 +153,7 @@ ENTRY(iobus_bs_wm_1)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r3], #0x0001
@@ -172,7 +172,7 @@ ENTRY(iobus_bs_wm_2)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r3], #0x0001
@@ -200,7 +200,7 @@ ENTRY(iobus_bs_rr_1)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r12], r0
@@ -249,7 +249,7 @@ ENTRY(iobus_bs_rr_2)
bgt 1b
2: teq r10, #0
- ldmeqdb fp, {r4-r10, fp, sp, pc}
+ ldmdbeq fp, {r4-r10, fp, sp, pc}
/*
* Fast read_region_2 code. This is at its best when dealing with
@@ -272,7 +272,7 @@ ENTRY(iobus_bs_rr_2)
stmia r9!, {r0, r2, r4, r6}
bgt 2b
adds r7, r10, #7
- ldmeqdb fp, {r4-r10, fp, sp, pc}
+ ldmdbeq fp, {r4-r10, fp, sp, pc}
mov r0, #4
mov r10, #0
b 1b
@@ -292,7 +292,7 @@ ENTRY(iobus_bs_wr_1)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r3], #0x0001
@@ -335,7 +335,7 @@ ENTRY(iobus_bs_wr_2)
bgt 1b
2: teq r10, #0
- ldmeqdb fp, {r4-r10, fp, sp, pc}
+ ldmdbeq fp, {r4-r10, fp, sp, pc}
/*
* Fast write_region_2 code. This is at its best when dealing with
@@ -366,7 +366,7 @@ ENTRY(iobus_bs_wr_2)
stmia r8!, {r0-r7}
bgt 2b
adds r7, r10, #7
- ldmeqdb fp, {r4-r10, fp, sp, pc}
+ ldmdbeq fp, {r4-r10, fp, sp, pc}
mov r0, #4
mov r10, #0
b 1b
@@ -384,7 +384,7 @@ ENTRY(iobus_bs_sm_1)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
strb r3, [r0]
@@ -402,7 +402,7 @@ ENTRY(iobus_bs_sm_2)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
orr r3, r3, r3, lsl #16
1:
@@ -427,7 +427,7 @@ ENTRY(iobus_bs_sr_1)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
strb r3, [r12], r0
@@ -447,7 +447,7 @@ ENTRY(iobus_bs_sr_2)
/* Make sure that we have a positive length */
cmp r2, #0x
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
orr r3, r3, r3, lsl #16
1:
Index: src/sys/arch/acorn26/acorn26/locore.S
diff -u src/sys/arch/acorn26/acorn26/locore.S:1.22 src/sys/arch/acorn26/acorn26/locore.S:1.23
--- src/sys/arch/acorn26/acorn26/locore.S:1.22 Thu Dec 10 05:10:00 2009
+++ src/sys/arch/acorn26/acorn26/locore.S Mon Aug 12 16:02:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.22 2009/12/10 05:10:00 rmind Exp $ */
+/* $NetBSD: locore.S,v 1.23 2013/08/12 16:02:50 matt Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 Ben Harris
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -353,7 +353,7 @@ ENTRY_NP(int_off_save)
/* LINTSTUB: Func: void int_restore(int i) */
ENTRY_NP(int_restore)
tst r0, #(R15_IRQ_DISABLE) /* Were IRQs already disabled? */
- biceqs r15, r14, #(R15_IRQ_DISABLE) /* No, enable again */
+ bicseq r15, r14, #(R15_IRQ_DISABLE) /* No, enable again */
movs r15, r14 /* Yes, just return */
/* LINTSTUB: Func: void fiq_off(void) */
ENTRY(fiq_off)
@@ -452,4 +452,4 @@ ENTRY(cpu_Debugger)
ldmfd r13!, {pc}
#endif
-RCSID($NetBSD: locore.S,v 1.22 2009/12/10
CVS commit: src/sys/arch/arm/iomd
Module Name:src Committed By: matt Date: Mon Aug 12 16:07:03 UTC 2013 Modified Files: src/sys/arch/arm/iomd: iomd_fiq.S Log Message: Convert to unified syntax To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/iomd/iomd_fiq.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/iomd/iomd_fiq.S diff -u src/sys/arch/arm/iomd/iomd_fiq.S:1.2 src/sys/arch/arm/iomd/iomd_fiq.S:1.3 --- src/sys/arch/arm/iomd/iomd_fiq.S:1.2 Thu Dec 20 01:20:23 2001 +++ src/sys/arch/arm/iomd/iomd_fiq.S Mon Aug 12 16:07:03 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: iomd_fiq.S,v 1.2 2001/12/20 01:20:23 thorpej Exp $ */ +/* $NetBSD: iomd_fiq.S,v 1.3 2013/08/12 16:07:03 matt Exp $ */ /* * Copyright (c) 1994-1996 Mark Brinicombe. @@ -69,7 +69,7 @@ ENTRY_NP(floppy_read_fiq) ldrb r8, [r12] strb r8, [r11], #0x0001 #ifndef NOFDFIQLOOPS - subeqs pc, lr, #0x0004 + subseq pc, lr, #0x0004 ldrb r8, [r9] tst r8, #0x01 addne r13, r13, #0x0001 @@ -99,7 +99,7 @@ ENTRY_NP(floppy_write_fiq) ldrb r8, [r11], #0x0001 strb r8, [r12] #ifndef NOFDFIQLOOPS - subeqs pc, lr, #0x0004 + subseq pc, lr, #0x0004 ldrb r8, [r9] tst r8, #0x01 addne r13, r13, #0x0001
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Mon Aug 12 16:17:07 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Fix MACHINE_CPU for armeb
To generate a diff of this commit:
cvs rdiff -u -r1.743 -r1.744 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.743 src/share/mk/bsd.own.mk:1.744
--- src/share/mk/bsd.own.mk:1.743 Wed Aug 7 22:09:30 2013
+++ src/share/mk/bsd.own.mk Mon Aug 12 16:17:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.743 2013/08/07 22:09:30 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.744 2013/08/12 16:17:07 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -14,7 +14,7 @@ MAKECONF?= /etc/mk.conf
#
# CPU model, derived from MACHINE_ARCH
#
-MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:S/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/}
+MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/}
#
# Subdirectory used below ${RELEASEDIR} when building a release
CVS commit: src/distrib
Module Name:src
Committed By: joerg
Date: Mon Aug 12 16:31:28 UTC 2013
Modified Files:
src/distrib/arc/ramdisk: Makefile
src/distrib/ews4800mips/floppies/ramdisk: Makefile
src/distrib/sparc/miniroot: Makefile.inc
src/distrib/sun2/miniroot: Makefile
Log Message:
Explicitly build space constrained ramdisk images without unwind tables.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/arc/ramdisk/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/ews4800mips/floppies/ramdisk/Makefile
cvs rdiff -u -r1.19 -r1.20 src/distrib/sparc/miniroot/Makefile.inc
cvs rdiff -u -r1.33 -r1.34 src/distrib/sun2/miniroot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/arc/ramdisk/Makefile
diff -u src/distrib/arc/ramdisk/Makefile:1.22 src/distrib/arc/ramdisk/Makefile:1.23
--- src/distrib/arc/ramdisk/Makefile:1.22 Thu Aug 8 13:21:38 2013
+++ src/distrib/arc/ramdisk/Makefile Mon Aug 12 16:31:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/08/08 13:21:38 he Exp $
+# $NetBSD: Makefile,v 1.23 2013/08/12 16:31:28 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 2660k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmemcpy
+DBG= -Os -mmemcpy -fno-unwind-tables
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d ${DBG}
Index: src/distrib/ews4800mips/floppies/ramdisk/Makefile
diff -u src/distrib/ews4800mips/floppies/ramdisk/Makefile:1.10 src/distrib/ews4800mips/floppies/ramdisk/Makefile:1.11
--- src/distrib/ews4800mips/floppies/ramdisk/Makefile:1.10 Tue May 4 13:33:13 2010
+++ src/distrib/ews4800mips/floppies/ramdisk/Makefile Mon Aug 12 16:31:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/05/04 13:33:13 tsutsui Exp $
+# $NetBSD: Makefile,v 1.11 2013/08/12 16:31:28 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 3m
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmemcpy
+DBG= -Os -mmemcpy -fno-unwind-tables
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d ${DBG}
Index: src/distrib/sparc/miniroot/Makefile.inc
diff -u src/distrib/sparc/miniroot/Makefile.inc:1.19 src/distrib/sparc/miniroot/Makefile.inc:1.20
--- src/distrib/sparc/miniroot/Makefile.inc:1.19 Sat Aug 18 09:33:25 2012
+++ src/distrib/sparc/miniroot/Makefile.inc Mon Aug 12 16:31:28 2013
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.19 2012/08/18 09:33:25 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.20 2013/08/12 16:31:28 joerg Exp $
IMAGESIZE= 8192k
-DBG= -Os
+DBG= -Os -fno-unwind-tables
MAKEFS_FLAGS= -o density=4k
IMAGEENDIAN= be
MAKEDEVTARGETS= all ipty
Index: src/distrib/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.33 src/distrib/sun2/miniroot/Makefile:1.34
--- src/distrib/sun2/miniroot/Makefile:1.33 Thu Feb 11 09:06:50 2010
+++ src/distrib/sun2/miniroot/Makefile Mon Aug 12 16:31:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2010/02/11 09:06:50 roy Exp $
+# $NetBSD: Makefile,v 1.34 2013/08/12 16:31:28 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -12,7 +12,7 @@ MAKEFS_FLAGS= -o density=8k
KERNEL= ${KERNOBJDIR}/INSTALL/netbsd
WARNS= 1
-DBG= -Os
+DBG= -Os -fno-unwind-tables
CRUNCHBIN= instbin
CRUNCHGEN_FLAGS= -d ${DBG}
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src Committed By: joerg Date: Mon Aug 12 16:32:40 UTC 2013 Modified Files: src/sys/arch/x68k/stand/boot: boot.ldscript Log Message: Discard ELF unwind sections for the boot loader. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/boot/boot.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/stand/boot/boot.ldscript diff -u src/sys/arch/x68k/stand/boot/boot.ldscript:1.4 src/sys/arch/x68k/stand/boot/boot.ldscript:1.5 --- src/sys/arch/x68k/stand/boot/boot.ldscript:1.4 Fri May 24 15:59:57 2013 +++ src/sys/arch/x68k/stand/boot/boot.ldscript Mon Aug 12 16:32:39 2013 @@ -62,5 +62,6 @@ SECTIONS *(.debug_ranges) *(.debug_str) *(.debug_frame) + *(.eh_frame) } }
CVS commit: src/sys/arch
Module Name:src
Committed By: joerg
Date: Mon Aug 12 16:34:05 UTC 2013
Modified Files:
src/sys/arch/atari/stand: Makefile.booters
src/sys/arch/ews4800mips/stand: Makefile.bootxx
src/sys/arch/mvme68k/stand: Makefile.booters
src/sys/arch/pmax/stand: Makefile.booters
src/sys/arch/sparc/stand: Makefile.buildboot
src/sys/arch/sun68k/stand: Makefile.inc
src/sys/arch/sun68k/stand/libsa: Makefile
src/sys/arch/x68k/stand: Makefile.inc
src/sys/arch/x68k/stand/boot_ufs: Makefile
src/sys/arch/x68k/stand/loadbsd: Makefile
src/sys/arch/x68k/stand/xxboot: Makefile.xxboot
Log Message:
Build boot loaders without unwind tables.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/atari/stand/Makefile.booters
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/stand/Makefile.bootxx
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mvme68k/stand/Makefile.booters
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/pmax/stand/Makefile.booters
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc/stand/Makefile.buildboot
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sun68k/stand/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sun68k/stand/libsa/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x68k/stand/boot_ufs/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x68k/stand/loadbsd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/stand/Makefile.booters
diff -u src/sys/arch/atari/stand/Makefile.booters:1.3 src/sys/arch/atari/stand/Makefile.booters:1.4
--- src/sys/arch/atari/stand/Makefile.booters:1.3 Sun Dec 18 04:51:12 2011
+++ src/sys/arch/atari/stand/Makefile.booters Mon Aug 12 16:34:05 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.booters,v 1.3 2011/12/18 04:51:12 tsutsui Exp $
+# $NetBSD: Makefile.booters,v 1.4 2013/08/12 16:34:05 joerg Exp $
BINDIR= /usr/mdec/${BTYPE:tl}
DBG=
-COPTS= -Os -fomit-frame-pointer -fno-function-cse -fstrength-reduce
+COPTS= -Os -fomit-frame-pointer -fno-function-cse -fstrength-reduce -fno-unwind-tables
CPPFLAGS+= -D_STANDALONE -DHEAP_VARIABLE
CPPFLAGS+= -D__daddr_t=int32_t
Index: src/sys/arch/ews4800mips/stand/Makefile.bootxx
diff -u src/sys/arch/ews4800mips/stand/Makefile.bootxx:1.5 src/sys/arch/ews4800mips/stand/Makefile.bootxx:1.6
--- src/sys/arch/ews4800mips/stand/Makefile.bootxx:1.5 Thu May 27 06:58:13 2010
+++ src/sys/arch/ews4800mips/stand/Makefile.bootxx Mon Aug 12 16:34:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.5 2010/05/27 06:58:13 dholland Exp $
+# $NetBSD: Makefile.bootxx,v 1.6 2013/08/12 16:34:05 joerg Exp $
NOMAN =
@@ -20,7 +20,7 @@ MIPSFLAGS = -mips1 -G 0 -mno-abicalls
DEBUGFLAGS = -Wall -Werror
DEBUGFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
DEBUGFLAGS += -Wno-format-zero-length -Wno-sign-compare
-OPTFLAGS = -Os -mmemcpy
+OPTFLAGS = -Os -mmemcpy -fno-unwind-tables
FLAGS = ${MIPSFLAGS} ${DEBUGFLAGS} ${OPTFLAGS}
AFLAGS = -xassembler-with-cpp -D_LOCORE ${FLAGS}
CFLAGS = ${FLAGS} -ffreestanding
Index: src/sys/arch/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.22 src/sys/arch/mvme68k/stand/Makefile.booters:1.23
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.22 Sat Jan 22 19:19:20 2011
+++ src/sys/arch/mvme68k/stand/Makefile.booters Mon Aug 12 16:34:05 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.booters,v 1.22 2011/01/22 19:19:20 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.23 2013/08/12 16:34:05 joerg Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
RELOC?= 0x3F
COPTS?= -Os -Wall -Wno-main -Wmissing-prototypes -Wstrict-prototypes \
- -ffreestanding -fomit-frame-pointer
+ -ffreestanding -fomit-frame-pointer -fno-unwind-tables
DEFS?=
STRIPFLAG?=
Index: src/sys/arch/pmax/stand/Makefile.booters
diff -u src/sys/arch/pmax/stand/Makefile.booters:1.57 src/sys/arch/pmax/stand/Makefile.booters:1.58
--- src/sys/arch/pmax/stand/Makefile.booters:1.57 Sun Jul 10 08:42:55 2011
+++ src/sys/arch/pmax/stand/Makefile.booters Mon Aug 12 16:34:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.57 2011/07/10 08:42:55 mrg Exp $
+# $NetBSD: Makefile.booters,v 1.58 2013/08/12 16:34:05 joerg Exp $
NOMAN= # defined
@@ -23,6 +23,7 @@ CPPFLAGS+= -nostdinc -D_STANDALONE -DNO_
-I${.OBJDIR} -I${S}
# compiler flags for smallest code size
CFLAGS= -ffreestanding -Os -g -mmemcpy -mno-abicalls -G 128
+CFLAGS+= -fno-unwind-tables
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
CFLAGS+= -Werror
LDBUG= -T $S/arch/mips/conf/stand.ldscript
Index: src/sys/arch/sparc/stand/Makefile.buildboot
diff -u src/sys/arch/sparc/stand/Makefile.buildboot:1.28 src/sys/arch/sparc/stand/Makefile.buildboot:1.29
---
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon Aug 12 16:39:28 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Only ia64 defaults to USE_COMPILERCRTSTUFF=no now, so simplify
conditional.
To generate a diff of this commit:
cvs rdiff -u -r1.745 -r1.746 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.745 src/share/mk/bsd.own.mk:1.746
--- src/share/mk/bsd.own.mk:1.745 Mon Aug 12 16:38:47 2013
+++ src/share/mk/bsd.own.mk Mon Aug 12 16:39:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.745 2013/08/12 16:38:47 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.746 2013/08/12 16:39:28 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -59,22 +59,11 @@ HAVE_GCC?=45
.endif
-.if \
-${MACHINE_CPU} == alpha || \
-${MACHINE_CPU} == arm || \
-${MACHINE_CPU} == hppa || \
-${MACHINE_ARCH} == i386 || \
-${MACHINE_CPU} == m68k || \
-${MACHINE_CPU} == mips || \
-${MACHINE_ARCH} == powerpc || \
-${MACHINE_CPU} == sh3 || \
-${MACHINE_ARCH} == sparc || \
-${MACHINE_ARCH} == sparc64 || \
-${MACHINE_ARCH} == x86_64 || \
-${MACHINE_ARCH} == vax
+.if ${MACHINE_CPU} == ia64
USE_COMPILERCRTSTUFF?= no
-.endif
+.else
USE_COMPILERCRTSTUFF?= yes
+.endif
HAVE_GDB?= 7
CVS commit: src/share/mk
Module Name:src Committed By: joerg Date: Mon Aug 12 16:38:47 UTC 2013 Modified Files: src/share/mk: bsd.own.mk Log Message: Don't copy .eh_frame section when trying to create a.out binaries. To generate a diff of this commit: cvs rdiff -u -r1.744 -r1.745 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.744 src/share/mk/bsd.own.mk:1.745 --- src/share/mk/bsd.own.mk:1.744 Mon Aug 12 16:17:07 2013 +++ src/share/mk/bsd.own.mk Mon Aug 12 16:38:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.744 2013/08/12 16:17:07 matt Exp $ +# $NetBSD: bsd.own.mk,v 1.745 2013/08/12 16:38:47 joerg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -508,6 +508,7 @@ OBJCOPY_ELF2AOUT_FLAGS?= \ -R .debug_pubnames \ -R .debug_pubtypes \ -R .debug_str \ + -R .eh_frame \ -R .note.netbsd.ident .endif
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon Aug 12 16:51:14 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Do as the last commit message said and not as the change did, only use
GCC's crt code on ia64.
To generate a diff of this commit:
cvs rdiff -u -r1.746 -r1.747 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.746 src/share/mk/bsd.own.mk:1.747
--- src/share/mk/bsd.own.mk:1.746 Mon Aug 12 16:39:28 2013
+++ src/share/mk/bsd.own.mk Mon Aug 12 16:51:14 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.746 2013/08/12 16:39:28 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.747 2013/08/12 16:51:14 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -59,10 +59,10 @@ HAVE_GCC?=45
.endif
-.if ${MACHINE_CPU} == ia64
-USE_COMPILERCRTSTUFF?= no
-.else
+.if ${MACHINE_ARCH} == ia64
USE_COMPILERCRTSTUFF?= yes
+.else
+USE_COMPILERCRTSTUFF?= no
.endif
HAVE_GDB?= 7
CVS commit: src
Module Name:src
Committed By: joerg
Date: Mon Aug 12 17:15:46 UTC 2013
Modified Files:
src/lib/libpthread: Makefile
src/libexec/ld.elf_so: Makefile
Log Message:
Some architectures can't create unwind tables without the frame pointer,
so don't use -fomit-frame-pointer on those.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/lib/libpthread/Makefile
cvs rdiff -u -r1.121 -r1.122 src/libexec/ld.elf_so/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.80 src/lib/libpthread/Makefile:1.81
--- src/lib/libpthread/Makefile:1.80 Thu Mar 21 16:49:11 2013
+++ src/lib/libpthread/Makefile Mon Aug 12 17:15:46 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2013/03/21 16:49:11 christos Exp $
+# $NetBSD: Makefile,v 1.81 2013/08/12 17:15:46 joerg Exp $
#
WARNS?= 5
@@ -75,21 +75,28 @@ SRCS+= pthread_compat.c
ALIGN_FUNCTIONS= ${${ACTIVE_CC} == gcc:? -falign-functions=32 :}
+.if ${MACHINE_ARCH} == m68k || ${MACHINE_ARCH} == m68000 || \
+${MACHINE_CPU} == sh3 || ${MACHINE_ARCH} == vax
+OMIT_FRAME_POINTER=
+.else
+OMIT_FRAME_POINTER= -fomit-frame-pointer
+.endif
+
# The TSD routines are used in the implementation of profiling, and so
# can't be profiled themselves.
-COPTS.pthread_specific.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
+COPTS.pthread_specific.c+= ${OMIT_FRAME_POINTER} ${ALIGN_FUNCTIONS}
pthread_specific.po: pthread_specific.o
${_MKTARGET_CREATE}
cp pthread_specific.o pthread_specific.po
# Internal spinlock routines are performance critical. Don't profile them,
# it's incompatibile with -fomit-frame-pointer.
-COPTS.pthread_lock.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
+COPTS.pthread_lock.c+= ${OMIT_FRAME_POINTER} ${ALIGN_FUNCTIONS}
pthread_lock.po: pthread_lock.o
${_MKTARGET_CREATE}
cp pthread_lock.o pthread_lock.po
-COPTS.pthread_mutex.c+= -fomit-frame-pointer ${ALIGN_FUNCTIONS}
+COPTS.pthread_mutex.c+= ${OMIT_FRAME_POINTER} ${ALIGN_FUNCTIONS}
pthread_mutex.po: pthread_mutex.o
${_MKTARGET_CREATE}
cp pthread_mutex.o pthread_mutex.po
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.121 src/libexec/ld.elf_so/Makefile:1.122
--- src/libexec/ld.elf_so/Makefile:1.121 Thu Jul 18 21:58:13 2013
+++ src/libexec/ld.elf_so/Makefile Mon Aug 12 17:15:46 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2013/07/18 21:58:13 matt Exp $
+# $NetBSD: Makefile,v 1.122 2013/08/12 17:15:46 joerg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -98,7 +98,11 @@ CPPFLAGS+= -DCOMBRELOC
CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libexecinfo
.endif
#DBG= -g
-COPTS+= -O3 -fomit-frame-pointer
+COPTS+= -O3
+
+.if ${MACHINE_ARCH} != m68k ${MACHINE_CPU} != sh3 ${MACHINE_ARCH} != vax
+COPTS+= -fomit-frame-pointer
+.endif
.if ${LDELFSO_MACHINE_ARCH} == i386 || ${LDELFSO_MACHINE_ARCH} == x86_64
COPTS+= -mno-3dnow -mno-mmx -mno-sse -mno-sse2 -mno-sse3
CVS commit: src/sys/arch/shark
Module Name:src Committed By: matt Date: Mon Aug 12 17:32:03 UTC 2013 Modified Files: src/sys/arch/shark/isa: isa_irq.S src/sys/arch/shark/shark: shark_fiq.S Log Message: Update to unified syntax To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/shark/isa/isa_irq.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/shark/shark/shark_fiq.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/shark/isa/isa_irq.S diff -u src/sys/arch/shark/isa/isa_irq.S:1.14 src/sys/arch/shark/isa/isa_irq.S:1.15 --- src/sys/arch/shark/isa/isa_irq.S:1.14 Mon Sep 3 16:35:33 2012 +++ src/sys/arch/shark/isa/isa_irq.S Mon Aug 12 17:32:03 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_irq.S,v 1.14 2012/09/03 16:35:33 matt Exp $ */ +/* $NetBSD: isa_irq.S,v 1.15 2013/08/12 17:32:03 matt Exp $ */ /* * Copyright 1997 @@ -143,7 +143,7 @@ ASENTRY_NP(irq_entry) /* address of 8259 #2 */ tst r2, #(1 IRQ_SLAVE) /* if slave is enabled */ tstne r8, #(1 IRQ_SLAVE) /* anything from slave? */ - ldrneb r1, [r0, #IO_ICU2]/* ocw3 = irr */ + ldrbne r1, [r0, #IO_ICU2]/* ocw3 = irr */ orrne r8, r8, r1, lsl #8 and r8, r8, r2/* clear disabled */ @@ -366,12 +366,12 @@ ENTRY(irq_setmasks) /* see if there's any change for 8259 #1 (master) */ tst r2, #0x00FF /* bottom 8 bits different? */ - strneb r1, [r0, #(IO_ICU1 + 1)] /* icu1 / ocw1 */ + strbne r1, [r0, #(IO_ICU1 + 1)] /* icu1 / ocw1 */ /* anything for 8259 #2? */ tst r2, #0xFF00 mov r1, r1, lsr #8/* next byte */ - strneb r1, [r0, #(IO_ICU2 + 1)] /* icu2 / ocw1 */ + strbne r1, [r0, #(IO_ICU2 + 1)] /* icu2 / ocw1 */ /* Restore old cpsr and exit */ msr cpsr_all, r3 Index: src/sys/arch/shark/shark/shark_fiq.S diff -u src/sys/arch/shark/shark/shark_fiq.S:1.2 src/sys/arch/shark/shark/shark_fiq.S:1.3 --- src/sys/arch/shark/shark/shark_fiq.S:1.2 Tue May 20 04:44:52 2003 +++ src/sys/arch/shark/shark/shark_fiq.S Mon Aug 12 17:32:03 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: shark_fiq.S,v 1.2 2003/05/20 04:44:52 simonb Exp $ */ +/* $NetBSD: shark_fiq.S,v 1.3 2013/08/12 17:32:03 matt Exp $ */ /* * Copyright 1997 @@ -129,7 +129,7 @@ _C_LABEL(shark_fiq): str r11, [r12] cmp r9, #0 - subeqs pc, lr, #4 /* no routine = return from trap */ + subseq pc, lr, #4 /* no routine = return from trap */ /* assume that the C routine follows the ARM procedure call standard. save only user registers and let the C code save the rest.
CVS commit: src/sys/arch/evbarm/integrator
Module Name:src Committed By: matt Date: Mon Aug 12 17:41:51 UTC 2013 Modified Files: src/sys/arch/evbarm/integrator: intmmu.S Log Message: Convert to unified syntax To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/integrator/intmmu.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/integrator/intmmu.S diff -u src/sys/arch/evbarm/integrator/intmmu.S:1.11 src/sys/arch/evbarm/integrator/intmmu.S:1.12 --- src/sys/arch/evbarm/integrator/intmmu.S:1.11 Mon Jan 31 06:28:03 2011 +++ src/sys/arch/evbarm/integrator/intmmu.S Mon Aug 12 17:41:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: intmmu.S,v 1.11 2011/01/31 06:28:03 matt Exp $ */ +/* $NetBSD: intmmu.S,v 1.12 2013/08/12 17:41:51 matt Exp $ */ /* * Copyright (c) 2001 ARM Ltd @@ -182,7 +182,7 @@ Lstart: .long start Lmsg: ldrb r2, [r0], #1 cmp r2, #0 - strneb r2, [r6] + strbne r2, [r6] Lwait: ldrb r3, [r6, #0x18] tst r3, #0x80
CVS commit: src/sys/nfs
Module Name:src
Committed By: hannken
Date: Mon Aug 12 17:46:38 UTC 2013
Modified Files:
src/sys/nfs: nfs_bio.c
Log Message:
Function nfs_vinvalbuf() ignores errors from vinvalbuf() and therefore
delayed write errors may get lost.
Change nfs_vinvalbuf() to keep errors from vinvalbuf() for fsync() or close().
Presented on tech-kern@
Fix for PR kern/47980 (NFS over-quota not detected if utimes() called
before fsync()/close())
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/nfs/nfs_bio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs_bio.c
diff -u src/sys/nfs/nfs_bio.c:1.188 src/sys/nfs/nfs_bio.c:1.189
--- src/sys/nfs/nfs_bio.c:1.188 Tue Sep 27 01:07:38 2011
+++ src/sys/nfs/nfs_bio.c Mon Aug 12 17:46:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.189 2013/08/12 17:46:38 hannken Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.189 2013/08/12 17:46:38 hannken Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -614,7 +614,7 @@ nfs_vinvalbuf(struct vnode *vp, int flag
{
struct nfsnode *np = VTONFS(vp);
struct nfsmount *nmp = VFSTONFS(vp-v_mount);
- int error = 0, slptimeo;
+ int error = 0, allerror = 0, slptimeo;
bool catch;
if ((nmp-nm_flag NFSMNT_INT) == 0)
@@ -647,6 +647,8 @@ nfs_vinvalbuf(struct vnode *vp, int flag
mutex_exit(vp-v_interlock);
error = vinvalbuf(vp, flags, cred, l, catch, 0);
while (error) {
+ if (allerror == 0)
+ allerror = error;
if (intrflg nfs_sigintr(nmp, NULL, l)) {
error = EINTR;
break;
@@ -654,6 +656,13 @@ nfs_vinvalbuf(struct vnode *vp, int flag
error = vinvalbuf(vp, flags, cred, l, 0, slptimeo);
}
mutex_enter(vp-v_interlock);
+ if (allerror != 0) {
+ /*
+ * Keep error from vinvalbuf so fsync/close will know.
+ */
+ np-n_error = allerror;
+ np-n_flag |= NWRITEERR;
+ }
if (error == 0)
np-n_flag = ~NMODIFIED;
np-n_flag = ~NFLUSHINPROG;
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: drochner Date: Mon Aug 12 18:16:19 UTC 2013 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: add feature flag definitions for the last round of Intel instruction set extensions (AVX512 et al.) To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.66 src/sys/arch/x86/include/specialreg.h:1.67 --- src/sys/arch/x86/include/specialreg.h:1.66 Fri Jul 26 05:46:19 2013 +++ src/sys/arch/x86/include/specialreg.h Mon Aug 12 18:16:19 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.66 2013/07/26 05:46:19 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.67 2013/08/12 18:16:19 drochner Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -176,17 +176,26 @@ #define CPUID_SEF_RTM __BIT(11) #define CPUID_SEF_QM __BIT(12) #define CPUID_SEF_FPUCSDS __BIT(13) +#define CPUID_SEF_MPX __BIT(14) +#define CPUID_SEF_AVX512F __BIT(16) #define CPUID_SEF_RDSEED __BIT(18) #define CPUID_SEF_ADX __BIT(19) #define CPUID_SEF_SMAP __BIT(20) +#define CPUID_SEF_PT __BIT(25) +#define CPUID_SEF_AVX512PF __BIT(26) +#define CPUID_SEF_AVX512ER __BIT(27) +#define CPUID_SEF_AVX512CD __BIT(28) +#define CPUID_SEF_SHA __BIT(29) #define CPUID_SEF_FLAGS \20 \ \1 FSGSBASE \2 TSCADJUST \4 BMI1 \ \5 HLE \6 AVX2 \10 SMEP \ \11 BMI2 \12 ERMS \13 INVPCID \14 RTM \ - \15 QM \16 FPUCSDS \ - \23 RDSEED \24 ADX \ - \25 SMAP + \15 QM \16 FPUCSDS \17 MPX \ + \21 AVX512F \23 RDSEED \24 ADX \ + \25 SMAP \ + \32 PT \33 AVX512PF\34 AVX512ER\ + \35 AVX512CD\36 SHA /* Intel Fn8001 extended features - %edx */ #define CPUID_SYSCALL 0x0800 /* SYSCALL/SYSRET */
CVS commit: src/usr.bin/rpcgen
Module Name:src
Committed By: christos
Date: Mon Aug 12 20:36:30 UTC 2013
Modified Files:
src/usr.bin/rpcgen: rpc_cout.c
Log Message:
CID 1062241: simplify free for coverity
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/rpcgen/rpc_cout.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rpcgen/rpc_cout.c
diff -u src/usr.bin/rpcgen/rpc_cout.c:1.31 src/usr.bin/rpcgen/rpc_cout.c:1.32
--- src/usr.bin/rpcgen/rpc_cout.c:1.31 Sun Aug 11 04:03:10 2013
+++ src/usr.bin/rpcgen/rpc_cout.c Mon Aug 12 16:36:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_cout.c,v 1.31 2013/08/11 08:03:10 dholland Exp $ */
+/* $NetBSD: rpc_cout.c,v 1.32 2013/08/12 20:36:30 christos Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = @(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI;
#else
-__RCSID($NetBSD: rpc_cout.c,v 1.31 2013/08/11 08:03:10 dholland Exp $);
+__RCSID($NetBSD: rpc_cout.c,v 1.32 2013/08/12 20:36:30 christos Exp $);
#endif
#endif
@@ -696,8 +696,7 @@ emit_single_in_line(declaration *decl, i
free(freeable);
freed = 1;
upp_case = INT32;
- }
- if (strcmp(upp_case, U_INT) == 0) {
+ } else if (strcmp(upp_case, U_INT) == 0) {
free(freeable);
freed = 1;
upp_case = U_INT32;
CVS commit: src/external/gpl3/gcc/dist/gcc/config/alpha
Module Name:src Committed By: joerg Date: Mon Aug 12 21:04:17 UTC 2013 Modified Files: src/external/gpl3/gcc/dist/gcc/config/alpha: elf.h Log Message: Disable STABS and MIPS SDB extensions. This enables the use of CFI instructions for the DWARF2 emission. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h diff -u src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.2 src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.3 --- src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.2 Sun Sep 25 13:32:17 2011 +++ src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h Mon Aug 12 21:04:17 2013 @@ -25,8 +25,9 @@ along with GCC; see the file COPYING3. /* ??? Move all SDB stuff from alpha.h to osf.h. */ #undef SDB_DEBUGGING_INFO +#undef MIPS_DEBUGGING_INFO +#undef DBX_DEBUGGING_INFO -#define DBX_DEBUGGING_INFO 1 #define DWARF2_DEBUGGING_INFO 1 #undef PREFERRED_DEBUGGING_TYPE
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Mon Aug 12 21:15:56 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: TWINTAIL src/sys/arch/iyonix/conf: GENERIC Log Message: bump SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/TWINTAIL cvs rdiff -u -r1.80 -r1.81 src/sys/arch/iyonix/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/TWINTAIL diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.58 src/sys/arch/evbarm/conf/TWINTAIL:1.59 --- src/sys/arch/evbarm/conf/TWINTAIL:1.58 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbarm/conf/TWINTAIL Mon Aug 12 21:15:56 2013 @@ -1,4 +1,4 @@ -# $NetBSD: TWINTAIL,v 1.58 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: TWINTAIL,v 1.59 2013/08/12 21:15:56 matt Exp $ # # TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel # @@ -133,7 +133,7 @@ options DIAGNOSTIC # internally consist #options DEBUG_KGDB makeoptions DEBUG=-g # compile full symbol table #makeoptions COPTS=-O2 -options SYMTAB_SPACE=62 +options SYMTAB_SPACE=64 #options AUDIO_DEBUG=2 config netbsd root on ? type ? Index: src/sys/arch/iyonix/conf/GENERIC diff -u src/sys/arch/iyonix/conf/GENERIC:1.80 src/sys/arch/iyonix/conf/GENERIC:1.81 --- src/sys/arch/iyonix/conf/GENERIC:1.80 Sun Jun 30 21:38:57 2013 +++ src/sys/arch/iyonix/conf/GENERIC Mon Aug 12 21:15:56 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.80 2013/06/30 21:38:57 rmind Exp $ +# $NetBSD: GENERIC,v 1.81 2013/08/12 21:15:56 matt Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/iyonix/conf/std.iyonix options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.80 $ +#ident GENERIC-$Revision: 1.81 $ maxusers 32 # estimated number of users @@ -86,7 +86,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options KGDB # remote debugger #options KGDB_DEVNAME=\com\,KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=61 +options SYMTAB_SPACE=63 options PERFCTRS # performance counters #options PMAP_DEBUG # Enable pmap_debug_level code #options VERBOSE_INIT_ARM # verbose bootstraping messages
CVS commit: src/sys/arch/evbarm/lubbock
Module Name:src
Committed By: matt
Date: Mon Aug 12 21:17:03 UTC 2013
Modified Files:
src/sys/arch/evbarm/lubbock: sm_obio_space_asm.S
Log Message:
use RET/RETc
use unified syntax
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/lubbock/sm_obio_space_asm.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/lubbock/sm_obio_space_asm.S
diff -u src/sys/arch/evbarm/lubbock/sm_obio_space_asm.S:1.4 src/sys/arch/evbarm/lubbock/sm_obio_space_asm.S:1.5
--- src/sys/arch/evbarm/lubbock/sm_obio_space_asm.S:1.4 Sun Dec 11 12:17:09 2005
+++ src/sys/arch/evbarm/lubbock/sm_obio_space_asm.S Mon Aug 12 21:17:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sm_obio_space_asm.S,v 1.4 2005/12/11 12:17:09 christos Exp $ */
+/* $NetBSD: sm_obio_space_asm.S,v 1.5 2013/08/12 21:17:03 matt Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -36,7 +36,7 @@
#include machine/asm.h
-RCSID($NetBSD: sm_obio_space_asm.S,v 1.4 2005/12/11 12:17:09 christos Exp $)
+RCSID($NetBSD: sm_obio_space_asm.S,v 1.5 2013/08/12 21:17:03 matt Exp $)
/*
* bus_space I/O functions with offset*4, 8-bit access.
@@ -51,7 +51,8 @@ ENTRY(smobio8_bs_r_2)
ldrb r0, [r1], #4
ldrb r2, [r1]
orr r0, r0, r2, LSL #8
- mov pc, lr
+ RET
+END(smobio8_bs_r_2)
/*
* write single
@@ -62,7 +63,8 @@ ENTRY(smobio8_bs_w_2)
strb r3, [r1], #4
mov r3, r3, LSR #8
strb r3, [r1]
- mov pc, lr
+ RET
+END(smobio8_bs_w_2)
/*
* read multiple
@@ -71,9 +73,8 @@ ENTRY(smobio8_bs_rm_2)
add r0, r1, r2, LSL #2
ldr r2, [sp, #0]
cmp r2, #0x
- movle pc, lr
+ RETc(le)
- stmfd sp!, {lr}
Lbs_rm_2_loop:
ldrb r1, [r0]
ldrb lr, [r0, #4]
@@ -82,7 +83,8 @@ Lbs_rm_2_loop:
strh r1, [r3], #0x0002
bgt Lbs_rm_2_loop
- ldmfd sp!, {pc}
+ RET
+END(smobio8_bs_rm_2)
@@ -93,7 +95,7 @@ ENTRY(smobio8_bs_wm_2)
add r0, r1, r2, LSL #2
ldr r2, [sp, #0]
cmp r2, #0x
- movle pc, lr
+ RETc(le)
Lbs_wm_2_loop:
ldrh r1, [r3], #0x0002
@@ -103,7 +105,8 @@ Lbs_wm_2_loop:
strb r1, [r0,#4]
bgt Lbs_wm_2_loop
- mov pc, lr
+ RET
+END(smobio8_bs_wm_2)
/*
@@ -116,15 +119,16 @@ Lbs_wm_2_loop:
ENTRY(smobio16_bs_r_1)
tst r2, #1/* Even/Odd ? */
- ldreqb r0, [r1, r2, LSL #2]
- moveq pc,lr
+ ldrbeq r0, [r1, r2, LSL #2]
+ RETc(eq)
/* Odd byte. read 16bits and get high byte */
bic r2, r2, #1
add r1, r1, r2, LSL #2
ldrh r0, [r1]
mov r0, r0, LSR #8
- mov pc, lr
+ RET
+END(smobio16_bs_r_1)
/*
@@ -133,12 +137,13 @@ ENTRY(smobio16_bs_r_1)
ENTRY(smobio16_bs_w_1)
tst r2, #1/* Even/Odd ? */
- streqb r3, [r1, r2, LSL #2]
- moveq pc,lr
+ strbeq r3, [r1, r2, LSL #2]
+ RETc(eq)
/* Odd byte. write 16bit with low byte is 0. */
bic r2, r2, #1
mov r3, r3, LSL #8
add r1, r1, r2, LSL #2
strh r3, [r1]
- mov pc, lr
+ RET
+END(smobio16_bs_w_1)
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Mon Aug 12 21:18:00 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: IGEPV2 Log Message: Add omapiic To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/IGEPV2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/IGEPV2 diff -u src/sys/arch/evbarm/conf/IGEPV2:1.19 src/sys/arch/evbarm/conf/IGEPV2:1.20 --- src/sys/arch/evbarm/conf/IGEPV2:1.19 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbarm/conf/IGEPV2 Mon Aug 12 21:17:59 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: IGEPV2,v 1.19 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: IGEPV2,v 1.20 2013/08/12 21:17:59 matt Exp $ # # IGEPv2 -- TI OMAP 3530 Eval Board Kernel # @@ -211,14 +211,10 @@ omapgpio5 at obio2 addr 0x49058000 size gpio* at omapgpio? -# # I2C Controller -# omapi2c0 at tipb? addr 0xfffb3800 intr 36 mult 4 -# iic* at omapi2c? -# # omap's own i2c address -# options OMAP_I2C_ADDRESS=0xe -# # i2c bus clock low and high times in ns -# options I2C_LOW_TIME_nSEC=1500 -# options I2C_HIGH_TIME_nSEC=1000 +# I2C Controller +omapiic0 at obio0 addr 0x4807 size 0x1000 intr 56 # I2C1 +omapiic1 at obio0 addr 0x4806 size 0x1000 intr 61 # I2C3 +iic* at omapiic? # On-board 16550 UARTs #com0 at obio0 addr 0x4806a000 intr 72 mult 4 # UART1
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Mon Aug 12 21:19:10 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: files.evbarm Log Message: Always include disksubr_xxx To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/files.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/files.evbarm diff -u src/sys/arch/evbarm/conf/files.evbarm:1.22 src/sys/arch/evbarm/conf/files.evbarm:1.23 --- src/sys/arch/evbarm/conf/files.evbarm:1.22 Thu Sep 23 07:08:57 2010 +++ src/sys/arch/evbarm/conf/files.evbarm Mon Aug 12 21:19:09 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.evbarm,v 1.22 2010/09/23 07:08:57 kiyohara Exp $ +# $NetBSD: files.evbarm,v 1.23 2013/08/12 21:19:09 matt Exp $ # # First try for arm-specific configuration info # @@ -15,9 +15,9 @@ file dev/md_root.cmd memory_disk_h # Generic MD files file arch/evbarm/evbarm/autoconf.c -file arch/arm/arm/disksubr.c disk -file arch/arm/arm/disksubr_acorn.c disk -file arch/arm/arm/disksubr_mbr.c disk +file arch/arm/arm/disksubr.c +file arch/arm/arm/disksubr_acorn.c +file arch/arm/arm/disksubr_mbr.c # ARM FPE file arch/arm32/fpe-arm/armfpe_glue.S armfpe
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: matt
Date: Mon Aug 12 21:20:02 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcmgen_space.c
Log Message:
add mmap
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcmgen_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcmgen_space.c
diff -u src/sys/arch/arm/broadcom/bcmgen_space.c:1.2 src/sys/arch/arm/broadcom/bcmgen_space.c:1.3
--- src/sys/arch/arm/broadcom/bcmgen_space.c:1.2 Wed Jan 9 17:45:13 2013
+++ src/sys/arch/arm/broadcom/bcmgen_space.c Mon Aug 12 21:20:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgen_space.c,v 1.2 2013/01/09 17:45:13 matt Exp $ */
+/* $NetBSD: bcmgen_space.c,v 1.3 2013/08/12 21:20:02 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcmgen_space.c,v 1.2 2013/01/09 17:45:13 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcmgen_space.c,v 1.3 2013/08/12 21:20:02 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -254,6 +254,16 @@ bcmgen_bs_vaddr(void *t, bus_space_handl
return (void *)bsh;
}
+paddr_t
+bcmgen_bs_mmap(void *t, bus_addr_t bpa, off_t offset, int prot, int flags)
+{
+ paddr_t bus_flags = 0;
+
+ if (flags BUS_SPACE_MAP_PREFETCHABLE)
+ bus_flags |= ARM32_MMAP_WRITECOMBINE;
+
+ return (arm_btop(bpa + offset) | bus_flags);
+}
int
bcmgen_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
CVS commit: src
Module Name:src
Committed By: joerg
Date: Mon Aug 12 21:22:18 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/gcc: target-def.h
src/external/gpl3/gcc/dist/gcc/config: netbsd-elf.h
src/gnu/dist/gcc4/gcc: target-def.h
src/gnu/dist/gcc4/gcc/config: netbsd-elf.h
Log Message:
Enable unwind tables by default. Assert the default in target-def.h to
make sure that it sticks.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/target-def.h
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/gnu/dist/gcc4/gcc/target-def.h
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gcc4/gcc/config/netbsd-elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/target-def.h
diff -u src/external/gpl3/gcc/dist/gcc/target-def.h:1.1.1.1 src/external/gpl3/gcc/dist/gcc/target-def.h:1.2
--- src/external/gpl3/gcc/dist/gcc/target-def.h:1.1.1.1 Tue Jun 21 01:20:12 2011
+++ src/external/gpl3/gcc/dist/gcc/target-def.h Mon Aug 12 21:22:18 2013
@@ -706,6 +706,7 @@
}
#ifndef TARGET_UNWIND_TABLES_DEFAULT
+#error Missing unwind_tables_default
#define TARGET_UNWIND_TABLES_DEFAULT false
#endif
Index: src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h:1.4 src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h:1.5
--- src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h:1.4 Sun Aug 12 00:01:50 2012
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h Mon Aug 12 21:22:18 2013
@@ -108,3 +108,6 @@ along with GCC; see the file COPYING3.
%{static:%(link_gcc_c_sequence) -lmudflap}} \
%{fmudflapth: -export-dynamic -lmudflapth -lpthread \
%{static:%(link_gcc_c_sequence) -lmudflapth}}
+
+#undef TARGET_UNWIND_TABLES_DEFAULT
+#define TARGET_UNWIND_TABLES_DEFAULT true
Index: src/gnu/dist/gcc4/gcc/target-def.h
diff -u src/gnu/dist/gcc4/gcc/target-def.h:1.1.1.1 src/gnu/dist/gcc4/gcc/target-def.h:1.2
--- src/gnu/dist/gcc4/gcc/target-def.h:1.1.1.1 Thu Apr 20 09:05:40 2006
+++ src/gnu/dist/gcc4/gcc/target-def.h Mon Aug 12 21:22:18 2013
@@ -473,6 +473,7 @@ Foundation, 51 Franklin Street, Fifth Fl
}
#ifndef TARGET_UNWIND_TABLES_DEFAULT
+#error Missing unwind_tables_default
#define TARGET_UNWIND_TABLES_DEFAULT false
#endif
Index: src/gnu/dist/gcc4/gcc/config/netbsd-elf.h
diff -u src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.2 src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.3
--- src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.2 Fri May 12 00:42:13 2006
+++ src/gnu/dist/gcc4/gcc/config/netbsd-elf.h Mon Aug 12 21:22:18 2013
@@ -93,3 +93,6 @@ Boston, MA 02110-1301, USA. */
%{rdynamic:-export-dynamic} \
%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
%{static:-static}}
+
+#undef TARGET_UNWIND_TABLES_DEFAULT
+#define TARGET_UNWIND_TABLES_DEFAULT true
CVS commit: src/sys/arch/zaurus/stand/zboot
Module Name:src
Committed By: matt
Date: Mon Aug 12 22:50:51 UTC 2013
Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile
Log Message:
Add -fno-unwind-tables
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/stand/zboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.10 src/sys/arch/zaurus/stand/zboot/Makefile:1.11
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.10 Thu May 2 03:56:42 2013
+++ src/sys/arch/zaurus/stand/zboot/Makefile Mon Aug 12 22:50:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/05/02 03:56:42 matt Exp $
+# $NetBSD: Makefile,v 1.11 2013/08/12 22:50:51 matt Exp $
PROG= zboot
@@ -17,6 +17,7 @@ NOMAN= # defined
CFLAGS+= -Wall -Wno-main
CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
CFLAGS+= -fno-stack-protector -fno-builtin -ffreestanding
+CFLAGS+= -fno-unwind-tables
CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S}
CPPFLAGS+= -D_STANDALONE -DHEAP_VARIABLE
CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
CVS commit: src/sys
Module Name:src
Committed By: matt
Date: Mon Aug 12 23:22:12 UTC 2013
Modified Files:
src/sys/lib/libkern/arch/arm: Makefile.inc
Added Files:
src/sys/arch/arm/include: ehabi.h
src/sys/lib/libkern/arch/arm: unwind_stub.c
Log Message:
Add EHABI unwind stubs to libkern so prevent errors in linking if unwind
tables are present.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/include/ehabi.h
cvs rdiff -u -r1.18 -r1.19 src/sys/lib/libkern/arch/arm/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/lib/libkern/arch/arm/unwind_stub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/arch/arm/Makefile.inc
diff -u src/sys/lib/libkern/arch/arm/Makefile.inc:1.18 src/sys/lib/libkern/arch/arm/Makefile.inc:1.19
--- src/sys/lib/libkern/arch/arm/Makefile.inc:1.18 Fri Jun 21 05:06:24 2013
+++ src/sys/lib/libkern/arch/arm/Makefile.inc Mon Aug 12 23:22:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2013/06/21 05:06:24 matt Exp $
+# $NetBSD: Makefile.inc,v 1.19 2013/08/12 23:22:12 matt Exp $
SRCS+= byte_swap_2.S byte_swap_4.S
SRCS+= ffs.S
@@ -8,5 +8,6 @@ SRCS+= modsi3.S umodsi3.S
.if !empty(MACHINE_ARCH:Mearm*)
SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S __aeabi_lcmp.c __aeabi_ulcmp.c
+SRCS+= unwind_stub.c
.else
.endif
Added files:
Index: src/sys/arch/arm/include/ehabi.h
diff -u /dev/null src/sys/arch/arm/include/ehabi.h:1.1
--- /dev/null Mon Aug 12 23:22:12 2013
+++ src/sys/arch/arm/include/ehabi.h Mon Aug 12 23:22:12 2013
@@ -0,0 +1,133 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+/* $NetBSD: ehabi.h,v 1.1 2013/08/12 23:22:12 matt Exp $ */
+
+#ifndef _ARM_EHABI_H_
+#define _ARM_EHABI_H_
+
+#if defined(_KERNEL) || defined(_STANDALONE)
+#include sys/types.h
+#else
+#include inttypes.h
+#endif
+
+typedef enum {
+ _URC_OK = 0, /* operation complete */
+ _URC_FOREIGN_EXCEPTION_CAUGHT = 1,
+ _URC_HANDLER_FOUND = 6,
+ _URC_INSTALL_CONTEXT = 7,
+ _URC_CONTINUE_UNWIND = 8,
+ _URC_FAILURE = 9, /* unspecified failure */
+} _Unwind_Reason_Code;
+
+typedef enum {
+ _UVRSC_CORE = 0, /* integer register */
+ _UVRSC_VFP = 1, /* vfp */
+ _UVRSC_WMMXD = 3, /* Intel WMMX data register */
+ _UVRSC_WMMXC = 4 /* Intel WMMX control register */
+} _Unwind_VRS_RegClass;
+typedef enum {
+ _UVRSD_UINT32 = 0,
+ _UVRSD_VFPX = 1,
+ _UVRSD_UINT64 = 3,
+ _UVRSD_FLOAT = 4,
+ _UVRSD_DOUBLE = 5
+} _Unwind_VRS_DataRepresentation;
+typedef enum {
+ _UVRSR_OK = 0,
+ _UVRSR_NOT_IMPLEMENTED = 1,
+ _UVRSR_FAILED = 2
+} _Unwind_VRS_Result;
+
+typedef uint32_t _Unwind_State;
+static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME = 0;
+static const _Unwind_State _US_UNWIND_FRAME_STARTING = 1;
+static const _Unwind_State _US_UNWIND_FRAME_RESUME = 2;
+
+typedef struct _Unwind_Control_Block _Unwind_Control_Block;
+typedef struct _Unwind_Context _Unwind_Context;
+typedef uint32_t _Unwind_EHT_Header;
+
+struct _Unwind_Control_Block {
+ char exception_class[8];
+ void (*exception_cleanup)(_Unwind_Reason_Code, _Unwind_Control_Block *);
+ /* Unwinder cache, private fields for the unwinder's use */
+ struct {
+ uint32_t reserved1;
+ uint32_t reserved2;
+ uint32_t reserved3;
+ uint32_t reserved4;
+ uint32_t reserved5;
+ /* init reserved1 to 0, then don't touch */
+ } unwinder_cache;
+ /* Propagation barrier cache (valid after phase 1): */
+ struct {
+ uint32_t sp;
+ uint32_t bitpattern[5];
+ }
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Mon Aug 12 23:41:54 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: RPI Log Message: bump symtab space To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/RPI Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/RPI diff -u src/sys/arch/evbarm/conf/RPI:1.39 src/sys/arch/evbarm/conf/RPI:1.40 --- src/sys/arch/evbarm/conf/RPI:1.39 Sun Aug 11 17:18:56 2013 +++ src/sys/arch/evbarm/conf/RPI Mon Aug 12 23:41:54 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: RPI,v 1.39 2013/08/11 17:18:56 riz Exp $ +# $NetBSD: RPI,v 1.40 2013/08/12 23:41:54 matt Exp $ # # RPi -- Raspberry Pi # @@ -139,7 +139,7 @@ options DDB_ONPANIC=1 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB #options KGDB,KGDB_PLCOMUNIT=0,KGDB_DEVRATE=115200,KGDB_CONMODE=0xB00 makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=82 +options SYMTAB_SPACE=83 options PLCONSOLE #options PLCONSOLE,PLCOMCNUNIT=0,PLCONSPEED=115200,PLCONMODE=0xB00
CVS commit: src/sys/lib/libkern/arch/arm
Module Name:src Committed By: matt Date: Mon Aug 12 23:42:14 UTC 2013 Modified Files: src/sys/lib/libkern/arch/arm: unwind_stub.c Log Message: Fix typos (prX not cpX) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libkern/arch/arm/unwind_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/arm/unwind_stub.c diff -u src/sys/lib/libkern/arch/arm/unwind_stub.c:1.1 src/sys/lib/libkern/arch/arm/unwind_stub.c:1.2 --- src/sys/lib/libkern/arch/arm/unwind_stub.c:1.1 Mon Aug 12 23:22:12 2013 +++ src/sys/lib/libkern/arch/arm/unwind_stub.c Mon Aug 12 23:42:14 2013 @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: unwind_stub.c,v 1.1 2013/08/12 23:22:12 matt Exp $); +__KERNEL_RCSID(1, $NetBSD: unwind_stub.c,v 1.2 2013/08/12 23:42:14 matt Exp $); #include arm/ehabi.h @@ -39,6 +39,6 @@ __aeabi_unwind_cpp_stub(_Unwind_State st return _URC_FAILURE; } -__weak_alias(__aeabi_unwind_cpp_cp0, __aeabi_unwind_cpp_stub) -__weak_alias(__aeabi_unwind_cpp_cp1, __aeabi_unwind_cpp_stub) -__weak_alias(__aeabi_unwind_cpp_cp2, __aeabi_unwind_cpp_stub) +__weak_alias(__aeabi_unwind_cpp_pr0, __aeabi_unwind_cpp_stub) +__weak_alias(__aeabi_unwind_cpp_pr1, __aeabi_unwind_cpp_stub) +__weak_alias(__aeabi_unwind_cpp_pr2, __aeabi_unwind_cpp_stub)
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: matt
Date: Tue Aug 13 00:04:08 UTC 2013
Modified Files:
src/sys/arch/arm/arm: disksubr_mbr.c
Log Message:
Ignore PMBR partition if it's partition 0.
Make sure all unused parts of the partition table are zeroed.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm/disksubr_mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/disksubr_mbr.c
diff -u src/sys/arch/arm/arm/disksubr_mbr.c:1.17 src/sys/arch/arm/arm/disksubr_mbr.c:1.18
--- src/sys/arch/arm/arm/disksubr_mbr.c:1.17 Sun Mar 10 04:01:49 2013
+++ src/sys/arch/arm/arm/disksubr_mbr.c Tue Aug 13 00:04:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr_mbr.c,v 1.17 2013/03/10 04:01:49 christos Exp $ */
+/* $NetBSD: disksubr_mbr.c,v 1.18 2013/08/13 00:04:08 matt Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: disksubr_mbr.c,v 1.17 2013/03/10 04:01:49 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: disksubr_mbr.c,v 1.18 2013/08/13 00:04:08 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -146,18 +146,22 @@ mbr_label_read(dev_t dev,
}
}
#endif
- for (i = 0; i MBR_PART_COUNT; i++, mbrp++) {
- if (mbrp-mbrp_type == MBR_PTYPE_UNUSED)
+ pp = lp-d_partitions['e' - 'a'];
+ for (i = 0; i MBR_PART_COUNT; i++, mbrp++, pp++) {
+ if ((i == 0 mbrp-mbrp_type == MBR_PTYPE_PMBR)
+ || mbrp-mbrp_type == MBR_PTYPE_UNUSED) {
+memset(pp, 0, sizeof(*pp));
continue;
+ }
if (le32toh(mbrp-mbrp_start) +
le32toh(mbrp-mbrp_size) lp-d_secperunit) {
/* This mbr doesn't look good */
+memset(pp, 0, sizeof(*pp));
continue;
}
nfound++;
/* Install in partition e, f, g, or h. */
- pp = lp-d_partitions['e' - 'a' + i];
pp-p_offset = le32toh(mbrp-mbrp_start);
pp-p_size = le32toh(mbrp-mbrp_size);
pp-p_fstype = xlat_mbr_fstype(mbrp-mbrp_type);
@@ -181,11 +185,15 @@ mbr_label_read(dev_t dev,
lp-d_secpercyl = lp-d_ntracks * lp-d_nsectors;
#endif
}
+ i += 'e' - 'a';
if (nfound 0) {
- lp-d_npartitions = 'e' - 'a' + i;
+ lp-d_npartitions = i;
strncpy(lp-d_packname, fictitious-MBR,
sizeof lp-d_packname);
}
+ if (lp-d_npartitions MAXPARTITIONS) {
+ memset(pp, 0, (MAXPARTITIONS - i) * sizeof(*pp));
+ }
}
*cylp = cyl;
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Tue Aug 13 00:18:15 UTC 2013 Modified Files: src/sys/arch/arm/include: asm.h Log Message: Add _THUMB_ENTRY and _ARM_ENTRY which do the appropriate things including switching instruction sets. Use __thumb__ to decide which _ENTRY gets defined as To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/asm.h diff -u src/sys/arch/arm/include/asm.h:1.19 src/sys/arch/arm/include/asm.h:1.20 --- src/sys/arch/arm/include/asm.h:1.19 Sun Aug 11 04:39:18 2013 +++ src/sys/arch/arm/include/asm.h Tue Aug 13 00:18:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.19 2013/08/11 04:39:18 matt Exp $ */ +/* $NetBSD: asm.h,v 1.20 2013/08/13 00:18:15 matt Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -41,6 +41,12 @@ .syntax unified +#ifdef __thumb__ +#define THUMB_INSN(n) n +#else +#define THUMB_INSN(n) +#endif + #define __BIT(n) (1 (n)) #define __BITS(hi,lo) ((~((~0)((hi)+1)))((~0)(lo))) @@ -67,12 +73,16 @@ */ #define _ASM_TYPE_FUNCTION %function #define _ASM_TYPE_OBJECT %object +#define _THUMB_ENTRY(x) \ + .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; \ + .thumb_func; .code 16; x: +#define _ARM_ENTRY(x) \ + .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; \ + .code 32; x: #ifdef __thumb__ -#define _ENTRY(x) \ - .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; .thumb_func; x: +#define _ENTRY(x) _THUMB_ENTRY(x) #else -#define _ENTRY(x) \ - .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: +#define _ENTRY(x) _ARM_ENTRY(x) #endif #define _END(x) .size x,.-x
