CVS commit: src/external
Module Name:src Committed By: mrg Date: Sun Jul 3 06:52:27 UTC 2011 Added Files: src/external/gpl3/gcc/lib/crtstuff/arch: armeb.mk m68000.mk sh3eb.mk sh3el.mk src/external/gpl3/gcc/lib/libgcc/arch: armeb.mk m68000.mk sh3eb.mk sh3el.mk src/external/gpl3/gcc/lib/libgcc/libgcov/arch/armeb: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgcc/libgcov/arch/m68000: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sh3eb: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sh3el: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libiberty/arch/armeb: config.h src/external/gpl3/gcc/lib/libiberty/arch/m68000: config.h src/external/gpl3/gcc/lib/libiberty/arch/sh3eb: config.h src/external/gpl3/gcc/lib/libiberty/arch/sh3el: config.h src/external/gpl3/gcc/lib/libobjc/arch/armeb: config.h defs.mk src/external/gpl3/gcc/lib/libobjc/arch/m68000: config.h defs.mk src/external/gpl3/gcc/lib/libobjc/arch/sh3eb: config.h defs.mk src/external/gpl3/gcc/lib/libobjc/arch/sh3el: config.h defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: c++allocator.h c++config.h config.h cxxabi_tweaks.h defs.mk gstdint.h gthr-default.h gthr-posix.h gthr-single.h gthr-tpf.h gthr.h omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: c++allocator.h c++config.h config.h cxxabi_tweaks.h defs.mk gstdint.h gthr-default.h gthr-posix.h gthr-single.h gthr-tpf.h gthr.h omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: c++allocator.h c++config.h config.h cxxabi_tweaks.h defs.mk gstdint.h gthr-default.h gthr-posix.h gthr-single.h gthr-tpf.h gthr.h omp.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: c++allocator.h c++config.h config.h cxxabi_tweaks.h defs.mk gstdint.h gthr-default.h gthr-posix.h gthr-single.h gthr-tpf.h gthr.h omp.h src/external/gpl3/gcc/usr.bin/gcc/arch/armeb: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list multilib.h plugin-version.h tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/m68000: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list multilib.h plugin-version.h tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list multilib.h plugin-version.h tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list multilib.h plugin-version.h sysroot-suffix.h tm.h src/external/gpl3/gcc/usr.bin/libcpp/arch/armeb: config.h src/external/gpl3/gcc/usr.bin/libcpp/arch/m68000: config.h src/external/gpl3/gcc/usr.bin/libcpp/arch/sh3eb: config.h src/external/gpl3/gcc/usr.bin/libcpp/arch/sh3el: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/armeb: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/m68000: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/sh3eb: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/sh3el: config.h src/external/lgpl3/gmp/lib/libgmp/arch/m68000: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h mp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h mp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3el: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h mp.h Log Message: (re-)generate mknative-gcc files for many platforms. (re-)generate the gmp files for many platforms. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/crtstuff/arch/armeb.mk \ src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk \ src/external/gpl3/gcc/lib/crtstuff/arch/sh3eb.mk \ src/external/gpl3/gcc/lib/crtstuff/arch/sh3el.mk cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk \ src/external/gpl3/gcc/lib/libgcc/arch/m68000.mk \ src/external/gpl3/gcc/lib/libgcc/arch/sh3eb.mk \ src/external/gpl3/gcc/lib/libgcc/arch/sh3el.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/armeb/defs.mk \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/armeb/gcov-iov.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/m68000/defs.mk \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/m68000/gcov-iov.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sh3eb/defs.mk \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sh3eb/gcov-iov.h cvs rdiff -u -r0 -r1.1 \ src/external/g
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Jul 3 06:47:13 UTC 2011
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
copy sysroot-suffix.h as well, for sh3.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.58 src/tools/gcc/mknative-gcc:1.59
--- src/tools/gcc/mknative-gcc:1.58 Sat Jul 2 13:25:05 2011
+++ src/tools/gcc/mknative-gcc Sun Jul 3 06:47:12 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.58 2011/07/02 13:25:05 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.59 2011/07/03 06:47:12 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -619,6 +619,11 @@
for f in gtyp-input.list; do
sed -e 's/^.*external\/gpl3\/gcc\/dist/SRCDIR/' < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
done
+
+ # special platforms
+ if [ "${MACHINE_ARCH}" = "sh3el" -o "${MACHINE_ARCH}" = "sh3eb" ]; then
+ write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/sysroot-suffix.h <$_TMPDIR/gcc/sysroot-suffix.h
+ fi
}
# main #
CVS commit: src/tests/libexec/ld.elf_so
Module Name:src
Committed By: mrg
Date: Sun Jul 3 06:46:49 UTC 2011
Modified Files:
src/tests/libexec/ld.elf_so: Makefile
Log Message:
only build the ld.elf_so tests if MKPIC != no.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/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/tests/libexec/ld.elf_so/Makefile
diff -u src/tests/libexec/ld.elf_so/Makefile:1.5 src/tests/libexec/ld.elf_so/Makefile:1.6
--- src/tests/libexec/ld.elf_so/Makefile:1.5 Sat Jun 25 05:45:12 2011
+++ src/tests/libexec/ld.elf_so/Makefile Sun Jul 3 06:46:49 2011
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2011/06/25 05:45:12 nonaka Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/03 06:46:49 mrg Exp $
#
NOMAN= # defined
.include
+.if ${MKPIC} != "no"
+
SUBDIR+= helper_dso1 .WAIT helper_dso2 .WAIT \
helper_symver_dso0 .WAIT helper_symver_dso1 .WAIT \
helper_symver_dso2 .WAIT \
@@ -46,4 +48,6 @@
V2ODIR!= cd ${.CURDIR}/helper_symver_dso2 && ${PRINTOBJDIR}
LDADD.h_dl_symver_v2= -L${V2ODIR} -lh_helper_symver_dso
+.endif
+
.include
CVS commit: src/sys/arch/sh3/include
Module Name:src Committed By: mrg Date: Sun Jul 3 06:45:51 UTC 2011 Modified Files: src/sys/arch/sh3/include: stdarg.h Log Message: add GCC 4.5 support. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sh3/include/stdarg.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/sh3/include/stdarg.h diff -u src/sys/arch/sh3/include/stdarg.h:1.9 src/sys/arch/sh3/include/stdarg.h:1.10 --- src/sys/arch/sh3/include/stdarg.h:1.9 Sun May 21 22:39:04 2006 +++ src/sys/arch/sh3/include/stdarg.h Sun Jul 3 06:45:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stdarg.h,v 1.9 2006/05/21 22:39:04 uwe Exp $ */ +/* $NetBSD: stdarg.h,v 1.10 2011/07/03 06:45:50 mrg Exp $ */ /* * Copyright (c) 1991, 1993 @@ -42,13 +42,18 @@ #ifdef __lint__ #define __builtin_next_arg(t) ((t) ? 0 : 0) #define __builtin_stdarg_start(a, l) ((a) = ((l) ? 0 : 0)) +#define __builtin_va_start(a, l) ((a) = ((l) ? 0 : 0)) #define __builtin_va_arg(a, t) ((t)((a) ? 0 : 0)) #define __builtin_va_end /* nothing */ #define __builtin_va_copy(d, s) ((d) = (s)) #endif #if __GNUC_PREREQ__(2, 96) +#if __GNUC_PREREQ__(4, 5) +#define va_start(ap, last) __builtin_va_start((ap), (last)) +#else #define va_start(ap, last) __builtin_stdarg_start((ap), (last)) +#endif #define va_arg __builtin_va_arg #define va_end __builtin_va_end #define __va_copy(dest, src) __builtin_va_copy((dest), (src))
CVS commit: src/lib/libm/complex
Module Name:src Committed By: mrg Date: Sun Jul 3 06:45:24 UTC 2011 Modified Files: src/lib/libm/complex: catan.c catanf.c ctan.c ctanf.c Log Message: use DBL_MAX and FLT_MAX from instead of hard coding some ieeefp values. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/complex/catan.c \ src/lib/libm/complex/catanf.c src/lib/libm/complex/ctan.c \ src/lib/libm/complex/ctanf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/complex/catan.c diff -u src/lib/libm/complex/catan.c:1.1 src/lib/libm/complex/catan.c:1.2 --- src/lib/libm/complex/catan.c:1.1 Mon Aug 20 16:01:32 2007 +++ src/lib/libm/complex/catan.c Sun Jul 3 06:45:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: catan.c,v 1.1 2007/08/20 16:01:32 drochner Exp $ */ +/* $NetBSD: catan.c,v 1.2 2011/07/03 06:45:24 mrg Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -32,13 +32,14 @@ #include "../src/namespace.h" #include #include +#include #include "cephes_subr.h" #ifdef __weak_alias __weak_alias(catan, _catan) #endif -#define MAXNUM 1.0e308 +#define MAXNUM DBL_MAX double complex catan(double complex z) Index: src/lib/libm/complex/catanf.c diff -u src/lib/libm/complex/catanf.c:1.1 src/lib/libm/complex/catanf.c:1.2 --- src/lib/libm/complex/catanf.c:1.1 Mon Aug 20 16:01:32 2007 +++ src/lib/libm/complex/catanf.c Sun Jul 3 06:45:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: catanf.c,v 1.1 2007/08/20 16:01:32 drochner Exp $ */ +/* $NetBSD: catanf.c,v 1.2 2011/07/03 06:45:24 mrg Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -32,13 +32,14 @@ #include "../src/namespace.h" #include #include +#include #include "cephes_subrf.h" #ifdef __weak_alias __weak_alias(catanf, _catanf) #endif -#define MAXNUMF 1.0e38F +#define MAXNUMF FLT_MAX float complex catanf(float complex z) Index: src/lib/libm/complex/ctan.c diff -u src/lib/libm/complex/ctan.c:1.1 src/lib/libm/complex/ctan.c:1.2 --- src/lib/libm/complex/ctan.c:1.1 Mon Aug 20 16:01:37 2007 +++ src/lib/libm/complex/ctan.c Sun Jul 3 06:45:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ctan.c,v 1.1 2007/08/20 16:01:37 drochner Exp $ */ +/* $NetBSD: ctan.c,v 1.2 2011/07/03 06:45:24 mrg Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -32,9 +32,10 @@ #include "../src/namespace.h" #include #include +#include #include "cephes_subr.h" -#define MAXNUM 1.0e308 +#define MAXNUM DBL_MAX double complex ctan(double complex z) Index: src/lib/libm/complex/ctanf.c diff -u src/lib/libm/complex/ctanf.c:1.1 src/lib/libm/complex/ctanf.c:1.2 --- src/lib/libm/complex/ctanf.c:1.1 Mon Aug 20 16:01:38 2007 +++ src/lib/libm/complex/ctanf.c Sun Jul 3 06:45:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ctanf.c,v 1.1 2007/08/20 16:01:38 drochner Exp $ */ +/* $NetBSD: ctanf.c,v 1.2 2011/07/03 06:45:24 mrg Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -32,9 +32,10 @@ #include "../src/namespace.h" #include #include +#include #include "cephes_subrf.h" -#define MAXNUMF 1.0e38f +#define MAXNUMF FLT_MAX float complex ctanf(float complex z)
CVS commit: src/games/trek
Module Name:src
Committed By: mrg
Date: Sun Jul 3 06:44:02 UTC 2011
Modified Files:
src/games/trek: move.c
Log Message:
use DBL_MIN from instead of a hard coded small value (that
becomes zero for vax fp.)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/games/trek/move.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/trek/move.c
diff -u src/games/trek/move.c:1.10 src/games/trek/move.c:1.11
--- src/games/trek/move.c:1.10 Sun May 24 22:55:03 2009
+++ src/games/trek/move.c Sun Jul 3 06:44:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.10 2009/05/24 22:55:03 dholland Exp $ */
+/* $NetBSD: move.c,v 1.11 2011/07/03 06:44:01 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,12 +34,13 @@
#if 0
static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: move.c,v 1.10 2009/05/24 22:55:03 dholland Exp $");
+__RCSID("$NetBSD: move.c,v 1.11 2011/07/03 06:44:01 mrg Exp $");
#endif
#endif /* not lint */
#include
#include
+#include
#include "trek.h"
/*
@@ -128,7 +129,7 @@
evtime += 0.005;
time = evtime;
} else
- evtime = -1.0e50;
+ evtime = DBL_MIN;
dist = time * speed;
/* move within quadrant */
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch
Module Name:src
Committed By: mrg
Date: Sun Jul 3 06:43:17 UTC 2011
Modified Files:
src/external/lgpl3/gmp/lib/libgmp/arch/arm: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/armeb: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/i386: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/m68k: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/powerpc: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/sparc: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/sparc64: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/vax: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/x86_64: Makefile.inc
Log Message:
clean up the created .s files.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc:1.1 Fri Jul 1 01:51:02 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc Sun Jul 3 06:43:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/01 01:51:02 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/03 06:43:16 mrg Exp $
SRCS+= \
random.c \
@@ -174,7 +174,8 @@
${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET}
-SRCS+= ${_build:R}.s
+SRCS+= ${_build:R}.s
+CLEANFILES+= ${_build:R}.s
.endfor
Index: src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc:1.1 Fri Jul 1 01:51:02 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc Sun Jul 3 06:43:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/01 01:51:02 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/03 06:43:16 mrg Exp $
SRCS+= \
random.c \
@@ -174,7 +174,8 @@
${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET}
-SRCS+= ${_build:R}.s
+SRCS+= ${_build:R}.s
+CLEANFILES+= ${_build:R}.s
.endfor
Index: src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.3
--- src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.2 Fri Jul 1 01:49:18 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc Sun Jul 3 06:43:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/07/01 01:49:18 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2011/07/03 06:43:16 mrg Exp $
SRCS+= \
random.c \
@@ -186,7 +186,8 @@
${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET}
-SRCS+= ${_build:R}.s
+SRCS+= ${_build:R}.s
+CLEANFILES+= ${_build:R}.s
.endfor
Index: src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc:1.1 Sat Jul 2 13:43:05 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc Sun Jul 3 06:43:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/02 13:43:05 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/03 06:43:16 mrg Exp $
SRCS+= \
random.c \
@@ -172,7 +172,8 @@
${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} >
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: mrg
Date: Sun Jul 3 06:42:03 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
gengtype also needs sysroot-suffix.h if present
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/backend/Makefile
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/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.7 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.7 Fri Jul 1 01:29:12 2011
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Sun Jul 3 06:42:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/07/01 01:29:12 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2011/07/03 06:42:03 mrg Exp $
LIBISPRIVATE= yes
@@ -106,6 +106,9 @@
${_MKTARGET_CREATE}
rm -f auto-host.h
ln -s ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/auto-host.h .
+ if [ -f ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/sysroot-suffix.h ]; then \
+ ln -s ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/sysroot-suffix.h ; \
+ fi
./gengtype ${DIST}/gcc gtyp-input.list.tmp
# gengtype is the real need for options.h
gengtype.lo gengtype-lex.lo gengtype-parse.lo: ${HH} gtyp-gen.h config.h options.h
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: mrg Date: Sun Jul 3 06:40:38 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: t-netbsd Log Message: copy across (most) of the LIB1ASMFUNCS from t-arm-elf. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd 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/arm/t-netbsd diff -u src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.2 --- src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.1.1.1 Tue Jun 21 01:22:19 2011 +++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd Sun Jul 3 06:40:38 2011 @@ -23,6 +23,14 @@ LIBGCC2_DEBUG_CFLAGS = -g0 LIB2FUNCS_EXTRA = $(srcdir)/config/floatunsidf.c $(srcdir)/config/floatunsisf.c +# This list is from t-arm-elf, but with some things removed. +LIB1ASMFUNCS += _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \ + _call_via_rX _interwork_call_via_rX \ + _arm_fixunsdfsi \ + _arm_floatdidf _arm_floatdisf _arm_floatundidf _arm_floatundisf \ + _lshrdi3 _ashrdi3 _ashldi3 \ + _clzsi2 _clzdi2 + # Build a shared libgcc library. SHLIB_EXT = .so SHLIB_NAME = @shlib_base_name@.so
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: mrg
Date: Sun Jul 3 06:39:23 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
Log Message:
- for m680[012]0, set cpu_type=m68k
- add fragment for m68010--netbsdelf
- s/*-*-netbsd/*-*-netbsd*/ so that netbsdelf matches
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config.gcc
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.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.4 src/external/gpl3/gcc/dist/gcc/config.gcc:1.5
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.4 Wed Jun 29 08:08:54 2011
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Sun Jul 3 06:39:22 2011
@@ -326,6 +326,10 @@
m32r*-*-*)
cpu_type=m32r
;;
+m680[012]0-*-*)
+ cpu_type=m68k
+ extra_headers=math-68881.h
+ ;;
m68k-*-*)
extra_headers=math-68881.h
;;
@@ -1628,11 +1632,20 @@
esac
extra_parts="crtbegin.o crtend.o"
;;
-m68k*-*-netbsdelf*)
- default_m68k_cpu=68020
- default_cf_cpu=5475
+m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
- tm_defines="${tm_defines} MOTOROLA=1"
+ tm_defines="${tm_defines} MOTOROLA=1 USE_GAS=1"
+ default_cf_cpu=5475
+ case ${target} in
+ m68010*)
+ target_cpu_default="0"
+ tmake_file=m68k/t-m68kelf
+ ;;
+ *)
+ target_cpu_default="MASK_68020|MASK_68881|MASK_BITFIELD"
+ #default_m68k_cpu=68020
+ ;;
+ esac
;;
m68k*-*-openbsd*)
default_m68k_cpu=68020
@@ -2283,7 +2296,7 @@
# SHmedia, 64-bit ABI
tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd sh/t-netbsd-sh5-64"
;;
- *-*-netbsd)
+ *-*-netbsd*)
tmake_file="${tmake_file} sh/t-netbsd"
;;
sh64*-*-linux*)
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Sun Jul 3 06:37:42 UTC 2011 Modified Files: src/distrib/sets/lists/comp: ad.powerpc Log Message: add gcc-4.5/altivec.h To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/comp/ad.powerpc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.powerpc diff -u src/distrib/sets/lists/comp/ad.powerpc:1.51 src/distrib/sets/lists/comp/ad.powerpc:1.52 --- src/distrib/sets/lists/comp/ad.powerpc:1.51 Mon Jun 20 21:45:16 2011 +++ src/distrib/sets/lists/comp/ad.powerpc Sun Jul 3 06:37:42 2011 @@ -1,9 +1,10 @@ -# $NetBSD: ad.powerpc,v 1.51 2011/06/20 21:45:16 matt Exp $ +# $NetBSD: ad.powerpc,v 1.52 2011/07/03 06:37:42 mrg Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/bin/psim comp-debug-bin gdb,gdb=6 ./usr/include/altivec.hcomp-obsolete obsolete ./usr/include/clang-3.0/altivec.h comp-c-include llvm ./usr/include/gcc-4.1/altivec.h comp-c-include gcccmds,gcc=4 +./usr/include/gcc-4.5/altivec.h comp-c-include gcccmds,gcc=45 ./usr/include/powerpccomp-c-include ./usr/include/powerpc/ansi.h comp-c-include ./usr/include/powerpc/aout_machdep.h comp-c-include
CVS commit: src/external/lgpl3/gmp/dist/mpn/powerpc32
Module Name:src Committed By: matt Date: Sun Jul 3 03:30:19 UTC 2011 Modified Files: src/external/lgpl3/gmp/dist/mpn/powerpc32: elf.m4 Log Message: Switch to using the secure-plt method of accessing the global offset table. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/lgpl3/gmp/dist/mpn/powerpc32/elf.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/mpn/powerpc32/elf.m4 diff -u src/external/lgpl3/gmp/dist/mpn/powerpc32/elf.m4:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/powerpc32/elf.m4:1.2 --- src/external/lgpl3/gmp/dist/mpn/powerpc32/elf.m4:1.1.1.1 Mon Jun 20 05:54:40 2011 +++ src/external/lgpl3/gmp/dist/mpn/powerpc32/elf.m4 Sun Jul 3 03:30:19 2011 @@ -41,9 +41,11 @@ m4_assert_numargs(2) `ifdef(`PIC',` mflr r0 - bl _GLOBAL_OFFSET_TABLE_@local-4 - mflr $1 + bl 20,31,1f +1: mflr $1 mtlr r0 + addis $1,$1,_GLOBAL_OFFSET_TABLE_-1b@ha + addi $1,$1,_GLOBAL_OFFSET_TABLE_-1b@l lwz $1, $2@got($1) ',` lis $1, $2@ha
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: matt
Date: Sun Jul 3 02:18:21 UTC 2011
Modified Files:
src/sys/arch/vax/include: db_machdep.h pcb.h proc.h trap.h userret.h
src/sys/arch/vax/vax: compat_13_machdep.c compat_16_machdep.c
core_machdep.c db_machdep.c locore.c machdep.c sig_machdep.c
syscall.c trap.c vm_machdep.c
Log Message:
Cleanup trapframe handling. Instead of keeping a trapframe pointer in the
pcb, put in the mdlwp instead. We had a dummy field so it didn't grow in
size. This also follows the practice that mips and powerpc follow that a
pointer to the user trapframe is in l->l_md.md_utf. Make trapframe members
start with tf_
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/include/db_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/include/pcb.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/include/proc.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/include/trap.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/vax/include/userret.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vax/compat_13_machdep.c \
src/sys/arch/vax/vax/compat_16_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/core_machdep.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/vax/vax/db_machdep.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/vax/vax/locore.c
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/vax/vax/machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/vax/sig_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/syscall.c
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/vax/vax/trap.c
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/vax/vax/vm_machdep.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/vax/include/db_machdep.h
diff -u src/sys/arch/vax/include/db_machdep.h:1.18 src/sys/arch/vax/include/db_machdep.h:1.19
--- src/sys/arch/vax/include/db_machdep.h:1.18 Thu May 26 15:34:14 2011
+++ src/sys/arch/vax/include/db_machdep.h Sun Jul 3 02:18:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.18 2011/05/26 15:34:14 joerg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.19 2011/07/03 02:18:20 matt Exp $ */
/*
* Mach Operating System
@@ -47,17 +47,17 @@
extern db_regs_t ddb_regs; /* register state */
#define DDB_REGS (&ddb_regs)
-#define PC_REGS(regs) (*(db_addr_t *)&(regs)->pc)
+#define PC_REGS(regs) (*(db_addr_t *)&(regs)->tf_pc)
#define BKPT_ADDR(addr) (addr) /* breakpoint address */
#define BKPT_INST 0x03 /* breakpoint instruction */
#define BKPT_SIZE (1) /* size of breakpoint inst */
#define BKPT_SET(inst, addr) (BKPT_INST)
-#define FIXUP_PC_AFTER_BREAK(regs) ((regs)->pc -= BKPT_SIZE)
+#define FIXUP_PC_AFTER_BREAK(regs) ((regs)->tf_pc -= BKPT_SIZE)
-#define db_clear_single_step(regs) ((regs)->psl &= ~PSL_T)
-#define db_set_single_step(regs) ((regs)->psl |= PSL_T)
+#define db_clear_single_step(regs) ((regs)->tf_psl &= ~PSL_T)
+#define db_set_single_step(regs) ((regs)->tf_psl |= PSL_T)
#define IS_BREAKPOINT_TRAP(type, code) ((type) == T_BPTFLT)
#define IS_WATCHPOINT_TRAP(type, code) ((type) == T_TRCTRAP)
Index: src/sys/arch/vax/include/pcb.h
diff -u src/sys/arch/vax/include/pcb.h:1.13 src/sys/arch/vax/include/pcb.h:1.14
--- src/sys/arch/vax/include/pcb.h:1.13 Sat Mar 20 23:31:30 2010
+++ src/sys/arch/vax/include/pcb.h Sun Jul 3 02:18:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.13 2010/03/20 23:31:30 chs Exp $ */
+/* $NetBSD: pcb.h,v 1.14 2011/07/03 02:18:20 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -56,7 +56,6 @@
long P1LR; /* Page 1 Length Register*/
/* Software registers, only used by kernel software */
- void *framep; /* Pointer to syscall frame */
void *pcb_onfault; /* Tells whether fault copy */
paddr_t pcb_paddr; /* physical address of PCB */
struct pmap *pcb_pm; /* owning pmap */
Index: src/sys/arch/vax/include/proc.h
diff -u src/sys/arch/vax/include/proc.h:1.14 src/sys/arch/vax/include/proc.h:1.15
--- src/sys/arch/vax/include/proc.h:1.14 Fri Jan 14 02:06:33 2011
+++ src/sys/arch/vax/include/proc.h Sun Jul 3 02:18:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.14 2011/01/14 02:06:33 rmind Exp $ */
+/* $NetBSD: proc.h,v 1.15 2011/07/03 02:18:20 matt Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@@ -38,7 +38,7 @@
* Machine-dependent lwp struct for vax,
*/
struct mdlwp {
- int md_dummy; /* Must be at least one field */
+ struct trapframe *md_utf; /* pointer to user trapframe */
};
struct trapframe;
Index: src/sys/arch/vax/include/trap.h
diff -u src/sys/arch/vax/include/trap.h:1.23 src/sys/arch/vax/include/trap.h:1.24
--- src/sys/arch/vax/include/trap.h:1.23 Sat Nov 13 02:23:27 2010
+++ src/sys/arch/vax/include/trap.h Sun Jul 3 02:18:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.23 2010/11/13 02:23:27 matt Exp $ */
+/* $NetBSD: trap.h,v 1.24 2011/07/03 02:18:20 matt Exp $ */
/*-
* Copyright (c)
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: mrg
Date: Sun Jul 3 01:01:06 UTC 2011
Modified Files:
src/sys/opencrypto: deflate.c
Log Message:
avoid some uninitialised warning issues GCC 4.5 complains about.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/opencrypto/deflate.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/opencrypto/deflate.c
diff -u src/sys/opencrypto/deflate.c:1.20 src/sys/opencrypto/deflate.c:1.21
--- src/sys/opencrypto/deflate.c:1.20 Wed Mar 9 11:36:43 2011
+++ src/sys/opencrypto/deflate.c Sun Jul 3 01:01:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: deflate.c,v 1.20 2011/03/09 11:36:43 drochner Exp $ */
+/* $NetBSD: deflate.c,v 1.21 2011/07/03 01:01:06 mrg Exp $ */
/* $FreeBSD: src/sys/opencrypto/deflate.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: deflate.c,v 1.20 2011/03/09 11:36:43 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deflate.c,v 1.21 2011/07/03 01:01:06 mrg Exp $");
#include
#include
@@ -234,7 +234,7 @@
int error, i, j;
struct deflate_buf buf[ZBUF];
u_int32_t crc;
- u_int32_t isize, icrc;
+ u_int32_t isize = 0, icrc = 0;
DPRINTF(("gzip_global: decomp %d, size %d\n", decomp, size));
CVS commit: src/sys/lib/libkern/arch/powerpc
Module Name:src
Committed By: mrg
Date: Sat Jul 2 23:36:02 UTC 2011
Modified Files:
src/sys/lib/libkern/arch/powerpc: gprsavrest.S
Log Message:
fix the names of the _END symbols passed to .size; fixes rump issues,
and kernels still work fine, and ofwboot still links.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libkern/arch/powerpc/gprsavrest.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/lib/libkern/arch/powerpc/gprsavrest.S
diff -u src/sys/lib/libkern/arch/powerpc/gprsavrest.S:1.1 src/sys/lib/libkern/arch/powerpc/gprsavrest.S:1.2
--- src/sys/lib/libkern/arch/powerpc/gprsavrest.S:1.1 Sat Jul 2 03:35:03 2011
+++ src/sys/lib/libkern/arch/powerpc/gprsavrest.S Sat Jul 2 23:36:02 2011
@@ -29,13 +29,13 @@
#include
-__RCSID("$NetBSD: gprsavrest.S,v 1.1 2011/07/02 03:35:03 matt Exp $")
+__RCSID("$NetBSD: gprsavrest.S,v 1.2 2011/07/02 23:36:02 mrg Exp $")
#ifndef RESTGPR
#define RESTGPR(n) RESTOREXGPR(_restgpr_,n,_x)
-#define RESTGPR_END(n) RESTOREXGPR_END(_restgpr,n,_x)
+#define RESTGPR_END(n) RESTOREXGPR_END(_restgpr_,n,_x)
#define SAVEGPR(n) SAVEXGPR(_savegpr_,n,)
-#define SAVEGPR_END(n) SAVEXGPR_END(_savegpr,n,)
+#define SAVEGPR_END(n) SAVEXGPR_END(_savegpr_,n,)
#endif
#define RESTOREXGPR(a,n,b) \
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Sat Jul 2 20:21:16 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch powerpc to USE_COMPILERCRTSTUFF=no
To generate a diff of this commit:
cvs rdiff -u -r1.672 -r1.673 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.672 src/share/mk/bsd.own.mk:1.673
--- src/share/mk/bsd.own.mk:1.672 Thu Jun 30 18:09:54 2011
+++ src/share/mk/bsd.own.mk Sat Jul 2 20:21:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.672 2011/06/30 18:09:54 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.673 2011/07/02 20:21:16 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -53,6 +53,7 @@
.if \
${MACHINE_ARCH} == "i386" || \
+${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "x86_64"
USE_COMPILERCRTSTUFF?= no
.endif
CVS commit: src/lib/csu/arch/powerpc
Module Name:src
Committed By: matt
Date: Sat Jul 2 20:16:09 UTC 2011
Modified Files:
src/lib/csu/arch/powerpc: crt0.S
Log Message:
The kernel and ld.elf_so call with a different order for
cleanup, obj, ps_strings so deal with it.
With this change, USE_COMPILERCRTSTUFF=no works.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/csu/arch/powerpc/crt0.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/powerpc/crt0.S
diff -u src/lib/csu/arch/powerpc/crt0.S:1.3 src/lib/csu/arch/powerpc/crt0.S:1.4
--- src/lib/csu/arch/powerpc/crt0.S:1.3 Fri Jul 1 02:59:05 2011
+++ src/lib/csu/arch/powerpc/crt0.S Sat Jul 2 20:16:09 2011
@@ -29,7 +29,7 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $")
+RCSID("$NetBSD: crt0.S,v 1.4 2011/07/02 20:16:09 matt Exp $")
STRONG_ALIAS(_start,__start)
@@ -45,9 +45,9 @@
addis %r13,%r11,_SDA_BASE_-1b@ha
addi %r13,%r13,_SDA_BASE_-1b@l
- mr %r3,%r6
- mr %r4,%r7
- mr %r5,%r8
+ mr %r3,%r7 /* cleanup */
+ mr %r4,%r6 /* obj */
+ mr %r5,%r8 /* ps_strings */
b ___start
END(__start)
CVS commit: src/lib/csu/arch/vax
Module Name:src
Committed By: matt
Date: Sat Jul 2 20:14:10 UTC 2011
Modified Files:
src/lib/csu/arch/vax: crt0.S
Log Message:
Adapt to the new ___start calling convention
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/vax/crt0.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/vax/crt0.S
diff -u src/lib/csu/arch/vax/crt0.S:1.1 src/lib/csu/arch/vax/crt0.S:1.2
--- src/lib/csu/arch/vax/crt0.S:1.1 Sat Aug 7 18:01:34 2010
+++ src/lib/csu/arch/vax/crt0.S Sat Jul 2 20:14:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
+/* $NetBSD: crt0.S,v 1.2 2011/07/02 20:14:10 matt Exp $ */
/*
* Copyright (c) 1999 Matt Thomas
@@ -37,7 +37,7 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
+RCSID("$NetBSD: crt0.S,v 1.2 2011/07/02 20:14:10 matt Exp $")
STRONG_ALIAS(_start,__start)
@@ -46,8 +46,4 @@
pushl %r9 /* ps_strings */
pushl %r8 /* obj */
pushl %r7 /* cleanup */
- movl (%r6),%r0 /* argc */
- pushal 8(%r6)[%r0] /* envp = &argv[argc + 1] */
- pushal 4(%r6) /* argv */
- pushl %r0 /* argc */
- calls $6,___start
+ calls $3,___start
CVS commit: src/sys/arch/xen
Module Name:src
Committed By: jym
Date: Sat Jul 2 19:07:56 UTC 2011
Modified Files:
src/sys/arch/xen/xen: evtchn.c
src/sys/arch/xen/xenbus: xenbus_comms.c
Log Message:
Remove all return error checks for event_set_handler(...). It either
succeeds or end in panic.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/xen/xen/evtchn.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/xenbus/xenbus_comms.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/xen/xen/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.47 src/sys/arch/xen/xen/evtchn.c:1.48
--- src/sys/arch/xen/xen/evtchn.c:1.47 Mon Dec 20 00:25:46 2010
+++ src/sys/arch/xen/xen/evtchn.c Sat Jul 2 19:07:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.c,v 1.47 2010/12/20 00:25:46 matt Exp $ */
+/* $NetBSD: evtchn.c,v 1.48 2011/07/02 19:07:56 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,7 +54,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.47 2010/12/20 00:25:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.48 2011/07/02 19:07:56 jym Exp $");
#include "opt_xen.h"
#include "isa.h"
@@ -420,10 +420,8 @@
printf("pirq_establish: can't malloc handler info\n");
return NULL;
}
- if (event_set_handler(evtch, pirq_interrupt, ih, level, evname) != 0) {
- free(ih, M_DEVBUF);
- return NULL;
- }
+
+ event_set_handler(evtch, pirq_interrupt, ih, level, evname);
ih->pirq = pirq;
ih->evtch = evtch;
ih->func = func;
Index: src/sys/arch/xen/xenbus/xenbus_comms.c
diff -u src/sys/arch/xen/xenbus/xenbus_comms.c:1.12 src/sys/arch/xen/xenbus/xenbus_comms.c:1.13
--- src/sys/arch/xen/xenbus/xenbus_comms.c:1.12 Fri Jan 16 20:16:47 2009
+++ src/sys/arch/xen/xenbus/xenbus_comms.c Sat Jul 2 19:07:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_comms.c,v 1.12 2009/01/16 20:16:47 jym Exp $ */
+/* $NetBSD: xenbus_comms.c,v 1.13 2011/07/02 19:07:56 jym Exp $ */
/**
* xenbus_comms.c
*
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenbus_comms.c,v 1.12 2009/01/16 20:16:47 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_comms.c,v 1.13 2011/07/02 19:07:56 jym Exp $");
#include
#include
@@ -218,17 +218,12 @@
int
xb_init_comms(device_t dev)
{
- int err;
-
if (xenbus_irq)
event_remove_handler(xenbus_irq, wake_waiting, NULL);
- err = event_set_handler(xen_start_info.store_evtchn, wake_waiting,
+ event_set_handler(xen_start_info.store_evtchn, wake_waiting,
NULL, IPL_TTY, "xenbus");
- if (err) {
- aprint_error_dev(dev, "request irq failed %i\n", err);
- return err;
- }
+
xenbus_irq = xen_start_info.store_evtchn;
aprint_verbose_dev(dev, "using event channel %d\n", xenbus_irq);
hypervisor_enable_event(xenbus_irq);
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: kefren
Date: Sat Jul 2 18:17:12 UTC 2011
Modified Files:
src/usr.sbin/ldpd: main.c
Log Message:
return EXIT_SUCCESS and EXIT_FAILURE instead on 0 and -1
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/ldpd/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/usr.sbin/ldpd/main.c
diff -u src/usr.sbin/ldpd/main.c:1.5 src/usr.sbin/ldpd/main.c:1.6
--- src/usr.sbin/ldpd/main.c:1.5 Tue Jun 14 11:28:51 2011
+++ src/usr.sbin/ldpd/main.c Sat Jul 2 18:17:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 2011/06/14 11:28:51 kefren Exp $ */
+/* $NetBSD: main.c,v 1.6 2011/07/02 18:17:12 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
case 'p':
if ((command_port = atoi(optarg)) < 1) {
print_usage(argv[0]);
-return -1;
+return EXIT_FAILURE;
}
break;
case 'W':
@@ -98,26 +98,26 @@
case 'h':
default:
print_usage(argv[0]);
- return -1;
+ return EXIT_FAILURE;
break;
}
if (geteuid()) {
fatalp("You have to run this as ROOT\n");
- return -1;
+ return EXIT_FAILURE;
}
cpf = conf_parsefile(conffile);
if (cpf < 0 && strcmp(conffile, CONFFILE)) {
fatalp("Cannot parse config file: %s\n", conffile);
- return -1;
+ return EXIT_FAILURE;
} else if (cpf > 0) {
fatalp("Cannot parse line %d in config file\n", cpf);
- return -1;
+ return EXIT_FAILURE;
}
if (set_my_ldp_id()) {
fatalp("Cannot set LDP ID\n");
- return -1;
+ return EXIT_FAILURE;
}
if (conf_ldp_id.s_addr != 0)
strlcpy(my_ldp_id, inet_ntoa(conf_ldp_id), INET_ADDRSTRLEN);
@@ -125,30 +125,30 @@
if (mplssockaddr.sa_len == 0) {
fatalp("You need one mpls interface up and an IP "
"address set for it\n");
- return -1;
+ return EXIT_FAILURE;
}
if (mpls_start_ldp() == -1)
- return -1;
+ return EXIT_FAILURE;
if (!strcmp(LDP_ID, "0.0.0.0")) {
fatalp("Cannot set my LDP ID.\nAre you sure you've "
"got a non-loopback INET interface UP ?\n");
- return -1;
+ return EXIT_FAILURE;
}
init_command_sockets();
if ((command_socket = create_command_socket(command_port)) < 1) {
fatalp("Cannot create command socket\n");
- return -1;
+ return EXIT_FAILURE;
}
if (create_hello_socket() < 1) {
fatalp("Cannot create hello socket\n");
- return -1;
+ return EXIT_FAILURE;
}
ls = create_listening_socket();
if (ls < 0) {
fatalp("Cannot create listening socket\n");
- return -1;
+ return EXIT_FAILURE;
}
if (dontfork == 1)
@@ -162,5 +162,5 @@
if (forkres < 0)
perror("fork");
- return 0;
+ return EXIT_SUCCESS;
}
CVS commit: src/sys
Module Name:src
Committed By: bouyer
Date: Sat Jul 2 17:53:51 UTC 2011
Modified Files:
src/sys/kern: init_main.c uipc_socket.c
src/sys/sys: socketvar.h
Log Message:
Fix kern/45093 as discussed on tech-kern@:
http://mail-index.netbsd.org/tech-kern/2011/06/17/msg010734.html
The cause of the problem is that the so_pendfree is processed with
the softnet_lock held at one point, and processing the list
calls sodoloanfree() which may kpause(). As the thread sleeps with
softnet_lock held, it ultimately cause a deadlock (see the PR or tech-kern
thread for details).
Although it should be possible to call sodopendfree() after releasing
the socket lock, it's not so easy to know where he socket lock is held and
where it's not, so we may hit the issue again later.
Add a kernel thread to handle the so_pendfree list, and wake up this
thread when adding mbufs to this list. Get rid of the various sodopendfree()
calls, hopefully fixing definitively the problem.
To generate a diff of this commit:
cvs rdiff -u -r1.432 -r1.433 src/sys/kern/init_main.c
cvs rdiff -u -r1.204 -r1.205 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.125 -r1.126 src/sys/sys/socketvar.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/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.432 src/sys/kern/init_main.c:1.433
--- src/sys/kern/init_main.c:1.432 Sun Jun 12 03:35:56 2011
+++ src/sys/kern/init_main.c Sat Jul 2 17:53:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.432 2011/06/12 03:35:56 rmind Exp $ */
+/* $NetBSD: init_main.c,v 1.433 2011/07/02 17:53:50 bouyer Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.432 2011/06/12 03:35:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.433 2011/07/02 17:53:50 bouyer Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -495,6 +495,10 @@
spldebug_start();
+ /* Initialize sockets thread(s) */
+ soinit1();
+
+
/* Configure the system hardware. This will enable interrupts. */
configure();
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.204 src/sys/kern/uipc_socket.c:1.205
--- src/sys/kern/uipc_socket.c:1.204 Sun Jun 26 16:42:42 2011
+++ src/sys/kern/uipc_socket.c Sat Jul 2 17:53:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.204 2011/06/26 16:42:42 christos Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.205 2011/07/02 17:53:50 bouyer Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.204 2011/06/26 16:42:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.205 2011/07/02 17:53:50 bouyer Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -92,6 +92,7 @@
#include
#include
#include
+#include
#ifdef COMPAT_50
#include
@@ -144,7 +145,7 @@
#endif
static kmutex_t so_pendfree_lock;
-static struct mbuf *so_pendfree;
+static struct mbuf *so_pendfree = NULL;
#ifndef SOMAXKVA
#define SOMAXKVA (16 * 1024 * 1024)
@@ -157,8 +158,9 @@
#define SOCK_LOAN_CHUNK 65536
-static size_t sodopendfree(void);
-static size_t sodopendfreel(void);
+static void sopendfree_thread(void *);
+static kcondvar_t pendfree_thread_cv;
+static lwp_t *sopendfree_lwp;
static void sysctl_kern_somaxkva_setup(void);
static struct sysctllog *socket_sysctllog;
@@ -170,21 +172,6 @@
mutex_enter(&so_pendfree_lock);
while (socurkva + len > somaxkva) {
- size_t freed;
-
- /*
- * try to do pendfree.
- */
-
- freed = sodopendfreel();
-
- /*
- * if some kva was freed, try again.
- */
-
- if (freed)
- continue;
-
SOSEND_COUNTER_INCR(&sosend_kvalimit);
error = cv_wait_sig(&socurkva_cv, &so_pendfree_lock);
if (error) {
@@ -277,56 +264,45 @@
sokvafree(sva, len);
}
-static size_t
-sodopendfree(void)
-{
- size_t rv;
-
- if (__predict_true(so_pendfree == NULL))
- return 0;
-
- mutex_enter(&so_pendfree_lock);
- rv = sodopendfreel();
- mutex_exit(&so_pendfree_lock);
-
- return rv;
-}
-
/*
- * sodopendfreel: free mbufs on "pendfree" list.
+ * sopendfree_thread: free mbufs on "pendfree" list.
* unlock and relock so_pendfree_lock when freeing mbufs.
- *
- * => called with so_pendfree_lock held.
*/
-static size_t
-sodopendfreel(void)
+static void
+sopendfree_thread(void *v)
{
struct mbuf *m, *next;
- size_t rv = 0;
-
- KASSERT(mutex_owned(&so_pendfree_lock));
+ size_t rv;
- while (so_pendfree != NULL) {
- m = so_pendfree;
- so_pendfree = NULL;
- mutex_exit(&so_pendfree_lock);
+ mutex_enter(&so_pendfree_lock);
- for (; m != NULL; m = next) {
- next = m->m_next;
- KASSERT((~m->m_flags & (M_EXT|M_EXT_PAGES)) == 0);
- KASSERT(m->m_ext.ext_refcnt == 0);
+ for (;;) {
+ rv = 0;
+ while (so_pendfree != NULL) {
+ m = so_pendfree;
+ so_pendfr
CVS commit: src
Module Name:src
Committed By: tsutsui
Date: Sat Jul 2 17:37:29 UTC 2011
Modified Files:
src/distrib/cats/instkernel: Makefile
src/distrib/shark/instkernel/instkernel: Makefile
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Sync with src/sys/arch/shark/conf/Makefile.shark.inc rev 1.14:
> also need to strip out GCC 4.5's new .debug_pubtypes section.
> while here, minor cleanup.
XXX: probably we should have something like ${ARM_AOUT_REMOVE_SECTIONS}
XXX: in bsd.own.mk
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/cats/instkernel/Makefile
cvs rdiff -u -r1.21 -r1.22 src/distrib/shark/instkernel/instkernel/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cats/instkernel/Makefile
diff -u src/distrib/cats/instkernel/Makefile:1.19 src/distrib/cats/instkernel/Makefile:1.20
--- src/distrib/cats/instkernel/Makefile:1.19 Mon Oct 4 15:56:53 2010
+++ src/distrib/cats/instkernel/Makefile Sat Jul 2 17:37:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/10/04 15:56:53 tsutsui Exp $
+# $NetBSD: Makefile,v 1.20 2011/07/02 17:37:28 tsutsui Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,12 +12,15 @@
MDSET_NOSTRIP= # defined
+REMOVE_SECTIONS= \
+ -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
+ -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
+ -R .debug_frame -R .debug_loc -R .debug_pubnames \
+ -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
+
MDSET_POST.netbsd-INSTALL.aout= \
${OBJCOPY} -O a.out-arm-netbsd \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames -R .debug_aranges \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .ARM.attributes \
+ ${REMOVE_SECTIONS} \
${.TARGET} ${.TARGET}.tmp ;\
mv ${.TARGET}.tmp ${.TARGET}
Index: src/distrib/shark/instkernel/instkernel/Makefile
diff -u src/distrib/shark/instkernel/instkernel/Makefile:1.21 src/distrib/shark/instkernel/instkernel/Makefile:1.22
--- src/distrib/shark/instkernel/instkernel/Makefile:1.21 Mon Oct 4 13:45:28 2010
+++ src/distrib/shark/instkernel/instkernel/Makefile Sat Jul 2 17:37:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2010/10/04 13:45:28 tsutsui Exp $
+# $NetBSD: Makefile,v 1.22 2011/07/02 17:37:28 tsutsui Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -10,12 +10,16 @@
MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.-= aout create-aout
+
+REMOVE_SECTIONS= \
+ -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
+ -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
+ -R .debug_frame -R .debug_loc -R .debug_pubnames \
+ -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
+
create-aout= \
${OBJCOPY} -O a.out-arm-netbsd \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .ARM.attributes \
+ ${REMOVE_SECTIONS} \
${.TARGET:R} ${.TARGET}
release:: check_RELEASEDIR .WAIT netbsd-INSTALL.aout.gz
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.23 src/sys/arch/cats/conf/Makefile.cats.inc:1.24
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.23 Tue Jul 6 05:59:59 2010
+++ src/sys/arch/cats/conf/Makefile.cats.inc Sat Jul 2 17:37:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.23 2010/07/06 05:59:59 mrg Exp $
+# $NetBSD: Makefile.cats.inc,v 1.24 2011/07/02 17:37:28 tsutsui Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -19,18 +19,18 @@
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) > ldscript
+REMOVE_SECTIONS= \
+ -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
+ -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
+ -R .debug_frame -R .debug_loc -R .debug_pubnames \
+ -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
+
SYSTEM_LD_TAIL_EXTRA+=; \
echo \
"${OBJCOPY} -O a.out-arm-netbsd \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .ARM.attributes \
+ ${REMOVE_SECTIONS} \
$@ $@.aout"; \
${OBJCOPY} -O a.out-arm-netbsd \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .ARM.attributes \
+ ${REMOVE_SECTIONS} \
$@ $@.aout
.endif
CVS commit: src/sys/arch/shark/conf
Module Name:src
Committed By: tsutsui
Date: Sat Jul 2 17:33:10 UTC 2011
Modified Files:
src/sys/arch/shark/conf: Makefile.shark.inc
Log Message:
Remove an extra backslash.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/shark/conf/Makefile.shark.inc
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/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.14 src/sys/arch/shark/conf/Makefile.shark.inc:1.15
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.14 Sat Jul 2 14:17:40 2011
+++ src/sys/arch/shark/conf/Makefile.shark.inc Sat Jul 2 17:33:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.shark.inc,v 1.14 2011/07/02 14:17:40 mrg Exp $
+# $NetBSD: Makefile.shark.inc,v 1.15 2011/07/02 17:33:10 tsutsui Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -19,7 +19,7 @@
-R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
-R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
-R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes \
+ -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
SYSTEM_LD_TAIL_EXTRA+=; \
echo \
CVS commit: src/external/gpl3/gcc/lib/libiberty/arch/m68k
Module Name:src Committed By: mrg Date: Sat Jul 2 14:28:14 UTC 2011 Added Files: src/external/gpl3/gcc/lib/libiberty/arch/m68k: config.h Log Message: mknative-gcc output for vax and m68k. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libiberty/arch/m68k/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/gpl3/gcc/lib/libiberty/arch/m68k/config.h diff -u /dev/null src/external/gpl3/gcc/lib/libiberty/arch/m68k/config.h:1.1 --- /dev/null Sat Jul 2 14:28:14 2011 +++ src/external/gpl3/gcc/lib/libiberty/arch/m68k/config.h Sat Jul 2 14:28:14 2011 @@ -0,0 +1,480 @@ +/* This file is automatically generated. DO NOT EDIT! */ +/* Generated from: NetBSD: mknative-gcc,v 1.57 2011/07/01 02:11:14 mrg Exp */ +/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ + +/* config.h. Generated from config.in by configure. */ +/* config.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. + This function is required for alloca.c support on those systems. */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if you have the `asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* Define to 1 if you have the `atexit' function. */ +#define HAVE_ATEXIT 1 + +/* Define to 1 if you have the `basename' function. */ +#define HAVE_BASENAME 1 + +/* Define to 1 if you have the `bcmp' function. */ +#define HAVE_BCMP 1 + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the `bsearch' function. */ +#define HAVE_BSEARCH 1 + +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* Define to 1 if you have the `calloc' function. */ +#define HAVE_CALLOC 1 + +/* Define to 1 if you have the `canonicalize_file_name' function. */ +/* #undef HAVE_CANONICALIZE_FILE_NAME */ + +/* Define to 1 if you have the `clock' function. */ +#define HAVE_CLOCK 1 + +/* Define to 1 if you have the declaration of `asprintf', and to 0 if you + don't. */ +#define HAVE_DECL_ASPRINTF 1 + +/* Define to 1 if you have the declaration of `basename', and to 0 if you + don't. */ +#define HAVE_DECL_BASENAME 0 + +/* Define to 1 if you have the declaration of `calloc', and to 0 if you don't. + */ +#define HAVE_DECL_CALLOC 1 + +/* Define to 1 if you have the declaration of `ffs', and to 0 if you don't. */ +#define HAVE_DECL_FFS 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 + +/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't. + */ +#define HAVE_DECL_GETOPT 1 + +/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't. + */ +#define HAVE_DECL_MALLOC 1 + +/* Define to 1 if you have the declaration of `realloc', and to 0 if you + don't. */ +#define HAVE_DECL_REALLOC 1 + +/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't. + */ +#define HAVE_DECL_SBRK 1 + +/* Define to 1 if you have the declaration of `snprintf', and to 0 if you + don't. */ +#define HAVE_DECL_SNPRINTF 1 + +/* Define to 1 if you have the declaration of `strverscmp', and to 0 if you + don't. */ +#define HAVE_DECL_STRVERSCMP 0 + +/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you + don't. */ +#define HAVE_DECL_VASPRINTF 1 + +/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you + don't. */ +#define HAVE_DECL_VSNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `ffs' function. */ +#define HAVE_FFS 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `getsysinfo' function. */ +/* #undef HAVE_GETSYSINFO */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `index' function. */ +#define HAVE_INDEX 1 + +/* Define to 1 if you have the `insque' function. */ +#define HAVE_INSQUE 1 + +/* Define to 1 if the system has the type `intptr_t'. */ +#define HAVE_INTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MACHINE_HAL_SYSINFO_H */ + +/* Define to 1 if you have the header f
CVS commit: src/sys/arch/shark/conf
Module Name:src
Committed By: mrg
Date: Sat Jul 2 14:17:40 UTC 2011
Modified Files:
src/sys/arch/shark/conf: Makefile.shark.inc
Log Message:
also need to strip out GCC 4.5's new .debug_pubtypes section.
while here, minor cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/shark/conf/Makefile.shark.inc
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/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.13 src/sys/arch/shark/conf/Makefile.shark.inc:1.14
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.13 Tue Jul 6 06:00:00 2010
+++ src/sys/arch/shark/conf/Makefile.shark.inc Sat Jul 2 14:17:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.shark.inc,v 1.13 2010/07/06 06:00:00 mrg Exp $
+# $NetBSD: Makefile.shark.inc,v 1.14 2011/07/02 14:17:40 mrg Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -15,19 +15,19 @@
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) > ldscript
+REMOVE_SECTIONS= \
+ -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
+ -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
+ -R .debug_frame -R .debug_loc -R .debug_pubnames \
+ -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes \
+
SYSTEM_LD_TAIL_EXTRA+=; \
echo \
"${OBJCOPY} -O a.out-arm-netbsd \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .ARM.attributes \
+ ${REMOVE_SECTIONS} \
$@ $@.aout"; \
${OBJCOPY} -O a.out-arm-netbsd \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .ARM.attributes \
+ ${REMOVE_SECTIONS} \
$@ $@.aout
KERNIMAGES= netbsd netbsd.aout
CVS commit: src/external/lgpl3/mpfr/lib/libmpfr
Module Name:src
Committed By: mrg
Date: Sat Jul 2 14:08:45 UTC 2011
Modified Files:
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
make this build on vax.
XXX: need to check this for platforms besides x86 and sparc64 to see
XXX: if HAVE_LDOUBLE_IEEE_EXT_LITTLE or friends should be defined.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/lgpl3/mpfr/lib/libmpfr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.3 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.4
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.3 Fri Jul 1 01:30:16 2011
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Sat Jul 2 14:08:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/01 01:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/02 14:08:45 mrg Exp $
.include
@@ -470,6 +470,7 @@
-DHAVE_CEIL=1 \
-DHAVE_ATTRIBUTE_MODE=1
+# XXX XXX do something more, more ports!!
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_EXT_LITTLE=1
.endif
@@ -488,3 +489,7 @@
${SRCS}: mparam.h
.PATH: ${.CURDIR}/../../dist
+
+.if ${MACHINE_ARCH} == "vax"
+COPTS.set_ld.c+= -Wno-error
+.endif
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Sat Jul 2 14:06:42 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/cpp: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
Log Message:
add driver-rs6000.c and the remaining powerpc mknative-gcc files. the
ppc native gcc now links but doesn't run yet properly.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/frontend/Makefile
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/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.2 Wed Jun 29 02:17:17 2011
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Sat Jul 2 14:06:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/29 02:17:17 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/02 14:06:42 mrg Exp $
# For ../Makefile.inc and bsd.own.mk
.include
@@ -11,6 +11,10 @@
SRCS+= driver-i386.c
.PATH: ${DIST}/gcc/config/i386
.endif
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+SRCS+= driver-rs6000.c
+.PATH: ${DIST}/gcc/config/rs6000
+.endif
CPPFLAGS+= -I${BACKENDOBJ}
CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\"
Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.3 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.3 Wed Jun 29 02:16:52 2011
+++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Sat Jul 2 14:06:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/29 02:16:52 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/02 14:06:42 mrg Exp $
LIBISPRIVATE= yes
@@ -14,6 +14,10 @@
SRCS+= driver-i386.c
.PATH: ${DIST}/gcc/config/i386
.endif
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+SRCS+= driver-rs6000.c
+.PATH: ${DIST}/gcc/config/rs6000
+.endif
CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} -I. \
${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Sat Jul 2 14:05:03 UTC 2011 Modified Files: src/external/lgpl3/gmp/dist: gmp-h.in Log Message: provide one of the ugly proto-prototypes for mpn_udiv_w_sdiv(). To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/lgpl3/gmp/dist/gmp-h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/gmp-h.in diff -u src/external/lgpl3/gmp/dist/gmp-h.in:1.1.1.1 src/external/lgpl3/gmp/dist/gmp-h.in:1.2 --- src/external/lgpl3/gmp/dist/gmp-h.in:1.1.1.1 Mon Jun 20 05:54:33 2011 +++ src/external/lgpl3/gmp/dist/gmp-h.in Sat Jul 2 14:05:03 2011 @@ -1661,6 +1661,10 @@ #define mpn_zero __MPN(zero) __GMP_DECLSPEC void mpn_zero __GMP_PROTO ((mp_ptr, mp_size_t)); +#define mpn_udiv_w_sdiv __MPN(udiv_w_sdiv) +__GMP_DECLSPEC mp_limb_t mpn_udiv_w_sdiv __GMP_PROTO ((mp_limb_t *, mp_limb_t, mp_limb_t, mp_limb_t)); + + / mpz inlines / /* The following are provided as inlines where possible, but always exist as
CVS commit: src/external/lgpl3/gmp/lib/libgmp
Module Name:src
Committed By: mrg
Date: Sat Jul 2 14:04:30 UTC 2011
Modified Files:
src/external/lgpl3/gmp/lib/libgmp: Makefile
Log Message:
remove a stale XXX comment.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.5 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.6
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.5 Fri Jul 1 01:30:16 2011
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Sat Jul 2 14:04:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/01 01:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/02 14:04:30 mrg Exp $
.include
@@ -124,7 +124,6 @@
# Build the files that may have multiple identical base names under
# different names.
-# XXX ${MPBSD_SRCS:C/^/mpbsd /}
.for _dir _srcfile in \
${MPF_SRCS:C/^/mpf /} \
${MPZ_SRCS:C/^/mpz /} \
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/vax
Module Name:src Committed By: mrg Date: Sat Jul 2 14:04:14 UTC 2011 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/vax: Makefile.inc config.m4 Log Message: make this mostly appear to work by using the C versions for now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc \ src/external/lgpl3/gmp/lib/libgmp/arch/vax/config.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc diff -u src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc:1.1 Sat Jul 2 13:36:57 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc Sat Jul 2 14:04:14 2011 @@ -1,145 +1,168 @@ -# $NetBSD: Makefile.inc,v 1.1 2011/07/02 13:36:57 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.2 2011/07/02 14:04:14 mrg Exp $ + +SRCS+= \ + random.c \ + divrem_2.c \ + toom_interpolate_7pts.c \ + sbpi1_divappr_q.c \ + random2.c \ + mu_bdiv_q.c \ + toom32_mul.c \ + toom44_mul.c \ + toom8h_mul.c \ + toom2_sqr.c \ + zero.c \ + mod_1_4.c \ + gcdext.c \ + binvert.c \ + mu_div_q.c \ + invertappr.c \ + dump.c \ + mu_divappr_q.c \ + dcpi1_div_qr.c \ + redc_1_sec.c \ + toom6_sqr.c \ + divrem_1.c \ + mod_1.c \ + divexact.c \ + powlo.c \ + mul.c \ + set_str.c \ + toom42_mul.c \ + toom_interpolate_6pts.c \ + dcpi1_divappr_q.c \ + copyd.c \ + toom_eval_dgr3_pm2.c \ + mod_1_3.c \ + com.c \ + copyi.c \ + toom_couple_handling.c \ + add.c \ + toom_interpolate_12pts.c \ + perfsqr.c \ + toom53_mul.c \ + toom_eval_pm2exp.c \ + mu_div_qr.c \ + toom_interpolate_16pts.c \ + mod_34lsub1.c \ + bdiv_q.c \ + toom22_mul.c \ + toom4_sqr.c \ + div_q.c \ + jacbase.c \ + gcdext_subdiv_step.c \ + mullo_n.c \ + toom33_mul.c \ + toom_eval_dgr3_pm1.c \ + mod_1_2.c \ + sub_1.c \ + trialdiv.c \ + add_1.c \ + sqr_basecase.c \ + toom_interpolate_5pts.c \ + sbpi1_bdiv_q.c \ + pre_mod_1.c \ + hgcd.c \ + bdiv_dbm1c.c \ + sqrtrem.c \ + bdiv_q_1.c \ + gcdext_1.c \ + toom63_mul.c \ + mul_basecase.c \ + toom8_sqr.c \ + neg.c \ + udiv_w_sdiv.c \ + gcdext_lehmer.c \ + divis.c \ + dcpi1_div_q.c \ + subcnd_n.c \ + toom_eval_pm2.c \ + hgcd2.c \ + toom62_mul.c \ + sbpi1_bdiv_qr.c \ + scan1.c \ + pre_divrem_1.c \ + perfpow.c \ + get_str.c \ + mullo_basecase.c \ + mulmod_bnm1.c \ + tdiv_qr.c \ + toom43_mul.c \ + mod_1_1.c \ + matrix22_mul.c \ + powm_sec.c \ + divrem.c \ + gcd_1.c \ + dcpi1_bdiv_qr.c \ + mul_n.c \ + redc_2.c \ + toom6h_mul.c \ + mul_fft.c \ + sqrmod_bnm1.c \ + powm.c \ + rootrem.c \ + mode1o.c \ + toom_interpolate_8pts.c \ + remove.c \ + lshiftc.c \ + dive_1.c \ + cmp.c \ + toom_eval_pm1.c \ + scan0.c \ + gcd_subdiv_step.c \ + sbpi1_div_qr.c \ + invert.c \ + sub.c \ + toom_eval_pm2rexp.c \ + dcpi1_bdiv_q.c \ + redc_1.c \ + sqr.c \ + nussbaumer_mul.c \ + mu_bdiv_qr.c \ + pow_1.c \ + gcd_lehmer.c \ + get_d.c \ + toom52_mul.c \ + sbpi1_div_q.c \ + diveby3.c \ + fib2_ui.c \ + bdiv_qr.c \ + toom3_sqr.c \ + gcd.c \ + redc_n.c \ C_SRCS_LIST= \ - toom6h_mul.c mpn/generic/toom6h_mul.c \ - toom3_sqr.c mpn/generic/toom3_sqr.c \ - copyi.c mpn/generic/copyi.c \ - sqrtrem.c mpn/generic/sqrtrem.c \ - iorn_n.c mpn/generic/logops_n.c \ - bdiv_qr.c mpn/generic/bdiv_qr.c \ - matrix22_mul.c mpn/generic/matrix22_mul.c \ - powlo.c mpn/generic/powlo.c \ - tdiv_qr.c mpn/generic/tdiv_qr.c \ - gcd_1.c mpn/generic/gcd_1.c \ - sqrmod_bnm1.c mpn/generic/sqrmod_bnm1.c \ - zero.c mpn/generic/zero.c \ - cmp.c mpn/generic/cmp.c \ - toom_couple_handling.c mpn/generic/toom_couple_handling.c \ - toom32_mul.c mpn/generic/toom32_mul.c \ - dump.c mpn/generic/dump.c \ - toom62_mul.c mpn/generic/toom62_mul.c \ - dive_1.c mpn/generic/dive_1.c \ - toom44_mul.c mpn/generic/toom44_mul.c \ - nand_n.c mpn/generic/logops_n.c \ - hgcd.c mpn/generic/hgcd.c \ - ior_n.c mpn/generic/logops_n.c \ - get_d.c mpn/generic/get_d.c \ - bdiv_dbm1c.c mpn/generic/bdiv_dbm1c.c \ - nussbaumer_mul.c mpn/generic/nussbaumer_mul.c \ - pre_divrem_1.c mpn/generic/pre_divrem_1.c \ - andn_n.c mpn/generic/logops_n.c \ - dcpi1_div_q.c mpn/generic/dcpi1_div_q.c \ - sbpi1_div_qr.c mpn/generic/sbpi1_div_qr.c \ - dcpi1_bdiv_qr.c mpn/generic/dcpi1_bdiv_qr.c \ - bdiv_q_1.c mpn/generic/bdiv_q_1.c \ - gcdext_1.c mpn/generic/gcdext_1.c \ - copyd.c mpn/generic/copyd.c \ - toom42_mul.c mpn/generic/toom42_mul.c \ - xnor_n.c mpn/generic/logops_n.c \ - dcpi1_div_qr.c mpn/generic/dcpi1_div_qr.c \ - sqr_basecase.c mpn/generic/sqr_basecase.c \ - toom_interpolate_7pts.c mpn/generic/toom_interpolate_7pts.c \ - toom63_mul.c mpn/generic/toom63_mul.c \ - gcdext.c mpn/generic/gcdext.c \ - mu_divappr_q.c mpn/generic/mu_divappr_q.c \ - mul_n.c mpn/generic/mul_n.c \ - gcd_subdiv_step.c mpn/generic/gcd_subdiv_step.c \ - udiv_w_sdiv.c mpn/generic/udiv_w_sdiv.c
CVS commit: src/external/lgpl3/gmp
Module Name:src
Committed By: mrg
Date: Sat Jul 2 14:03:21 UTC 2011
Modified Files:
src/external/lgpl3/gmp: build-gmp-Makefile.inc.awk
Log Message:
also match .s and .S files for asm sources.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/gmp/build-gmp-Makefile.inc.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/gmp/build-gmp-Makefile.inc.awk
diff -u src/external/lgpl3/gmp/build-gmp-Makefile.inc.awk:1.2 src/external/lgpl3/gmp/build-gmp-Makefile.inc.awk:1.3
--- src/external/lgpl3/gmp/build-gmp-Makefile.inc.awk:1.2 Wed Jun 29 05:18:32 2011
+++ src/external/lgpl3/gmp/build-gmp-Makefile.inc.awk Sat Jul 2 14:03:20 2011
@@ -16,7 +16,7 @@
} else {
c_src_list[$5] = $3
}
- } else if (match($3, /\.asm$/)) {
+ } else if (match($3, /\.(asm|s|S)$/)) {
asm_list[$5] = $3
}
}
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Sat Jul 2 13:26:39 UTC 2011 Modified Files: src/external/lgpl3/gmp/dist: Makefile.in Log Message: split two sub-make targets into two separate make calls. avoids an annoying -jN install problem. idea from dh. thanks! To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/lgpl3/gmp/dist/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/Makefile.in diff -u src/external/lgpl3/gmp/dist/Makefile.in:1.1.1.1 src/external/lgpl3/gmp/dist/Makefile.in:1.2 --- src/external/lgpl3/gmp/dist/Makefile.in:1.1.1.1 Mon Jun 20 05:54:31 2011 +++ src/external/lgpl3/gmp/dist/Makefile.in Sat Jul 2 13:26:39 2011 @@ -1242,7 +1242,8 @@ uninstall: uninstall-recursive install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + @$(MAKE) $(AM_MAKEFLAGS) install-data-am installcheck: installcheck-recursive install-strip:
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sat Jul 2 13:25:05 UTC 2011
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
also pull out LIB2ADD_ST for libgcc.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.57 src/tools/gcc/mknative-gcc:1.58
--- src/tools/gcc/mknative-gcc:1.57 Fri Jul 1 02:11:14 2011
+++ src/tools/gcc/mknative-gcc Sat Jul 2 13:25:05 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.57 2011/07/01 02:11:14 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.58 2011/07/02 13:25:05 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -378,7 +378,7 @@
# the future.
{
getvars gcc/Makefile \
- INCLUDES LIB2ADD LIB2ADDEH \
+ INCLUDES LIB2ADD LIB2ADDEH LIB2ADD_ST \
LIB1ASMFUNCS LIB1ASMSRC \
LIB2_DIVMOD_FUNCS LIB2FUNCS_ST \
LIB2FUNCS_EXTRA \
CVS commit: src/sys/dev/sbus
Module Name:src Committed By: mrg Date: Sat Jul 2 13:21:30 UTC 2011 Modified Files: src/sys/dev/sbus: spif.c Log Message: avoid some uninitialised variable warnings from GCC 4.5. i'm pretty sure they can't happen in practise, but i can see why GCC isn't sure. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/sbus/spif.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/dev/sbus/spif.c diff -u src/sys/dev/sbus/spif.c:1.26 src/sys/dev/sbus/spif.c:1.27 --- src/sys/dev/sbus/spif.c:1.26 Sun Apr 24 16:27:01 2011 +++ src/sys/dev/sbus/spif.c Sat Jul 2 13:21:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: spif.c,v 1.26 2011/04/24 16:27:01 rmind Exp $ */ +/* $NetBSD: spif.c,v 1.27 2011/07/02 13:21:30 mrg Exp $ */ /* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */ /* @@ -41,7 +41,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.26 2011/04/24 16:27:01 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.27 2011/07/02 13:21:30 mrg Exp $"); #include "spif.h" #if NSPIF > 0 @@ -539,7 +539,7 @@ SPIF_CARD(tp->t_dev)); struct stty_port *sp = &st->sc_port[SPIF_PORT(tp->t_dev)]; struct spif_softc *sc = sp->sp_sc; - uint8_t rbprl, rbprh, tbprl, tbprh; + uint8_t rbprl = 0, rbprh = 0, tbprl = 0, tbprh = 0; int s, opt; if (t->c_ospeed &&
CVS commit: src/external/gpl3/gcc/dist/gcc/config/m68k
Module Name:src Committed By: mrg Date: Sat Jul 2 13:18:39 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc/config/m68k: netbsd-elf.h Log Message: TARGET_VERSION is used in collect2.c now. avoid referencing the m68k_cpu_flags variable and simply print "(NetBSD/m68k/68010 ELF)". To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/m68k/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/config/m68k/netbsd-elf.h diff -u src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.2 --- src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.1.1.1 Tue Jun 21 01:22:28 2011 +++ src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h Sat Jul 2 13:18:39 2011 @@ -52,11 +52,16 @@ #undef TARGET_VERSION +#if 0 #define TARGET_VERSION \ fprintf (stderr, \ TARGET_68010 \ ? " (NetBSD/68010 ELF)" \ : " (NetBSD/m68k ELF)"); +#else +#define TARGET_VERSION \ + fprintf (stderr," (NetBSD/m68k/68010 ELF)"); +#endif /* Provide a CPP_SPEC appropriate for NetBSD m68k targets. Currently we
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: mrg
Date: Sat Jul 2 13:14:47 UTC 2011
Modified Files:
src/sys/dev/isa: gus.c
Log Message:
fix sequence point errors. diff explains best:
- sc->sc_playbuf = ++sc->sc_playbuf % sc->sc_nbufs;
+ sc->sc_playbuf = (sc->sc_playbuf + 1) % sc->sc_nbufs;
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/isa/gus.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/dev/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.105 src/sys/dev/isa/gus.c:1.106
--- src/sys/dev/isa/gus.c:1.105 Tue May 12 09:10:15 2009
+++ src/sys/dev/isa/gus.c Sat Jul 2 13:14:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.105 2009/05/12 09:10:15 cegger Exp $ */
+/* $NetBSD: gus.c,v 1.106 2011/07/02 13:14:46 mrg Exp $ */
/*-
* Copyright (c) 1996, 1999 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.105 2009/05/12 09:10:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.106 2011/07/02 13:14:46 mrg Exp $");
#include "gus.h"
#if NGUS > 0
@@ -1648,7 +1648,7 @@
* flip to the next DMA buffer
*/
- sc->sc_dmabuf = ++sc->sc_dmabuf % sc->sc_nbufs;
+ sc->sc_dmabuf = (sc->sc_dmabuf + 1) % sc->sc_nbufs;
/*
* See comments below about DMA admission control strategy.
* We can call the upper level here if we have an
@@ -1744,7 +1744,7 @@
device_xname(&sc->sc_dev), sc->sc_bufcnt);
gus_falsestops++;
- sc->sc_playbuf = ++sc->sc_playbuf % sc->sc_nbufs;
+ sc->sc_playbuf = (sc->sc_playbuf + 1) % sc->sc_nbufs;
gus_start_playing(sc, sc->sc_playbuf);
} else if (sc->sc_bufcnt < 0) {
panic("%s: negative bufcnt in stopped voice",
@@ -1919,7 +1919,7 @@
* update playbuf to point to the buffer the hardware just started
* playing
*/
- sc->sc_playbuf = ++sc->sc_playbuf % sc->sc_nbufs;
+ sc->sc_playbuf = (sc->sc_playbuf + 1) % sc->sc_nbufs;
/*
* account for buffer just finished
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mrg Date: Sat Jul 2 13:13:23 UTC 2011 Modified Files: src/sys/dev/ic: i82586.c Log Message: listen to GCC 4.5 and change "!!x | y" into "(!!x) | y". To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/dev/ic/i82586.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/dev/ic/i82586.c diff -u src/sys/dev/ic/i82586.c:1.69 src/sys/dev/ic/i82586.c:1.70 --- src/sys/dev/ic/i82586.c:1.69 Fri Jun 3 16:28:40 2011 +++ src/sys/dev/ic/i82586.c Sat Jul 2 13:13:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i82586.c,v 1.69 2011/06/03 16:28:40 tsutsui Exp $ */ +/* $NetBSD: i82586.c,v 1.70 2011/07/02 13:13:22 mrg Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -137,7 +137,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.69 2011/06/03 16:28:40 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.70 2011/07/02 13:13:22 mrg Exp $"); #include @@ -1507,7 +1507,7 @@ *IE_CMD_CFG_IFS(buf) = 0x60; *IE_CMD_CFG_SLOT_LOW(buf) = 0; *IE_CMD_CFG_SLOT_HIGH(buf) = 0xf2; - *IE_CMD_CFG_PROMISC(buf) = !!promiscuous | manchester << 2; + *IE_CMD_CFG_PROMISC(buf) = (!!promiscuous) | manchester << 2; *IE_CMD_CFG_CRSCDT(buf)= 0; *IE_CMD_CFG_MINLEN(buf)= 64; *IE_CMD_CFG_JUNK(buf) = 0xff;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mrg
Date: Sat Jul 2 13:12:44 UTC 2011
Modified Files:
src/sys/dev/ic: aic79xx.c
Log Message:
avoid -Wenum-compare issue.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/ic/aic79xx.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/dev/ic/aic79xx.c
diff -u src/sys/dev/ic/aic79xx.c:1.44 src/sys/dev/ic/aic79xx.c:1.45
--- src/sys/dev/ic/aic79xx.c:1.44 Thu Sep 3 14:52:22 2009
+++ src/sys/dev/ic/aic79xx.c Sat Jul 2 13:12:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.c,v 1.44 2009/09/03 14:52:22 tsutsui Exp $ */
+/* $NetBSD: aic79xx.c,v 1.45 2011/07/02 13:12:44 mrg Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.44 2009/09/03 14:52:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.45 2011/07/02 13:12:44 mrg Exp $");
#include
#include
@@ -7198,7 +7198,7 @@
ahd_freeze_scb(scb);
if ((scb->flags & SCB_ACTIVE) == 0)
printf("Inactive SCB in qinfifo\n");
-if (scb->xs->error != CAM_REQ_CMP)
+if ((cam_status)scb->xs->error != CAM_REQ_CMP)
printf("SEARCH_COMPLETE(0x%x):"
" ostat 0x%x, cstat 0x%x, "
"xs_error 0x%x\n",
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: mrg
Date: Sat Jul 2 13:11:49 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
redo previous correctly:
don't try to print fr_arg[6] since it doesn't exist.
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/arch/sparc64/sparc64/machdep.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/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.259 src/sys/arch/sparc64/sparc64/machdep.c:1.260
--- src/sys/arch/sparc64/sparc64/machdep.c:1.259 Fri Jul 1 08:37:28 2011
+++ src/sys/arch/sparc64/sparc64/machdep.c Sat Jul 2 13:11:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.260 2011/07/02 13:11:48 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.260 2011/07/02 13:11:48 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -928,7 +928,7 @@
fp64 = (struct frame64*)(((char*)fp)+BIAS);
/* 64-bit frame */
get_symbol_and_offset(&mod, &sym, &offset, fp64->fr_pc);
- printf(" %s:%s+%#llx(%llx, %llx, %llx, %llx, %llx, %llx, %llx) fp = %llx\n",
+ printf(" %s:%s+%#llx(%llx, %llx, %llx, %llx, %llx, %llx) fp = %llx\n",
mod, sym,
(unsigned long long)offset,
(unsigned long long)fp64->fr_arg[0],
@@ -937,13 +937,12 @@
(unsigned long long)fp64->fr_arg[3],
(unsigned long long)fp64->fr_arg[4],
(unsigned long long)fp64->fr_arg[5],
- (unsigned long long)fp64->fr_fp,
- (unsigned long long)fp64->fr_pc);
+ (unsigned long long)fp64->fr_fp);
fp = (struct frame32 *)(u_long)fp64->fr_fp;
} else {
/* 32-bit frame */
get_symbol_and_offset(&mod, &sym, &offset, fp->fr_pc);
- printf(" %s:%s+%#lx(%x, %x, %x, %x, %x, %x, %x) fp = %x\n",
+ printf(" %s:%s+%#lx(%x, %x, %x, %x, %x, %x) fp = %x\n",
mod, sym,
(unsigned long)offset,
fp->fr_arg[0],
@@ -952,8 +951,7 @@
fp->fr_arg[3],
fp->fr_arg[4],
fp->fr_arg[5],
- fp->fr_fp,
- fp->fr_pc);
+ fp->fr_fp);
fp = (struct frame32*)(u_long)fp->fr_fp;
}
}
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Sat Jul 2 13:10:53 UTC 2011
Modified Files:
src/sys/arch/sparc/sparc: machdep.c
Log Message:
don't try to print fr_arg[6] since it doesn't exist.
To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/sys/arch/sparc/sparc/machdep.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/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.311 src/sys/arch/sparc/sparc/machdep.c:1.312
--- src/sys/arch/sparc/sparc/machdep.c:1.311 Sun Jun 12 03:35:46 2011
+++ src/sys/arch/sparc/sparc/machdep.c Sat Jul 2 13:10:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.311 2011/06/12 03:35:46 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.312 2011/07/02 13:10:53 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.311 2011/06/12 03:35:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.312 2011/07/02 13:10:53 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@@ -1105,10 +1105,9 @@
printf("Frame pointer is at %p\n", fp);
printf("Call traceback:\n");
while (fp && ((u_long)fp >> PGSHIFT) == ((u_long)sfp >> PGSHIFT)) {
- printf(" pc = 0x%x args = (0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x) fp = %p\n",
+ printf(" pc = 0x%x args = (0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x) fp = %p\n",
fp->fr_pc, fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2],
- fp->fr_arg[3], fp->fr_arg[4], fp->fr_arg[5], fp->fr_arg[6],
- fp->fr_fp);
+ fp->fr_arg[3], fp->fr_arg[4], fp->fr_arg[5], fp->fr_fp);
fp = fp->fr_fp;
}
}
@@ -1144,9 +1143,9 @@
printf("stop at 0x%lx\n", stop);
fp = (struct frame *) va;
while (round_up((u_long) fp) == stop) {
- printf(" 0x%x(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x) fp %p\n", fp->fr_pc,
+ printf(" 0x%x(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x) fp %p\n", fp->fr_pc,
fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2], fp->fr_arg[3],
- fp->fr_arg[4], fp->fr_arg[5], fp->fr_arg[6], fp->fr_fp);
+ fp->fr_arg[4], fp->fr_arg[5], fp->fr_fp);
fp = fp->fr_fp;
if (fp == NULL)
break;
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: mrg
Date: Sat Jul 2 13:09:32 UTC 2011
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
insert some (uintptr_t) between some casts involving pointer to int.
(they already had casts for the pointer.)
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/x86/x86_autoconf.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/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.59 src/sys/arch/x86/x86/x86_autoconf.c:1.60
--- src/sys/arch/x86/x86/x86_autoconf.c:1.59 Tue Mar 8 02:57:00 2011
+++ src/sys/arch/x86/x86/x86_autoconf.c Sat Jul 2 13:09:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.59 2011/03/08 02:57:00 macallan Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.59 2011/03/08 02:57:00 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $");
#include
#include
@@ -718,13 +718,14 @@
gfb_cb.gcc_set_mapreg =
x86_genfb_set_mapreg;
prop_dictionary_set_uint64(dict,
- "cmap_callback", (uint64_t)&gfb_cb);
+ "cmap_callback",
+ (uint64_t)(uintptr_t)&gfb_cb);
}
if (fbinfo->physaddr != 0) {
mode_cb.gmc_setmode = x86_genfb_setmode;
prop_dictionary_set_uint64(dict,
"mode_callback",
- (uint64_t)&mode_cb);
+ (uint64_t)(uintptr_t)&mode_cb);
}
#if NWSDISPLAY > 0 && NGENFB > 0
@@ -750,7 +751,7 @@
pmf_cb.gpc_suspend = x86_genfb_suspend;
pmf_cb.gpc_resume = x86_genfb_resume;
prop_dictionary_set_uint64(dict,
- "pmf_callback", (uint64_t)&pmf_cb);
+ "pmf_callback", (uint64_t)(uintptr_t)&pmf_cb);
#ifdef VGA_POST
vga_posth = vga_post_init(pa->pa_bus, pa->pa_device,
pa->pa_function);
CVS commit: src/sys/arch/powerpc/pic
Module Name:src
Committed By: mrg
Date: Sat Jul 2 13:08:25 UTC 2011
Modified Files:
src/sys/arch/powerpc/pic: pic_distopenpic.c
Log Message:
avoid some uninitialised variable warnings from GCC 4.5. i'm pretty
sure they can't happen in practise, but i can see why GCC isn't sure.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/pic/pic_distopenpic.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/powerpc/pic/pic_distopenpic.c
diff -u src/sys/arch/powerpc/pic/pic_distopenpic.c:1.6 src/sys/arch/powerpc/pic/pic_distopenpic.c:1.7
--- src/sys/arch/powerpc/pic/pic_distopenpic.c:1.6 Mon Jun 20 06:21:45 2011
+++ src/sys/arch/powerpc/pic/pic_distopenpic.c Sat Jul 2 13:08:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_distopenpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
+/* $NetBSD: pic_distopenpic.c,v 1.7 2011/07/02 13:08:25 mrg Exp $ */
/*-
* Copyright (c) 2008 Tim Rightnour
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.7 2011/07/02 13:08:25 mrg Exp $");
#include "opt_openpic.h"
#include "opt_interrupt.h"
@@ -174,7 +174,7 @@
distopic_establish_irq(struct pic_ops *pic, int irq, int type, int pri)
{
struct openpic_ops *opic = (struct openpic_ops *)pic;
- int isu, realirq, realpri = max(1, min(15, pri));
+ int isu, realirq = -1, realpri = max(1, min(15, pri));
uint32_t x;
isu = opic_isu_from_irq(opic, irq, &realirq);
@@ -196,7 +196,7 @@
distopic_enable_irq(struct pic_ops *pic, int irq, int type)
{
struct openpic_ops *opic = (struct openpic_ops *)pic;
- int isu, realirq;
+ int isu, realirq = -1;
u_int x;
isu = opic_isu_from_irq(opic, irq, &realirq);
@@ -210,7 +210,7 @@
distopic_disable_irq(struct pic_ops *pic, int irq)
{
struct openpic_ops *opic = (struct openpic_ops *)pic;
- int isu, realirq;
+ int isu, realirq = -1;
u_int x;
isu = opic_isu_from_irq(opic, irq, &realirq);
CVS commit: src/lib/csu/powerpc
Module Name:src Committed By: matt Date: Sat Jul 2 07:28:08 UTC 2011 Modified Files: src/lib/csu/powerpc: dot_init.h Log Message: Make this adhere to the SVR4 ABI. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/csu/powerpc/dot_init.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/powerpc/dot_init.h diff -u src/lib/csu/powerpc/dot_init.h:1.7 src/lib/csu/powerpc/dot_init.h:1.8 --- src/lib/csu/powerpc/dot_init.h:1.7 Sat May 10 15:31:04 2008 +++ src/lib/csu/powerpc/dot_init.h Sat Jul 2 07:28:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dot_init.h,v 1.7 2008/05/10 15:31:04 martin Exp $ */ +/* $NetBSD: dot_init.h,v 1.8 2011/07/02 07:28:08 matt Exp $ */ /*- * Copyright (c) 2001 Ross Harvey @@ -40,18 +40,18 @@ ".section "#sect",\"ax\",@progbits \n" \ ".global "#entry_pt" \n" \ #entry_pt":\n" \ - " stwu %r1,-16(%r1) \n" \ " mflr %r0 \n" \ - " stw %r0,12(%r1) \n" \ + " stw %r0,4(%r1) \n" \ + " stwu %r1,-16(%r1) \n" \ " /* fall thru */ \n" \ ".previous") #define MD_SECTION_EPILOGUE(sect) \ __asm ( \ ".section "#sect",\"ax\",@progbits \n" \ - " lwz %r0,12(%r1) \n" \ + " addi %r1,%r1,16 \n" \ + " lwz %r0,4(%r1) \n" \ " mtlr %r0 \n" \ - " la %r1,16(%r1) \n" \ " blr\n" \ ".previous")
