CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch
Module Name:src Committed By: mrg Date: Fri Jul 1 01:49:43 UTC 2011 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/i386: config.m4 src/external/lgpl3/gmp/lib/libgmp/arch/sparc64: config.m4 Log Message: remove hard-coded CONFIG_TOP_SRCDIR macro definition To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.m4 cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/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/i386/config.m4 diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.m4:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.m4:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.m4:1.1 Wed Jun 29 08:06:47 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.m4 Fri Jul 1 01:49:42 2011 @@ -1,7 +1,7 @@ dnl config.m4. Generated automatically by configure. changequote(,) ifdef(__CONFIG_M4_INCLUDED__,, -define(CONFIG_TOP_SRCDIR,`/usr/src/external/lgpl3/gmp/dist') +dnl define(CONFIG_TOP_SRCDIR,`/usr/src/external/lgpl3/gmp/dist') define(WANT_ASSERT,0) define(WANT_PROFILING,`no') define(M4WRAP_SPURIOUS,no) Index: src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/config.m4 diff -u src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/config.m4:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/config.m4:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/config.m4:1.1 Wed Jun 29 02:56:24 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/config.m4 Fri Jul 1 01:49:43 2011 @@ -1,7 +1,7 @@ dnl config.m4. Generated automatically by configure. changequote(,) ifdef(__CONFIG_M4_INCLUDED__,, -define(CONFIG_TOP_SRCDIR,`/usr/src/external/lgpl3/gmp/dist') +dnl define(CONFIG_TOP_SRCDIR,`/usr/src/external/lgpl3/gmp/dist') define(WANT_ASSERT,0) define(WANT_PROFILING,`no') define(M4WRAP_SPURIOUS,no)
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 02:11:14 UTC 2011
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
avoid creating an unused directory.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 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.56 src/tools/gcc/mknative-gcc:1.57
--- src/tools/gcc/mknative-gcc:1.56 Fri Jul 1 01:27:17 2011
+++ src/tools/gcc/mknative-gcc Fri Jul 1 02:11:14 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.56 2011/07/01 01:27:17 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.57 2011/07/01 02:11:14 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -529,7 +529,7 @@
get_gcc () {
_subdir=$1
mkdir -p $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH
- mkdir -p $_OUTDIR/usr.bin/$_subdir/libcpp/arch/$MACHINE_ARCH
+ mkdir -p $_OUTDIR/usr.bin/libcpp/arch/$MACHINE_ARCH
case ${_subdir} in
gcc4)
_buildname=BUILD_
@@ -602,7 +602,6 @@
hfiles='auto-host gencheck configargs gthr-default tm bconfig config multilib'
;;
gcc)
- mkdir -p $_OUTDIR/usr.bin/libcpp/arch/$MACHINE_ARCH
write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h $_TMPDIR/libcpp/config.h
hfiles='auto-host configargs gthr-default tm bconfig config multilib bversion plugin-version'
;;
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: mrg
Date: Fri Jul 1 02:18:37 UTC 2011
Modified Files:
src/external/bsd/ntp/dist/ntpd: refclock_oncore.c
Log Message:
avoid a potential uninitialised variable problem.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpd/refclock_oncore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpd/refclock_oncore.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_oncore.c:1.3 src/external/bsd/ntp/dist/ntpd/refclock_oncore.c:1.4
--- src/external/bsd/ntp/dist/ntpd/refclock_oncore.c:1.3 Sat Dec 4 23:08:35 2010
+++ src/external/bsd/ntp/dist/ntpd/refclock_oncore.c Fri Jul 1 02:18:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_oncore.c,v 1.3 2010/12/04 23:08:35 christos Exp $ */
+/* $NetBSD: refclock_oncore.c,v 1.4 2011/07/01 02:18:37 mrg Exp $ */
/*
@@ -2488,7 +2488,7 @@
{
int chan, id, subframe, valid, page, i, j, tow;
int day_now, day_lsf;
- const char *cp;
+ const char *cp = NULL /* XXX gcc */;
char Msg[120];
enum {
WARN_NOT_YET,
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src Committed By: mrg Date: Fri Jul 1 02:18:54 UTC 2011 Modified Files: src/external/bsd/ntp/dist/ntpd: ntp_control.c Log Message: avoid an overflow condition. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/ntpd/ntp_control.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ntp/dist/ntpd/ntp_control.c diff -u src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.2 src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.3 --- src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.2 Sat Dec 4 23:08:35 2010 +++ src/external/bsd/ntp/dist/ntpd/ntp_control.c Fri Jul 1 02:18:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_control.c,v 1.2 2010/12/04 23:08:35 christos Exp $ */ +/* $NetBSD: ntp_control.c,v 1.3 2011/07/01 02:18:54 mrg Exp $ */ /* * ntp_control.c - respond to control messages and send async traps @@ -527,7 +527,7 @@ */ rpkt.r_m_e_op = (u_char) (CTL_RESPONSE|CTL_ERROR|(res_opcode CTL_OP_MASK)); - rpkt.status = htons((u_short) ((errcode8) 0xff00)); + rpkt.status = htons((u_short) ((errcode 0xff) 8)); rpkt.count = 0; /*
CVS commit: src/sys/dist/pf/net
Module Name:src
Committed By: mrg
Date: Fri Jul 1 02:33:23 UTC 2011
Modified Files:
src/sys/dist/pf/net: pf_norm.c
Log Message:
fix an uninitialised variable problem. large-ish function, but i
couldn't see how GCC 4.5 isn't wrong about this one.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dist/pf/net/pf_norm.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/dist/pf/net/pf_norm.c
diff -u src/sys/dist/pf/net/pf_norm.c:1.23 src/sys/dist/pf/net/pf_norm.c:1.24
--- src/sys/dist/pf/net/pf_norm.c:1.23 Fri Nov 5 01:35:58 2010
+++ src/sys/dist/pf/net/pf_norm.c Fri Jul 1 02:33:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_norm.c,v 1.23 2010/11/05 01:35:58 rmind Exp $ */
+/* $NetBSD: pf_norm.c,v 1.24 2011/07/01 02:33:23 mrg Exp $ */
/* $OpenBSD: pf_norm.c,v 1.109 2007/05/28 17:16:39 henning Exp $ */
/*
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pf_norm.c,v 1.23 2010/11/05 01:35:58 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: pf_norm.c,v 1.24 2011/07/01 02:33:23 mrg Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -1487,7 +1487,7 @@
struct pf_state_peer *src, struct pf_state_peer *dst, int *writeback)
{
struct timeval uptime;
- u_int32_t tsval, tsecr;
+ u_int32_t tsval = 0, tsecr = 0;
u_int tsval_from_last;
u_int8_t hdr[60];
u_int8_t *opt;
CVS commit: src/usr.bin/ktruss
Module Name:src Committed By: mrg Date: Fri Jul 1 02:34:50 UTC 2011 Modified Files: src/usr.bin/ktruss: dump.c Log Message: avoid an uninitialised variable warning that shouldn't normally happen in practise but isn't entirely impossible for the future. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.bin/ktruss/dump.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/ktruss/dump.c diff -u src/usr.bin/ktruss/dump.c:1.37 src/usr.bin/ktruss/dump.c:1.38 --- src/usr.bin/ktruss/dump.c:1.37 Sun Mar 6 17:08:42 2011 +++ src/usr.bin/ktruss/dump.c Fri Jul 1 02:34:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dump.c,v 1.37 2011/03/06 17:08:42 bouyer Exp $ */ +/* $NetBSD: dump.c,v 1.38 2011/07/01 02:34:50 mrg Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = @(#)kdump.c 8.4 (Berkeley) 4/28/95; #endif -__RCSID($NetBSD: dump.c,v 1.37 2011/03/06 17:08:42 bouyer Exp $); +__RCSID($NetBSD: dump.c,v 1.38 2011/07/01 02:34:50 mrg Exp $); #endif /* not lint */ #include sys/param.h @@ -349,6 +349,7 @@ static union timeholder prevtime; union timeholder temp; + temp.tv.tv_sec = temp.tv.tv_usec = 0; wprintf(%6d , kth-ktr_pid); if (kth-ktr_version KTRFAC_VERSION(KTRFACv0)) wprintf(%6d , kth-ktr_lid);
CVS commit: src/usr.sbin/zdump
Module Name:src
Committed By: mrg
Date: Fri Jul 1 02:42:10 UTC 2011
Modified Files:
src/usr.sbin/zdump: Makefile
Log Message:
apply some -Wno-strict-overflow for GCC = 4.5
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/zdump/Makefile
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/zdump/Makefile
diff -u src/usr.sbin/zdump/Makefile:1.5 src/usr.sbin/zdump/Makefile:1.6
--- src/usr.sbin/zdump/Makefile:1.5 Wed Sep 18 03:54:39 2002
+++ src/usr.sbin/zdump/Makefile Fri Jul 1 02:42:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/18 03:54:39 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/01 02:42:10 mrg Exp $
.include bsd.own.mk
@@ -8,3 +8,8 @@
.PATH: ${NETBSDSRCDIR}/lib/libc/time
.include bsd.prog.mk
+
+# XXX
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45
+COPTS.zdump.c+= -Wno-strict-overflow
+.endif
CVS commit: src/bin/csh
Module Name:src
Committed By: mrg
Date: Fri Jul 1 03:58:10 UTC 2011
Modified Files:
src/bin/csh: Makefile
Log Message:
add a comment to confirm a workaround as only being a GCC 4.1 issue.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/bin/csh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/Makefile
diff -u src/bin/csh/Makefile:1.29 src/bin/csh/Makefile:1.30
--- src/bin/csh/Makefile:1.29 Sat Oct 25 22:27:34 2008
+++ src/bin/csh/Makefile Fri Jul 1 03:58:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/10/25 22:27:34 apb Exp $
+# $NetBSD: Makefile,v 1.30 2011/07/01 03:58:10 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
#
# C Shell with process control; VM/UNIX VAX Makefile
@@ -48,6 +48,7 @@
SUBDIR+=USD.doc
.endif
+# XXX Only GCC 4.1 problem
.if defined(HAVE_GCC) ${HAVE_GCC} == 4 ${MACHINE_ARCH} == vax
COPTS.parse.c+= -O0
.endif
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src Committed By: mrg Date: Fri Jul 1 04:05:22 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc/config/rs6000: t-netbsd Log Message: remove LIB2FUNCS_STATIC_EXTRA and supporting code. netbsd does not need this. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/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/rs6000/t-netbsd diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.2 src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.3 --- src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.2 Tue Jun 21 02:41:37 2011 +++ src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd Fri Jul 1 04:05:22 2011 @@ -20,28 +20,6 @@ LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/tramp.asm -LIB2FUNCS_STATIC_EXTRA = crtsavfpr.S crtresfpr.S \ - crtsavgpr.S crtresgpr.S \ - crtresxfpr.S crtresxgpr.S - -crtsavfpr.S: $(srcdir)/config/rs6000/crtsavfpr.asm - cat $(srcdir)/config/rs6000/crtsavfpr.asm crtsavfpr.S - -crtresfpr.S: $(srcdir)/config/rs6000/crtresfpr.asm - cat $(srcdir)/config/rs6000/crtresfpr.asm crtresfpr.S - -crtsavgpr.S: $(srcdir)/config/rs6000/crtsavgpr.asm - cat $(srcdir)/config/rs6000/crtsavgpr.asm crtsavgpr.S - -crtresgpr.S: $(srcdir)/config/rs6000/crtresgpr.asm - cat $(srcdir)/config/rs6000/crtresgpr.asm crtresgpr.S - -crtresxfpr.S: $(srcdir)/config/rs6000/crtresxfpr.asm - cat $(srcdir)/config/rs6000/crtresxfpr.asm crtresxfpr.S - -crtresxgpr.S: $(srcdir)/config/rs6000/crtresxgpr.asm - cat $(srcdir)/config/rs6000/crtresxgpr.asm crtresxgpr.S - # It is important that crtbegin.o, etc., aren't surprised by stuff in .sdata. CRTSTUFF_T_CFLAGS += -msdata=none CRTSTUFF_T_CFLAGS_S += -msdata=none @@ -67,21 +45,3 @@ INSTALL_LIBGCC = install-multilib EXTRA_MULTILIB_PARTS = crtbegin$(objext) crtend$(objext) \ crtbeginS$(objext) crtendS$(objext) crtbeginT$(objext) - -$(T)crtsavfpr$(objext): crtsavfpr.S - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtsavfpr.S -o $(T)crtsavfpr$(objext) - -$(T)crtresfpr$(objext): crtresfpr.S - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresfpr.S -o $(T)crtresfpr$(objext) - -$(T)crtsavgpr$(objext): crtsavgpr.S - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtsavgpr.S -o $(T)crtsavgpr$(objext) - -$(T)crtresgpr$(objext): crtresgpr.S - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresgpr.S -o $(T)crtresgpr$(objext) - -$(T)crtresxfpr$(objext): crtresxfpr.S - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresxfpr.S -o $(T)crtresxfpr$(objext) - -$(T)crtresxgpr$(objext): crtresxgpr.S - $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresxgpr.S -o $(T)crtresxgpr$(objext)
CVS commit: src/external/gpl3/gcc/lib/libgcc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 05:07:07 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
Log Message:
fix the _fixunssfsi _fixunsdfsi _fixunsxfsi functions.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/libgcc/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/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.6 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.7
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.6 Fri Jul 1 01:24:53 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Jul 1 05:07:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2011/07/01 01:24:53 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2011/07/01 05:07:06 mrg Exp $
.if ${MKGCC} != no
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -47,18 +47,19 @@
# non swfloat versions
.for _p in _fix _fixuns
-. for _s in sf df xf tf
-LIB2FUNCS_ALL+= ${_p}${_s}di
+. for _m in sf df xf tf
+LIB2FUNCS_ALL+= ${_p}${_m}di
. endfor
.endfor
+
.for _p in _float _floatun
-. for _s in sf df xf tf
-LIB2FUNCS_ALL+= ${_p}di${_s}
+. for _m in sf df xf tf
+LIB2FUNCS_ALL+= ${_p}di${_m}
. endfor
.endfor
.for _m in sf df xf
-LIB2FUNCS_ALL+= fixuns${_p}si
+LIB2FUNCS_ALL+= _fixuns${_m}si
.endfor
LIB2FUNCS_SHORT:=${LIB2FUNCS_ALL}
@@ -155,3 +156,19 @@
DPSRCS+= unwind.h
.include ../../Makefile.hacks
+
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45 \
+(${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == armeb)
+${SRCS}: options.h
+
+optionlist: ${G_ALL_OPT_FILES} ${GCCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
+ ${TOOL_AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} \
+ ${.TARGET}
+
+options.h: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/opth-gen.awk
+ ${TOOL_AWK} -f ${DIST}/gcc/opt-functions.awk \
+ -f ${DIST}/gcc/opth-gen.awk \
+ optionlist ${.TARGET}
+
+CLEANFILES+= options.h optionlist
+.endif
CVS commit: src/external/gpl3/gcc/lib/crtstuff
Module Name:src
Committed By: mrg
Date: Fri Jul 1 05:07:46 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/crtstuff: Makefile
Log Message:
declare options.h as an EXTRA_FAKE_HEADERS.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/crtstuff/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/lib/crtstuff/Makefile
diff -u src/external/gpl3/gcc/lib/crtstuff/Makefile:1.4 src/external/gpl3/gcc/lib/crtstuff/Makefile:1.5
--- src/external/gpl3/gcc/lib/crtstuff/Makefile:1.4 Fri Jul 1 01:24:53 2011
+++ src/external/gpl3/gcc/lib/crtstuff/Makefile Fri Jul 1 05:07:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/01 01:24:53 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/07/01 05:07:46 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -51,6 +51,7 @@
.PATH: ${DIST}/gcc ${DIST}/gcc/config ${G_CONFIGDIR}
.include ../Makefile.tconfigh
+EXTRA_FAKEHEADERS= options.h
.include ../Makefile.hacks
${OBJS}: ${DPSRCS}
CVS commit: src/external/gpl3/gcc/lib/libobjc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 05:07:59 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libobjc: Makefile
Log Message:
move the bsd.lib.mk include later so it works properly.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libobjc/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/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.4 src/external/gpl3/gcc/lib/libobjc/Makefile:1.5
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.4 Fri Jul 1 01:24:53 2011
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Fri Jul 1 05:07:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/01 01:24:53 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/07/01 05:07:59 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -69,8 +69,6 @@
.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc
-.include bsd.lib.mk
-
${OBJS} ${POBJS} ${SOBJS}: runtime-info.h
${SRCS}: tconfig.h unwind.h options.h
@@ -95,6 +93,8 @@
CLEANFILES+= options.h optionlist
.endif
+.include bsd.lib.mk
+
.else
.include bsd.prog.mk # do nothing
.endif
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/arch
Module Name:src Committed By: mrg Date: Fri Jul 1 05:10:29 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: c++config.h config.h Log Message: various mknative-gcc updates. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/config.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/lib/libstdc++-v3/arch/i386/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.3 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.2 Fri Jul 1 01:57:08 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h Fri Jul 1 05:10:28 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.54 2011/06/30 07:01:14 mrg Exp */ +/* 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 */ // Predefined symbols and macros -*- C++ -*- @@ -788,7 +788,7 @@ /* #undef _GLIBCXX_HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -#define _GLIBCXX_HAVE_TGMATH_H 1 +/* #undef _GLIBCXX_HAVE_TGMATH_H */ /* Define to 1 if the target supports thread-local storage. */ /* #undef _GLIBCXX_HAVE_TLS */ Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h:1.3 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h:1.2 Fri Jul 1 01:57:08 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/config.h Fri Jul 1 05:10:28 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.54 2011/06/30 07:01:14 mrg Exp */ +/* 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.h.in by configure. */ @@ -409,7 +409,7 @@ /* #undef HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -#define HAVE_TGMATH_H 1 +/* #undef HAVE_TGMATH_H */ /* Define to 1 if the target supports thread-local storage. */ /* #undef HAVE_TLS */ Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.2 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.1 Fri Jul 1 01:57:08 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h Fri Jul 1 05:10:28 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.56 2011/07/01 01:27:17 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ // Predefined symbols and macros -*- C++ -*- @@ -421,7 +421,7 @@ /* #undef _GLIBCXX_HAVE_CEILL */ /* Define to 1 if you have the complex.h header file. */ -/* #undef _GLIBCXX_HAVE_COMPLEX_H */ +#define _GLIBCXX_HAVE_COMPLEX_H 1 /* Define to 1 if you have the `cosf' function. */ /* #undef _GLIBCXX_HAVE_COSF */ @@ -499,7 +499,7 @@ /* #undef _GLIBCXX_HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -/* #undef _GLIBCXX_HAVE_FENV_H */ +#define _GLIBCXX_HAVE_FENV_H 1 /* Define to 1 if you have the `finite' function. */ #define _GLIBCXX_HAVE_FINITE 1 @@ -788,7 +788,7 @@ /* #undef _GLIBCXX_HAVE_TANL */ /* Define to 1 if you have the tgmath.h
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: mrg
Date: Fri Jul 1 08:37:29 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
use the right variables for the fp and pc, and avoid array bounds
violations.
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 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.258 src/sys/arch/sparc64/sparc64/machdep.c:1.259
--- src/sys/arch/sparc64/sparc64/machdep.c:1.258 Sun Jun 12 03:35:47 2011
+++ src/sys/arch/sparc64/sparc64/machdep.c Fri Jul 1 08:37:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.258 2011/06/12 03:35:47 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.258 2011/06/12 03:35:47 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.259 2011/07/01 08:37:28 mrg Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -937,8 +937,8 @@
(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_arg[6],
- (unsigned long long)fp64-fr_fp);
+ (unsigned long long)fp64-fr_fp,
+ (unsigned long long)fp64-fr_pc);
fp = (struct frame32 *)(u_long)fp64-fr_fp;
} else {
/* 32-bit frame */
@@ -952,8 +952,8 @@
fp-fr_arg[3],
fp-fr_arg[4],
fp-fr_arg[5],
- fp-fr_arg[6],
- fp-fr_fp);
+ fp-fr_fp,
+ fp-fr_pc);
fp = (struct frame32*)(u_long)fp-fr_fp;
}
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mrg Date: Fri Jul 1 08:38:11 UTC 2011 Modified Files: src/sys/dev/ic: dpt.c Log Message: apply some (uintptr_t) between pointer and int casting. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/dev/ic/dpt.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/dpt.c diff -u src/sys/dev/ic/dpt.c:1.64 src/sys/dev/ic/dpt.c:1.65 --- src/sys/dev/ic/dpt.c:1.64 Sat Nov 13 13:52:01 2010 +++ src/sys/dev/ic/dpt.c Fri Jul 1 08:38:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dpt.c,v 1.64 2010/11/13 13:52:01 uebayasi Exp $ */ +/* $NetBSD: dpt.c,v 1.65 2011/07/01 08:38:10 mrg Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dpt.c,v 1.64 2010/11/13 13:52:01 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: dpt.c,v 1.65 2011/07/01 08:38:10 mrg Exp $); #include sys/param.h #include sys/systm.h @@ -535,7 +535,7 @@ */ dpt_outb(sc, HA_COMMAND, CP_PIO_GETCFG); memset(ec, 0, sizeof(*ec)); - i = ((int)((struct eata_cfg *)0)-ec_cfglen + + i = ((int)(uintptr_t)((struct eata_cfg *)0)-ec_cfglen + sizeof(ec-ec_cfglen)) 1; p = (u_int16_t *)ec; @@ -550,13 +550,13 @@ *p++ = bus_space_read_stream_2(sc-sc_iot, sc-sc_ioh, HA_DATA); if ((i = ec-ec_cfglen) (sizeof(struct eata_cfg) - - (int)struct eata_cfg *)0L)-ec_cfglen)) + - (int)(uintptr_t)struct eata_cfg *)0L)-ec_cfglen)) - sizeof(ec-ec_cfglen))) i = sizeof(struct eata_cfg) - - (int)struct eata_cfg *)0L)-ec_cfglen)) + - (int)(uintptr_t)struct eata_cfg *)0L)-ec_cfglen)) - sizeof(ec-ec_cfglen); - j = i + (int)struct eata_cfg *)0L)-ec_cfglen)) + + j = i + (int)(uintptr_t)struct eata_cfg *)0L)-ec_cfglen)) + sizeof(ec-ec_cfglen); i = 1;
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Fri Jul 1 10:03:17 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.inc
Log Message:
fix version.c defines. now the version says:
gcc version 4.5.3 (NetBSD nb1 20110620)
instead of:
gcc version 4.5.320110428
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/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/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.7 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.8
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.7 Wed Jun 29 02:15:13 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Fri Jul 1 10:03:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/06/29 02:15:13 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/07/01 10:03:17 mrg Exp $
.include bsd.own.mk
@@ -31,7 +31,11 @@
# XXX
#DEVPHASE!= cat ${GNUHOSTDIST}/gcc/DEV-PHASE
DEVPHASE=
+.if ${DEVPHASE} == release || ${DEVPHASE} ==
+DATESTAMP=
+.else
DATESTAMP!= cat ${GNUHOSTDIST}/gcc/DATESTAMP
+.endif
BASEVERSTR= \$(BASEVER)\
.if !empty(DEVPHASE)
@@ -39,7 +43,7 @@
.else
DEVPHASESTR= \\
.endif
-.if !empty(DEVPHASE)
+.if !empty(DATESTAMP)
DATESTAMPSTR= \ $(DATESTAMP)\
.else
DATESTAMPSTR= \\
@@ -48,13 +52,13 @@
# XXX pull this out of our configs
G_BUGURL=http://www.NetBSD.org/Misc/send-pr.html
G_BUGURL_s=\${G_BUG_URL}\
-G_PKGVERSION_s=(NetBSD nb1 20110620)
+G_PKGVERSION=(NetBSD nb1 20110620)
G_PKGVERSION_s=\${G_PKGVERSION} \
VER_CPPFLAGS= -DBUGURL=${G_BUGURL_s} \
-DPKGVERSION=${G_PKGVERSION_s} \
-DBASEVER=\${BASEVER}\ \
--DDATESTAMP=\${DATESTAMP}\ \
+-DDATESTAMP=${DATESTAMPSTR} \
-DDEVPHASE=${DEVPHASE} \
-DREVISION=${REVISION}
CPPFLAGS.version.c= ${VER_CPPFLAGS}
CVS commit: src/external/gpl3/gcc/lib/libgcc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 10:04:13 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
Log Message:
everyone needs the options* stuff here.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgcc/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/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.7 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.8
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.7 Fri Jul 1 05:07:06 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Jul 1 10:04:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/07/01 05:07:06 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/07/01 10:04:13 mrg Exp $
.if ${MKGCC} != no
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -157,8 +157,6 @@
.include ../../Makefile.hacks
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45 \
-(${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == armeb)
${SRCS}: options.h
optionlist: ${G_ALL_OPT_FILES} ${GCCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
@@ -171,4 +169,3 @@
optionlist ${.TARGET}
CLEANFILES+= options.h optionlist
-.endif
CVS commit: src/external/gpl3/gcc/lib/libobjc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 10:04:36 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libobjc: Makefile
Log Message:
don't set EXTRA_FAKE_HEADERS here.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libobjc/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/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.5 src/external/gpl3/gcc/lib/libobjc/Makefile:1.6
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.5 Fri Jul 1 05:07:59 2011
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Fri Jul 1 10:04:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/01 05:07:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/01 10:04:36 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -22,7 +22,7 @@
.else
# Machine-independent definitions (include file names).
.include ${.CURDIR}/defs.mk
-EXTRA_FAKEHEADERS= options.h
+EXTRA_FAKEHEADERS=
.endif
LIBGCCOBJ!=cd ${.CURDIR}/../libgcc/libgcc ${PRINTOBJDIR}
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm
Module Name:src Committed By: mrg Date: Fri Jul 1 10:06:01 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: c++config.h config.h Log Message: mknative-gcc regeneration. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.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/lib/libstdc++-v3/arch/arm/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h:1.2 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h:1.1 Fri Jul 1 01:57:07 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h Fri Jul 1 10:06:01 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp */ +/* 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 */ // Predefined symbols and macros -*- C++ -*- @@ -421,7 +421,7 @@ /* #undef _GLIBCXX_HAVE_CEILL */ /* Define to 1 if you have the complex.h header file. */ -/* #undef _GLIBCXX_HAVE_COMPLEX_H */ +#define _GLIBCXX_HAVE_COMPLEX_H 1 /* Define to 1 if you have the `cosf' function. */ /* #undef _GLIBCXX_HAVE_COSF */ @@ -499,7 +499,7 @@ /* #undef _GLIBCXX_HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -/* #undef _GLIBCXX_HAVE_FENV_H */ +#define _GLIBCXX_HAVE_FENV_H 1 /* Define to 1 if you have the `finite' function. */ #define _GLIBCXX_HAVE_FINITE 1 @@ -788,7 +788,7 @@ /* #undef _GLIBCXX_HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -/* #undef _GLIBCXX_HAVE_TGMATH_H */ +#define _GLIBCXX_HAVE_TGMATH_H 1 /* Define to 1 if the target supports thread-local storage. */ /* #undef _GLIBCXX_HAVE_TLS */ Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h:1.2 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h:1.1 Fri Jul 1 01:57:07 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h Fri Jul 1 10:06:01 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp */ +/* 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.h.in by configure. */ @@ -42,7 +42,7 @@ /* #undef HAVE_CEILL */ /* Define to 1 if you have the complex.h header file. */ -/* #undef HAVE_COMPLEX_H */ +#define HAVE_COMPLEX_H 1 /* Define to 1 if you have the `cosf' function. */ /* #undef HAVE_COSF */ @@ -120,7 +120,7 @@ /* #undef HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -/* #undef HAVE_FENV_H */ +#define HAVE_FENV_H 1 /* Define to 1 if you have the `finite' function. */ #define HAVE_FINITE 1 @@ -409,7 +409,7 @@ /* #undef HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -/* #undef HAVE_TGMATH_H */ +#define HAVE_TGMATH_H 1 /* Define to 1 if the target supports thread-local storage. */ /* #undef HAVE_TLS */
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: mrg Date: Fri Jul 1 22:23:19 UTC 2011 Modified Files: src/distrib/sets/lists/base: mi Log Message: new gcc 4.5 g++ dirs are for everyone, not just gcc 4.5 users. fixes build problems. To generate a diff of this commit: cvs rdiff -u -r1.942 -r1.943 src/distrib/sets/lists/base/mi 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.942 src/distrib/sets/lists/base/mi:1.943 --- src/distrib/sets/lists/base/mi:1.942 Fri Jul 1 02:10:08 2011 +++ src/distrib/sets/lists/base/mi Fri Jul 1 22:23:19 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.942 2011/07/01 02:10:08 mrg Exp $ +# $NetBSD: mi,v 1.943 2011/07/01 22:23:19 mrg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -805,14 +805,14 @@ ./usr/include/g++base-cxx-usr ./usr/include/g++/backward base-cxx-usr ./usr/include/g++/bitsbase-cxx-usr -./usr/include/g++/debugbase-cxx-usr gcc=45 +./usr/include/g++/debugbase-cxx-usr ./usr/include/g++/decimal base-cxx-usr ./usr/include/g++/extbase-cxx-usr ./usr/include/g++/genbase-obsolete obsolete -./usr/include/g++/parallel base-cxx-usr gcc=45 +./usr/include/g++/parallel base-cxx-usr ./usr/include/g++/stdbase-obsolete obsolete ./usr/include/g++/tr1base-cxx-usr -./usr/include/g++/tr1_impl base-cxx-usr gcc=45 +./usr/include/g++/tr1_impl base-cxx-usr ./usr/include/gcc-4.1base-c-usr ./usr/include/gcc-4.5base-c-usr ./usr/include/gssapibase-c-usr
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Jul 1 23:48:21 UTC 2011 Modified Files: src/sys/dev/usb: ehci.c Log Message: use an unsigned type for unsigned calcations. avoid GCC 4.5 warnings. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/sys/dev/usb/ehci.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/usb/ehci.c diff -u src/sys/dev/usb/ehci.c:1.180 src/sys/dev/usb/ehci.c:1.181 --- src/sys/dev/usb/ehci.c:1.180 Thu Jun 30 20:09:40 2011 +++ src/sys/dev/usb/ehci.c Fri Jul 1 23:48:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.180 2011/06/30 20:09:40 wiz Exp $ */ +/* $NetBSD: ehci.c,v 1.181 2011/07/01 23:48:20 mrg Exp $ */ /* * Copyright (c) 2004-2008 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.180 2011/06/30 20:09:40 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.181 2011/07/01 23:48:20 mrg Exp $); #include ohci.h #include uhci.h @@ -3988,7 +3988,7 @@ if (page_offs = dma_buf-block-size) break; - long long page = DMAADDR(dma_buf, page_offs); + unsigned long long page = DMAADDR(dma_buf, page_offs); page = EHCI_PAGE(page); itd-itd.itd_bufr[j] = htole32(EHCI_ITD_SET_BPTR(page));
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src
Committed By: mrg
Date: Sat Jul 2 02:38:31 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: t-netbsd
Log Message:
revert previous; we need this.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/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/rs6000/t-netbsd
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.3 src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.4
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd:1.3 Fri Jul 1 04:05:22 2011
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd Sat Jul 2 02:38:31 2011
@@ -20,6 +20,28 @@
LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/tramp.asm
+LIB2FUNCS_STATIC_EXTRA = crtsavfpr.S crtresfpr.S \
+ crtsavgpr.S crtresgpr.S \
+ crtresxfpr.S crtresxgpr.S
+
+crtsavfpr.S: $(srcdir)/config/rs6000/crtsavfpr.asm
+ cat $(srcdir)/config/rs6000/crtsavfpr.asm crtsavfpr.S
+
+crtresfpr.S: $(srcdir)/config/rs6000/crtresfpr.asm
+ cat $(srcdir)/config/rs6000/crtresfpr.asm crtresfpr.S
+
+crtsavgpr.S: $(srcdir)/config/rs6000/crtsavgpr.asm
+ cat $(srcdir)/config/rs6000/crtsavgpr.asm crtsavgpr.S
+
+crtresgpr.S: $(srcdir)/config/rs6000/crtresgpr.asm
+ cat $(srcdir)/config/rs6000/crtresgpr.asm crtresgpr.S
+
+crtresxfpr.S: $(srcdir)/config/rs6000/crtresxfpr.asm
+ cat $(srcdir)/config/rs6000/crtresxfpr.asm crtresxfpr.S
+
+crtresxgpr.S: $(srcdir)/config/rs6000/crtresxgpr.asm
+ cat $(srcdir)/config/rs6000/crtresxgpr.asm crtresxgpr.S
+
# It is important that crtbegin.o, etc., aren't surprised by stuff in .sdata.
CRTSTUFF_T_CFLAGS += -msdata=none
CRTSTUFF_T_CFLAGS_S += -msdata=none
@@ -42,6 +64,24 @@
MULTILIB_MATCHES = ${MULTILIB_MATCHES_FLOAT}
LIBGCC = stmp-multilib
+
+$(T)crtsavfpr$(objext): crtsavfpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtsavfpr.S -o $(T)crtsavfpr$(objext)
+
+$(T)crtresfpr$(objext): crtresfpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresfpr.S -o $(T)crtresfpr$(objext)
+
+$(T)crtsavgpr$(objext): crtsavgpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtsavgpr.S -o $(T)crtsavgpr$(objext)
+
+$(T)crtresgpr$(objext): crtresgpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresgpr.S -o $(T)crtresgpr$(objext)
+
+$(T)crtresxfpr$(objext): crtresxfpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresxfpr.S -o $(T)crtresxfpr$(objext)
+
+$(T)crtresxgpr$(objext): crtresxgpr.S
+ $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -c crtresxgpr.S -o $(T)crtresxgpr$(objext)
INSTALL_LIBGCC = install-multilib
EXTRA_MULTILIB_PARTS = crtbegin$(objext) crtend$(objext) \
crtbeginS$(objext) crtendS$(objext) crtbeginT$(objext)
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 sys/cdefs.h
-__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/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 sys/cdefs.h
-__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 sys/param.h
#include sys/systm.h
@@ -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/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 sys/cdefs.h
-__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/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 sys/cdefs.h
-__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/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 sys/cdefs.h -__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 dev/ic/aic79xx_osm.h #include dev/ic/aic79xx_inline.h @@ -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/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 sys/cdefs.h -__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 sys/param.h @@ -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/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 sys/cdefs.h
-__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/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/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 sys/cdefs.h -__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/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/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/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/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/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 bsd.init.mk
@@ -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/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/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 alloca.h 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 fcntl.h 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 inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the limits.h header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the machine/hal_sysinfo.h header file. */ +/* #undef
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/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/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/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/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/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 float.h 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 stdio.h #include math.h +#include float.h #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/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/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 \
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/powerpc
Module Name:src Committed By: mrg Date: Sun Jul 3 07:26:21 UTC 2011 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/powerpc: gmp.h Log Message: re-generate (add mpn_udiv_w_sdiv prototype.) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/gmp.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/lgpl3/gmp/lib/libgmp/arch/powerpc/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/gmp.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/gmp.h:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/gmp.h:1.1 Fri Jul 1 01:51:03 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/gmp.h Sun Jul 3 07:26:21 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/gpl3/gcc/lib
Module Name:src
Committed By: mrg
Date: Sun Jul 3 07:23:20 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib: Makefile.hacks
Log Message:
add sysroot-suffix.h to the fake headers.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/Makefile.hacks
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/lib/Makefile.hacks
diff -u src/external/gpl3/gcc/lib/Makefile.hacks:1.1 src/external/gpl3/gcc/lib/Makefile.hacks:1.2
--- src/external/gpl3/gcc/lib/Makefile.hacks:1.1 Fri Jul 1 01:24:53 2011
+++ src/external/gpl3/gcc/lib/Makefile.hacks Sun Jul 3 07:23:19 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.hacks,v 1.1 2011/07/01 01:24:53 mrg Exp $
+# $NetBSD: Makefile.hacks,v 1.2 2011/07/03 07:23:19 mrg Exp $
# some random crap we need in a few places
# these aren't necessary but are #include'd
-FAKEHEADERS= ${EXTRA_FAKEHEADERS} insn-flags.h insn-constants.h
+FAKEHEADERS= ${EXTRA_FAKEHEADERS} insn-flags.h insn-constants.h sysroot-suffix.h
${FAKEHEADERS}:
${_MKTARGET_CREATE}
touch ${.TARGET}
CVS commit: src/external/gpl3/gcc/lib/libgcc
Module Name:src
Committed By: mrg
Date: Sun Jul 3 08:35:42 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
- Makefile.hacks isn't working here; revert this portion for now.
- support ${COPTS.${.IMPSRC:T}} in the .c.pico rule
- add a hack for m68k and _fixunsxfdi, uses above
- add support to build LIB2ADD_ST stuff
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/libgcc/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/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.8 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.9
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.8 Fri Jul 1 10:04:13 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Sun Jul 3 08:35:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2011/07/01 10:04:13 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.9 2011/07/03 08:35:41 mrg Exp $
.if ${MKGCC} != no
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -151,21 +151,31 @@
.include ../Makefile.tconfigh
DPSRCS+= tconfig.h
-${SRCS}: unwind.h
+# XXX figure out why Makefile.hacks doesn't work
BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h
DPSRCS+= unwind.h
-.include ../../Makefile.hacks
-
-${SRCS}: options.h
-
-optionlist: ${G_ALL_OPT_FILES} ${GCCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
- ${TOOL_AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} \
- ${.TARGET}
-
-options.h: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/opth-gen.awk
- ${TOOL_AWK} -f ${DIST}/gcc/opt-functions.awk \
- -f ${DIST}/gcc/opth-gen.awk \
- optionlist ${.TARGET}
+# these aren't necessary but are #include'd
+FAKEHEADERS=options.h insn-flags.h insn-constants.h sysroot-suffix.h
+${FAKEHEADERS}:
+ ${_MKTARGET_CREATE}
+ touch ${.TARGET}
+DPSRCS+= ${FAKEHEADERS}
+CLEANFILES+= ${FAKEHEADERS}
+
+# XXX arm hack
+.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == armeb
+${SRCS}: insn-modes.h
+# XXX XXX
+${__DPSRCS.d}: insn-modes.h
+insn-modes.h:
+ ${_MKTARGET_CREATE}
+ echo enum machine_mode { X }; ${.TARGET}
+DPSRCS+= insn-modes.h
+CLEANFILES+= insn-modes.h
+.endif
-CLEANFILES+= options.h optionlist
+# XXX
+.if defined(HAVE_GCC) ${HAVE_GCC} == 45 ${MACHINE_ARCH} == m68k
+COPTS._fixunsxfdi.c+= -O0
+.endif
Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.1 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.2
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.1 Tue Jun 21 06:02:25 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sun Jul 3 08:35:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:25 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/03 08:35:42 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -14,11 +14,21 @@
.if !defined(MKNATIVE_LIBGCC_NEW)
SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
- ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS}
+ ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
.if ${MKPIC} == no
SRCS+= ${LIB2_EH}
.endif
+# These usually just have foo.S, we need to link from the
+# gcc/config/$PLATFORM/foo.asm to it. So far, only rs6000 uses it,
+# so we hack it for now.
+#.for file in ${G_LIB2ADD_ST}
+. if ${MACHINE_ARCH} == powerpc # XXX XXX why does the above work?*
+.for file in crtsavfpr.S crtresfpr.S crtsavgpr.S crtresgpr.S crtresxfpr.S crtresxgpr.S
+BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/rs6000/${file:S/.S$/.asm/} ${file}
+.endfor
+. endif
+
.else # defined(MKNATIVE_LIBGCC_NEW)
.include ../Makefile.srcs
@@ -41,7 +51,7 @@
.c.pico:
${_MKTARGET_COMPILE}
- ${COMPILE.c} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
+ ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print \t.hidden, $$3 }' | \
${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
CVS commit: src/external/gpl3/gcc/lib/libgcc/arch
Module Name:src
Committed By: mrg
Date: Sun Jul 3 08:44:40 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libgcc/arch: arm.mk powerpc.mk
Log Message:
regenerate
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/arch/arm.mk \
src/external/gpl3/gcc/lib/libgcc/arch/powerpc.mk
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/lib/libgcc/arch/arm.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/arm.mk:1.1 src/external/gpl3/gcc/lib/libgcc/arch/arm.mk:1.2
--- src/external/gpl3/gcc/lib/libgcc/arch/arm.mk:1.1 Fri Jul 1 01:57:04 2011
+++ src/external/gpl3/gcc/lib/libgcc/arch/arm.mk Sun Jul 3 08:44:40 2011
@@ -1,11 +1,12 @@
# This file is automatically generated. DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp
+# Generated from: NetBSD: mknative-gcc,v 1.58 2011/07/02 13:25:05 mrg Exp
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I/var/obj/shark/usr/src3/destdir.shark/usr/include -I/var/obj/shark/usr/src3/destdir.shark/usr/include -I/var/obj/shark/usr/src3/destdir.shark/usr/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf
G_LIB2ADD=${GNUHOSTDIST}/gcc/config/floatunsidf.c ${GNUHOSTDIST}/gcc/config/floatunsisf.c
G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
-G_LIB1ASMFUNCS=_thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi _thumb1_case_uhi _thumb1_case_si
+G_LIB2ADD_ST=
+G_LIB1ASMFUNCS=_thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi _thumb1_case_uhi _thumb1_case_si _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
G_LIB1ASMSRC=arm/lib1funcs.asm
G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
G_LIB2FUNCS_ST=_eprintf __gcc_bcmp
Index: src/external/gpl3/gcc/lib/libgcc/arch/powerpc.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/powerpc.mk:1.1 src/external/gpl3/gcc/lib/libgcc/arch/powerpc.mk:1.2
--- src/external/gpl3/gcc/lib/libgcc/arch/powerpc.mk:1.1 Fri Jul 1 01:57:05 2011
+++ src/external/gpl3/gcc/lib/libgcc/arch/powerpc.mk Sun Jul 3 08:44:40 2011
@@ -1,10 +1,11 @@
# This file is automatically generated. DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp
+# 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
#
G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I/var/obj/ofppc/usr/src3/destdir.ofppc/usr/include -I/var/obj/ofppc/usr/src3/destdir.ofppc/usr/include -I/var/obj/ofppc/usr/src3/destdir.ofppc/usr/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf
G_LIB2ADD=${GNUHOSTDIST}/gcc/config/rs6000/tramp.asm
G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+G_LIB2ADD_ST=crtsavfpr.S crtresfpr.S crtsavgpr.S crtresgpr.S crtresxfpr.S crtresxgpr.S
G_LIB1ASMFUNCS=
G_LIB1ASMSRC=
G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc
Module Name:src Committed By: mrg Date: Sun Jul 3 08:45:42 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: c++config.h config.h Log Message: regenerate. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/config.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/lib/libstdc++-v3/arch/powerpc/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.3 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.2 Fri Jul 1 05:10:28 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h Sun Jul 3 08:45:42 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.56 2011/07/01 01:27:17 mrg Exp */ +/* 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 */ // Predefined symbols and macros -*- C++ -*- @@ -499,7 +499,7 @@ /* #undef _GLIBCXX_HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -#define _GLIBCXX_HAVE_FENV_H 1 +/* #undef _GLIBCXX_HAVE_FENV_H */ /* Define to 1 if you have the `finite' function. */ #define _GLIBCXX_HAVE_FINITE 1 @@ -788,7 +788,7 @@ /* #undef _GLIBCXX_HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -#define _GLIBCXX_HAVE_TGMATH_H 1 +/* #undef _GLIBCXX_HAVE_TGMATH_H */ /* Define to 1 if the target supports thread-local storage. */ /* #undef _GLIBCXX_HAVE_TLS */ Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/config.h:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/config.h:1.3 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/config.h:1.2 Fri Jul 1 05:10:28 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/config.h Sun Jul 3 08:45:42 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.56 2011/07/01 01:27:17 mrg Exp */ +/* 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.h.in by configure. */ @@ -120,7 +120,7 @@ /* #undef HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -#define HAVE_FENV_H 1 +/* #undef HAVE_FENV_H */ /* Define to 1 if you have the `finite' function. */ #define HAVE_FINITE 1 @@ -409,7 +409,7 @@ /* #undef HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -#define HAVE_TGMATH_H 1 +/* #undef HAVE_TGMATH_H */ /* Define to 1 if the target supports thread-local storage. */ /* #undef HAVE_TLS */
CVS commit: src/sys/rump/librump/rumpkern/arch/powerpc
Module Name:src Committed By: mrg Date: Sun Jul 3 08:53:24 UTC 2011 Added Files: src/sys/rump/librump/rumpkern/arch/powerpc: Makefile.inc Log Message: define ARCH_ELFSIZE=32 and add kobj_stubs.c rumpcpu_generic.c. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc diff -u /dev/null src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc:1.1 --- /dev/null Sun Jul 3 08:53:24 2011 +++ src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc Sun Jul 3 08:53:23 2011 @@ -0,0 +1,4 @@ +# $NetBSD: Makefile.inc,v 1.1 2011/07/03 08:53:23 mrg Exp $ + +CPPFLAGS+= -DARCH_ELFSIZE=32 +SRCS+= kobj_stubs.c rumpcpu_generic.c
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src Committed By: mrg Date: Sun Jul 3 08:56:25 UTC 2011 Modified Files: src/sys/arch/vax/boot/boot: if_ni.c Log Message: avoid some multi-level pointer cast issues. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/boot/boot/if_ni.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/boot/boot/if_ni.c diff -u src/sys/arch/vax/boot/boot/if_ni.c:1.8 src/sys/arch/vax/boot/boot/if_ni.c:1.9 --- src/sys/arch/vax/boot/boot/if_ni.c:1.8 Mon Oct 26 19:16:58 2009 +++ src/sys/arch/vax/boot/boot/if_ni.c Sun Jul 3 08:56:25 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ni.c,v 1.8 2009/10/26 19:16:58 cegger Exp $ */ +/* $NetBSD: if_ni.c,v 1.9 2011/07/03 08:56:25 mrg Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -194,6 +194,7 @@ struct ni_msg *msg; struct ni_ptdb *ptdb; int i, va, res; + struct ni_param *nip; if (beenhere++ askname == 0) return 0; @@ -368,7 +369,8 @@ msg-nm_status = 0; msg-nm_len = sizeof(struct ni_param) + 6; msg-nm_opcode2 = NI_WPARAM; - ((struct ni_param *)msg-nm_text[0])-np_flags = NP_PAD; + nip = (struct ni_param *)msg-nm_text[0]; + nip-np_flags = NP_PAD; puton(msg, gvp-nc_forw0, PCR_CMDQNE|PCR_CMDQ0|PCR_OWN); @@ -383,8 +385,7 @@ insput(data, fqb-nf_mforw, PCR_FREEQNE|PCR_MFREEQ|PCR_OWN); } #endif - bcopy(((struct ni_param *)msg-nm_text[0])-np_dpa, - enaddr, ETHER_ADDR_LEN); + bcopy(nip-np_dpa, enaddr, ETHER_ADDR_LEN); insput(data, fqb-nf_mforw, PCR_FREEQNE|PCR_MFREEQ|PCR_OWN); #ifdef NIDEBUG
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Sun Jul 3 08:57:43 UTC 2011
Modified Files:
src/sys/fs/puffs: puffs_msgif.c
src/sys/kern: sys_process.c
Log Message:
avoid some uninitialised variable warnings from GCC.
at least the puffs one seems valid, but i'm not 100% sure.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.156 -r1.157 src/sys/kern/sys_process.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/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.86 src/sys/fs/puffs/puffs_msgif.c:1.87
--- src/sys/fs/puffs/puffs_msgif.c:1.86 Sun Jun 12 03:35:54 2011
+++ src/sys/fs/puffs/puffs_msgif.c Sun Jul 3 08:57:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.86 2011/06/12 03:35:54 rmind Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.87 2011/07/03 08:57:43 mrg Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_msgif.c,v 1.86 2011/06/12 03:35:54 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_msgif.c,v 1.87 2011/07/03 08:57:43 mrg Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -603,8 +603,8 @@
uint8_t **data, size_t *dlen, void **parkptr)
{
struct puffs_mount *pmp = this;
- struct puffs_msgpark *park;
- struct puffs_req *preq;
+ struct puffs_msgpark *park = NULL;
+ struct puffs_req *preq = NULL;
int error;
error = 0;
Index: src/sys/kern/sys_process.c
diff -u src/sys/kern/sys_process.c:1.156 src/sys/kern/sys_process.c:1.157
--- src/sys/kern/sys_process.c:1.156 Thu Jul 1 02:38:31 2010
+++ src/sys/kern/sys_process.c Sun Jul 3 08:57:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_process.c,v 1.156 2010/07/01 02:38:31 rmind Exp $ */
+/* $NetBSD: sys_process.c,v 1.157 2011/07/03 08:57:43 mrg Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_process.c,v 1.156 2010/07/01 02:38:31 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_process.c,v 1.157 2011/07/03 08:57:43 mrg Exp $);
#include opt_ptrace.h
#include opt_ktrace.h
@@ -242,7 +242,7 @@
int resume_all;
ksiginfo_t ksi;
char *path;
- int len;
+ int len = 0;
error = 0;
req = SCARG(uap, req);
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: mrg Date: Sun Jul 3 09:08:55 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc: config.gcc Log Message: set default_m68k_cpu for our m68* ports. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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.5 src/external/gpl3/gcc/dist/gcc/config.gcc:1.6 --- src/external/gpl3/gcc/dist/gcc/config.gcc:1.5 Sun Jul 3 06:39:22 2011 +++ src/external/gpl3/gcc/dist/gcc/config.gcc Sun Jul 3 09:08:55 2011 @@ -1640,10 +1640,10 @@ m68010*) target_cpu_default=0 tmake_file=m68k/t-m68kelf + default_m68k_cpu=68010 ;; *) - target_cpu_default=MASK_68020|MASK_68881|MASK_BITFIELD - #default_m68k_cpu=68020 + default_m68k_cpu=68020 ;; esac ;;
CVS commit: src/external/gpl3/gcc/dist/gcc/config/m68k
Module Name:src Committed By: mrg Date: Sun Jul 3 09:10:42 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc/config/m68k: netbsd-elf.h Log Message: don't use the netbsd LIBGCC_SPEC on sun2. there's no libgcc_pic.a To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ 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.2 src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.3 --- src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.2 Sat Jul 2 13:18:39 2011 +++ src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h Sun Jul 3 09:10:42 2011 @@ -85,6 +85,11 @@ #undef LINK_SPEC #define LINK_SPEC NETBSD_LINK_SPEC_ELF +/* NetBSD/sun2 does not support shlibs, avoid using libgcc_pic. */ +#if TARGET_DEFAULT_CPU == 0 +#undef REAL_LIBGCC_SPEC +#endif + #define NETBSD_ENTRY_POINT _start /* Output assembler code to FILE to increment profiler label # LABELNO
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: mrg Date: Sun Jul 3 10:34:25 UTC 2011 Modified Files: src/sys/arch/mips/include: mcontext.h Log Message: s/#elif/#else/ -- when there's nothing to check. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mips/include/mcontext.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/mips/include/mcontext.h diff -u src/sys/arch/mips/include/mcontext.h:1.17 src/sys/arch/mips/include/mcontext.h:1.18 --- src/sys/arch/mips/include/mcontext.h:1.17 Tue Mar 15 07:33:36 2011 +++ src/sys/arch/mips/include/mcontext.h Sun Jul 3 10:34:25 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mcontext.h,v 1.17 2011/03/15 07:33:36 matt Exp $ */ +/* $NetBSD: mcontext.h,v 1.18 2011/07/03 10:34:25 mrg Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -182,7 +182,7 @@ #elif __mips_n64 #define __UCONTEXT_SIZE __UCONTEXT_SIZE_N64 #define __UCONTEXT32_SIZE __UCONTEXT_SIZE_N32 -#elif +#else #error O64 is not supported #endif
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: mrg Date: Sun Jul 3 10:41:37 UTC 2011 Modified Files: src/sys/arch/mips/include: stdarg.h Log Message: add GCC 4.5 support. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mips/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/mips/include/stdarg.h diff -u src/sys/arch/mips/include/stdarg.h:1.29 src/sys/arch/mips/include/stdarg.h:1.30 --- src/sys/arch/mips/include/stdarg.h:1.29 Mon Dec 14 00:46:05 2009 +++ src/sys/arch/mips/include/stdarg.h Sun Jul 3 10:41:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stdarg.h,v 1.29 2009/12/14 00:46:05 matt Exp $ */ +/* $NetBSD: stdarg.h,v 1.30 2011/07/03 10:41:37 mrg Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -48,7 +48,11 @@ #elif __GNUC_PREREQ__(3, 0) +#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(ap, type) __builtin_va_arg((ap), type) #define va_end(ap) __builtin_va_end((ap)) #define __va_copy(dest, src) __builtin_va_copy((dest), (src))
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Jul 3 12:11:33 UTC 2011
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
-I$DESTDIR/usr/include is escaping into the generated files from
the native-gcc run. add some sed commands to remove them.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/tools/gcc/Makefile
cvs rdiff -u -r1.59 -r1.60 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/Makefile
diff -u src/tools/gcc/Makefile:1.42 src/tools/gcc/Makefile:1.43
--- src/tools/gcc/Makefile:1.42 Fri Jul 1 01:27:17 2011
+++ src/tools/gcc/Makefile Sun Jul 3 12:11:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/07/01 01:27:17 mrg Exp $
+# $NetBSD: Makefile,v 1.43 2011/07/03 12:11:32 mrg Exp $
.include bsd.own.mk
@@ -116,12 +116,14 @@
bootstrap-libgcc: .configure_done
@echo 'Creating files needed for libgcc by a native bootstrap build.'
@MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MODULE} \
- ${.OBJDIR}/build ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM}
+ ${.OBJDIR}/build ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
+ ${DESTDIR}
native-gcc: .native/.configure_done
@echo 'Extracting GNU GCC configury for a native toolchain.'
@MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \
- ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM}
+ ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
+ ${DESTDIR}
NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
.if ${HAVE_GCC} = 45
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.59 src/tools/gcc/mknative-gcc:1.60
--- src/tools/gcc/mknative-gcc:1.59 Sun Jul 3 06:47:12 2011
+++ src/tools/gcc/mknative-gcc Sun Jul 3 12:11:32 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.59 2011/07/03 06:47:12 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.60 2011/07/03 12:11:32 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -11,6 +11,7 @@
_TOP=$3
_PLATFORM=$4
_ABI=$5
+_DESTDIR=$6
_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ ]*,,'`
_GNU_DIST=`cd ${_VPATH}; pwd`
@@ -29,6 +30,7 @@
getvars gcc/Makefile \
INCLUDES CRTSTUFF_CFLAGS CRTSTUFF_T_CFLAGS \
tm_defines xm_file xm_defines \
+ | sed s,-I$_DESTDIR/usr/include,, \
| write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH.mk
}
@@ -387,7 +389,8 @@
SHLIB_MAPFILES SHLIB_NM_FLAGS \
EXTRA_HEADERS xm_defines \
tm_defines ${_extravars}
- } | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH.mk
+ } | sed s,-I$_DESTDIR/usr/include,, \
+ | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH.mk
# Generate new style files.
if [ -n ${MKNATIVE_LIBGCC_NEW} ]; then
@@ -569,7 +572,8 @@
GTFILES GTFILES_LANG_DIR_NAMES \
tm_defines host_xm_file host_xm_defines tm_p_file \
target_cpu_default ${_extravars} ${_extravars2} \
- lang_specs_files ${_extravars3}
+ lang_specs_files ${_extravars3} \
+| sed s,-I$_DESTDIR/usr/include,, \
getvars gcc/Makefile \
LIB2ADDEHDEP | sed 's/unwind.inc//'
getvars gcc/Makefile \
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Jul 3 12:26:03 UTC 2011
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
fix the previous
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 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.60 src/tools/gcc/mknative-gcc:1.61
--- src/tools/gcc/mknative-gcc:1.60 Sun Jul 3 12:11:32 2011
+++ src/tools/gcc/mknative-gcc Sun Jul 3 12:26:02 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.60 2011/07/03 12:11:32 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -10,11 +10,16 @@
_TMPDIR=$2
_TOP=$3
_PLATFORM=$4
-_ABI=$5
-_DESTDIR=$6
+_DESTDIR=$5
+_ABI=$6
_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ ]*,,'`
_GNU_DIST=`cd ${_VPATH}; pwd`
+if [ -z $_DESTDIR ]; then
+ echo \$_DESTDIR is empty 21
+ exit 1
+fi
+
. $_TOP/tools/gcc/mknative.common
# default to GCC 4.1 for now
@@ -30,7 +35,7 @@
getvars gcc/Makefile \
INCLUDES CRTSTUFF_CFLAGS CRTSTUFF_T_CFLAGS \
tm_defines xm_file xm_defines \
- | sed s,-I$_DESTDIR/usr/include,, \
+ | sed s,-I$_DESTDIR/usr/include,,g \
| write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH.mk
}
@@ -389,7 +394,7 @@
SHLIB_MAPFILES SHLIB_NM_FLAGS \
EXTRA_HEADERS xm_defines \
tm_defines ${_extravars}
- } | sed s,-I$_DESTDIR/usr/include,, \
+ } | sed s,-I$_DESTDIR/usr/include,,g \
| write_mk $_OUTDIRBASE/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH.mk
# Generate new style files.
@@ -573,7 +578,7 @@
tm_defines host_xm_file host_xm_defines tm_p_file \
target_cpu_default ${_extravars} ${_extravars2} \
lang_specs_files ${_extravars3} \
-| sed s,-I$_DESTDIR/usr/include,, \
+| sed s,-I$_DESTDIR/usr/include,,g
getvars gcc/Makefile \
LIB2ADDEHDEP | sed 's/unwind.inc//'
getvars gcc/Makefile \
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: mrg
Date: Sun Jul 3 13:05:19 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
Log Message:
for mips, MASK_SOFT_FLOAT has become MASK_SOFT_FLOAT_ABI.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/external/gpl3/gcc/dist/gcc/config.gcc:1.7
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.6 Sun Jul 3 09:08:55 2011
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Sun Jul 3 13:05:19 2011
@@ -1762,7 +1762,7 @@
esac
;;
mips64*-*-netbsd*) # NetBSD/mips64, either endian.
- target_cpu_default=MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SOFT_FLOAT
+ target_cpu_default=MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SOFT_FLOAT_ABI
tm_file=elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h mips/netbsd64.h
tmake_file=${tmake_file} mips/t-netbsd64
# tm_defines=${tm_defines} MIPS_ISA_DEFAULT=64
CVS commit: src/external/gpl3/gcc/dist/gcc/config/mips
Module Name:src
Committed By: mrg
Date: Sun Jul 3 13:06:37 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/mips: netbsd64.h
Log Message:
undef DRIVER_SELF_SPECS before defining it.
also, insert BASE_DRIVER_SELF_SPECS into DRIVER_SELF_SPECS.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.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/mips/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h:1.1 src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h:1.2
--- src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h:1.1 Wed Jun 29 04:59:10 2011
+++ src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h Sun Jul 3 13:06:36 2011
@@ -22,9 +22,11 @@
/* Force the default endianness and ABI flags onto the command line
in order to make the other specs easier to write. */
+#undef DRIVER_SELF_SPECS
#define DRIVER_SELF_SPECS \
-%{!EB:%{!EL:%(endian_spec)}}, \
-%{!mabi=*: -mabi=n32}
+ BASE_DRIVER_SELF_SPECS \
+ %{!EB:%{!EL:%(endian_spec)}}, \
+ %{!mabi=*: -mabi=n32}
/* Define default target values. */
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: mrg Date: Sun Jul 3 14:09:58 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc: Makefile.in Log Message: avoid passing -I$DESTDIR/usr/include to the $HOST_CC. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/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/gpl3/gcc/dist/gcc/Makefile.in diff -u src/external/gpl3/gcc/dist/gcc/Makefile.in:1.4 src/external/gpl3/gcc/dist/gcc/Makefile.in:1.5 --- src/external/gpl3/gcc/dist/gcc/Makefile.in:1.4 Thu Jun 23 12:11:24 2011 +++ src/external/gpl3/gcc/dist/gcc/Makefile.in Sun Jul 3 14:09:57 2011 @@ -767,7 +767,7 @@ # Native linker and preprocessor flags. For x-fragment overrides. BUILD_LDFLAGS=@BUILD_LDFLAGS@ -BUILD_CPPFLAGS=$(ALL_CPPFLAGS) +BUILD_CPPFLAGS=$(BALL_CPPFLAGS) # Actual name to use when installing a native compiler. GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') @@ -982,6 +982,7 @@ # puts -I options in CPPFLAGS, our include files in the srcdir will always # win against random include files in /usr/include. ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) +BALL_CPPFLAGS = $(BINCLUDES) $(CPPFLAGS) # This is the variable to use when using $(COMPILER). ifneq ($(ENABLE_BUILD_WITH_CXX),yes) @@ -1043,6 +1044,10 @@ -I$(srcdir)/../include @INCINTL@ \ $(CPPINC) $(GMPINC) $(DECNUMINC) \ $(PPLINC) $(CLOOGINC) $(LIBELFINC) +BINCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \ + -I$(srcdir)/../include @INCINTL@ \ + $(CPPINC) $(DECNUMINC) \ + $(PPLINC) $(CLOOGINC) $(LIBELFINC) .c.o: $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $ $(OUTPUT_OPTION)
CVS commit: src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb
Module Name:src
Committed By: mrg
Date: Sun Jul 3 14:42:13 UTC 2011
Added Files:
src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb: sysroot-suffix.h
Log Message:
add missed generated file.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/sysroot-suffix.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/usr.bin/gcc/arch/sh3eb/sysroot-suffix.h
diff -u /dev/null src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/sysroot-suffix.h:1.1
--- /dev/null Sun Jul 3 14:42:13 2011
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/sysroot-suffix.h Sun Jul 3 14:42:13 2011
@@ -0,0 +1,16 @@
+/* This file is automatically generated. DO NOT EDIT! */
+/* Generated from: NetBSD: mknative-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
+
+#undef SYSROOT_SUFFIX_SPEC
+#define SYSROOT_SUFFIX_SPEC \
+%{ml: \
+ %{m3|m4-nofpu|m4-100-nofpu|m4-200-nofpu|m4-400|m4-500|m4-340|m4-300-nofpu|m4al|m4a-nofpu:/ml/m3; \
+ m3e|m4-single-only|m4-100-single-only|m4-200-single-only|m4-300-single-only|m4a-single-only:/ml/m3e; \
+ m4|m4-100|m4-200|m4-300|m4a:/ml/m4; \
+ :/ml}; \
+: \
+ %{m3|m4-nofpu|m4-100-nofpu|m4-200-nofpu|m4-400|m4-500|m4-340|m4-300-nofpu|m4al|m4a-nofpu:/m3; \
+ m3e|m4-single-only|m4-100-single-only|m4-200-single-only|m4-300-single-only|m4a-single-only:/m3e; \
+ m4|m4-100|m4-200|m4-300|m4a:/m4; \
+ :}}
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: mrg Date: Sun Jul 3 15:24:49 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: mark all the ld.elf_so tests as mkpic. To generate a diff of this commit: cvs rdiff -u -r1.357 -r1.358 src/distrib/sets/lists/tests/mi 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.357 src/distrib/sets/lists/tests/mi:1.358 --- src/distrib/sets/lists/tests/mi:1.357 Sun Jul 3 15:05:43 2011 +++ src/distrib/sets/lists/tests/mi Sun Jul 3 15:24:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.357 2011/07/03 15:05:43 jruoho Exp $ +# $NetBSD: mi,v 1.358 2011/07/03 15:24:49 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2232,41 +2232,41 @@ ./usr/tests/libexectests-lib-tests ./usr/tests/libexec/Atffile tests-lib-tests atf ./usr/tests/libexec/ld.elf_so tests-libexec-tests -./usr/tests/libexec/ld.elf_so/Atffile tests-libexec-tests atf +./usr/tests/libexec/ld.elf_so/Atffile tests-libexec-tests atf,pic ./usr/tests/libexec/ld.elf_so/data tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v0 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v2 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v0 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v2 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v0 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v2 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v0 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v2 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v0 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v2 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v0 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v2 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/h_df_1_noopen1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/h_df_1_noopen2 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/h_dl_symver_v0 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/h_dl_symver_v1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/h_dl_symver_v2 tests-libexec-tests atf +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v0 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v1 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v2 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v0 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v1 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v2 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v0 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v1 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v2 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v0 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v1 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v2 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v0 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v1 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v2 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v0 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v1 tests-libexec-tests atf,pic +./usr/tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v2 tests-libexec-tests atf,pic
CVS commit: src/external/lgpl3/gmp/lib/libgmp
Module Name:src
Committed By: mrg
Date: Sun Jul 3 15:25:11 UTC 2011
Modified Files:
src/external/lgpl3/gmp/lib/libgmp: Makefile
Log Message:
clean up another generator.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.7
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.6 Sat Jul 2 14:04:30 2011
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Sun Jul 3 15:25:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/07/02 14:04:30 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/07/03 15:25:11 mrg Exp $
.include bsd.init.mk
@@ -173,7 +173,7 @@
${HOST_CC} -o ${.OBJDIR}/gen-psqr ${.ALLSRC}
${.OBJDIR}/gen-psqr ${GMP_LIMB_BITS} 0 ${.OBJDIR}/perfsqr.h
-CLEANFILES+= ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr
+CLEANFILES+= ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr gen-trialdivtab
.if defined(MLIBDIR)
LIBGMP_MACHINE_ARCH:=${MLIBDIR}
CVS commit: src/gnu/dist/gdb6/gdb
Module Name:src
Committed By: mrg
Date: Sun Jul 3 15:26:06 UTC 2011
Modified Files:
src/gnu/dist/gdb6/gdb: breakpoint.c
Log Message:
apply some (uintptr_t) between pointers, ints and other casts.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gdb6/gdb/breakpoint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gdb6/gdb/breakpoint.c
diff -u src/gnu/dist/gdb6/gdb/breakpoint.c:1.1.1.2 src/gnu/dist/gdb6/gdb/breakpoint.c:1.2
--- src/gnu/dist/gdb6/gdb/breakpoint.c:1.1.1.2 Sun Jul 2 20:13:24 2006
+++ src/gnu/dist/gdb6/gdb/breakpoint.c Sun Jul 3 15:26:06 2011
@@ -1327,7 +1327,7 @@
(b-type == bp_catch_vfork) ||
(b-type == bp_catch_fork))
{
- b-loc-address = (CORE_ADDR) NULL;
+ b-loc-address = (CORE_ADDR) (uintptr_t) NULL;
continue;
}
@@ -1380,7 +1380,7 @@
unnecessary. A call to breakpoint_re_set_one always recomputes
the breakpoint's address from scratch, or deletes it if it can't.
So I think this assignment could be deleted without effect. */
-b-loc-address = (CORE_ADDR) NULL;
+b-loc-address = (CORE_ADDR) (uintptr_t) NULL;
}
/* FIXME what about longjmp breakpoints? Re-create them here? */
create_overlay_event_breakpoint (_ovly_debug_event);
CVS commit: src/lib/libc/softfloat
Module Name:src
Committed By: mrg
Date: Sun Jul 3 15:26:58 UTC 2011
Modified Files:
src/lib/libc/softfloat: Makefile.inc
Log Message:
mips wants some -Wno-enum-compare here, too.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/softfloat/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/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.8 src/lib/libc/softfloat/Makefile.inc:1.9
--- src/lib/libc/softfloat/Makefile.inc:1.8 Fri Jul 1 01:25:52 2011
+++ src/lib/libc/softfloat/Makefile.inc Sun Jul 3 15:26:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2011/07/01 01:25:52 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.9 2011/07/03 15:26:58 mrg Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@@ -21,6 +21,7 @@
# XXX
.if defined(HAVE_GCC) ${HAVE_GCC} = 45 \
-(${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == armeb)
+(${MACHINE_CPU} == arm || \
+ ${MACHINE_CPU} == mips)
COPTS.softfloat.c+= -Wno-enum-compare
.endif
CVS commit: src/usr.bin/less
Module Name:src
Committed By: mrg
Date: Sun Jul 3 15:28:47 UTC 2011
Modified Files:
src/usr.bin/less: Makefile.inc
Log Message:
upgrade less to WARNS=2 with -Wno-shadow.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/less/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/usr.bin/less/Makefile.inc
diff -u src/usr.bin/less/Makefile.inc:1.4 src/usr.bin/less/Makefile.inc:1.5
--- src/usr.bin/less/Makefile.inc:1.4 Tue Apr 14 22:15:22 2009
+++ src/usr.bin/less/Makefile.inc Sun Jul 3 15:28:47 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/04/14 22:15:22 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.5 2011/07/03 15:28:47 mrg Exp $
-WARNS?= 1 # many -Wshadow -Wcast-qual other issues
+WARNS?= 2
.if exists(${.CURDIR}/../../Makefile.inc)
.include ${.CURDIR}/../../Makefile.inc
.endif
-CWARNFLAGS+= -Wno-strict-prototypes -Wno-missing-prototypes
+CWARNFLAGS+= -Wno-strict-prototypes -Wno-missing-prototypes -Wno-shadow
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sun Jul 3 15:29:35 UTC 2011
Modified Files:
src/games/phantasia: Makefile
src/sbin/fsdb: Makefile
src/sys/lib/libsa: Makefile
src/sys/lib/libz: Makefile
Log Message:
apply some -O0 with gcc 4.5 and vax.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/games/phantasia/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.74 -r1.75 src/sys/lib/libsa/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/lib/libz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/phantasia/Makefile
diff -u src/games/phantasia/Makefile:1.34 src/games/phantasia/Makefile:1.35
--- src/games/phantasia/Makefile:1.34 Sat Feb 6 23:45:25 2010
+++ src/games/phantasia/Makefile Sun Jul 3 15:29:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/02/06 23:45:25 he Exp $
+# $NetBSD: Makefile,v 1.35 2011/07/03 15:29:34 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include bsd.own.mk
@@ -52,3 +52,7 @@
./map | plot /dev/tty
.include bsd.prog.mk
+
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45 ${MACHINE_ARCH} == vax
+COPTS.misc.c+= -O0
+.endif
Index: src/sbin/fsdb/Makefile
diff -u src/sbin/fsdb/Makefile:1.30 src/sbin/fsdb/Makefile:1.31
--- src/sbin/fsdb/Makefile:1.30 Wed Jun 22 02:49:43 2011
+++ src/sbin/fsdb/Makefile Sun Jul 3 15:29:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/06/22 02:49:43 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2011/07/03 15:29:35 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
WARNS?= 3 # XXX: sign-compare issues in ../fsck_ffs
@@ -46,6 +46,9 @@
.include bsd.prog.mk
# XXX
-.if ${HAVE_GCC} == 45
+.if defined(HAVE_GCC) ${HAVE_GCC} == 45
COPTS.fsdb.c+= -Wno-error
+.if ${MACHINE_ARCH} == vax
+COPTS.fsdb.c+= -O0
+.endif
.endif
Index: src/sys/lib/libsa/Makefile
diff -u src/sys/lib/libsa/Makefile:1.74 src/sys/lib/libsa/Makefile:1.75
--- src/sys/lib/libsa/Makefile:1.74 Mon Jun 20 08:22:43 2011
+++ src/sys/lib/libsa/Makefile Sun Jul 3 15:29:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2011/06/20 08:22:43 mrg Exp $
+# $NetBSD: Makefile,v 1.75 2011/07/03 15:29:35 mrg Exp $
LIB= sa
NOPIC= # defined
@@ -88,3 +88,7 @@
.if defined(HAVE_GCC) || defined(HAVE_PCC)
CPPFLAGS+= -Wno-pointer-sign
.endif
+
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45 ${MACHINE_ARCH} == vax
+COPTS.bootp.c+= -O0
+.endif
Index: src/sys/lib/libz/Makefile
diff -u src/sys/lib/libz/Makefile:1.16 src/sys/lib/libz/Makefile:1.17
--- src/sys/lib/libz/Makefile:1.16 Wed Mar 25 18:41:06 2009
+++ src/sys/lib/libz/Makefile Sun Jul 3 15:29:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/03/25 18:41:06 tls Exp $
+# $NetBSD: Makefile,v 1.17 2011/07/03 15:29:35 mrg Exp $
LIB= z
NOPIC= # defined
@@ -32,3 +32,7 @@
@echo building standard ${LIB} library
@rm -f lib${LIB}.o
@${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort`
+
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45 ${MACHINE_ARCH} == vax
+COPTS.inftrees.c+= -O0
+.endif
CVS commit: src/gnu/usr.bin/gdb6/libgdb
Module Name:src
Committed By: mrg
Date: Sun Jul 3 15:26:25 UTC 2011
Modified Files:
src/gnu/usr.bin/gdb6/libgdb: Makefile
Log Message:
apply some -O0 for sun2.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/gnu/usr.bin/gdb6/libgdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gdb6/libgdb/Makefile
diff -u src/gnu/usr.bin/gdb6/libgdb/Makefile:1.11 src/gnu/usr.bin/gdb6/libgdb/Makefile:1.12
--- src/gnu/usr.bin/gdb6/libgdb/Makefile:1.11 Sun Apr 10 16:47:04 2011
+++ src/gnu/usr.bin/gdb6/libgdb/Makefile Sun Jul 3 15:26:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/04/10 16:47:04 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2011/07/03 15:26:25 mrg Exp $
.include bsd.own.mk
@@ -44,3 +44,7 @@
.if ${MACHINE} == amiga
COPTS.dwarf2-frame.c+=-O1
.endif
+
+.if defined(HAVE_GCC) HAVE_GCC == 4 ${MACHINE} == sun2
+COPTS.dwarf2-frame.c+=-O0
+.endif
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: mrg Date: Sun Jul 3 15:34:09 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: elf.h Log Message: netbsd needs __floatundisf; make it so. (should we have this elsewhere?) To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/config/arm/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/arm/elf.h diff -u src/external/gpl3/gcc/dist/gcc/config/arm/elf.h:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/arm/elf.h:1.2 --- src/external/gpl3/gcc/dist/gcc/config/arm/elf.h:1.1.1.1 Tue Jun 21 01:22:19 2011 +++ src/external/gpl3/gcc/dist/gcc/config/arm/elf.h Sun Jul 3 15:34:08 2011 @@ -161,6 +161,8 @@ #undef L_floatdidf #undef L_floatdisf #undef L_floatundidf +/* XXXMRG: don't take this out, we need it! */ +# ifndef __NetBSD__ #undef L_floatundisf +# endif #endif -
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Sun Jul 3 16:14:37 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/crtstuff/arch: m68000.mk m68k.mk
src/external/gpl3/gcc/lib/libgcc/arch: m68000.mk m68k.mk
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: c++config.h config.h
src/external/gpl3/gcc/usr.bin/gcc/arch/m68000: defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/m68k: defs.mk tm.h
Log Message:
regenerate the m68* descriptions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk \
src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/arch/m68000.mk \
src/external/gpl3/gcc/lib/libgcc/arch/m68k.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/defs.mk
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/defs.mk \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/tm.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/lib/crtstuff/arch/m68000.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk:1.1 src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk:1.2
--- src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk:1.1 Sun Jul 3 06:52:14 2011
+++ src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk Sun Jul 3 16:14:36 2011
@@ -1,9 +1,9 @@
# This file is automatically generated. DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.58 2011/07/02 13:25:05 mrg Exp
+# Generated from: NetBSD: mknative-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
-G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I/var/obj/sun2/usr/src3/destdir.sun2/usr/include -I/var/obj/sun2/usr/src3/destdir.sun2/usr/include -I/var/obj/sun2/usr/src3/destdir.sun2/usr/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf
-G_CRTSTUFF_CFLAGS=-O2 -DIN_GCC -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I/var/obj/sun2/usr/src3/destdir.sun2/usr/include -I/var/obj/sun2/usr/src3/destdir.sun2/usr/include -I/var/obj/sun2/usr/src3/destdir.sun2/usr/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf -g0 -finhibit-size-directive -fno-inline -fno-exceptions -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize
+G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf
+G_CRTSTUFF_CFLAGS=-O2 -DIN_GCC -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf -g0 -finhibit-size-directive -fno-inline -fno-exceptions -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize
G_CRTSTUFF_T_CFLAGS=
G_tm_defines=NETBSD_ENABLE_PTHREADS MOTOROLA=1 USE_GAS=1
G_xm_file=
Index: src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk:1.1 src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk:1.2
--- src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk:1.1 Sat Jul 2 14:13:51 2011
+++ src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk Sun Jul 3 16:14:36 2011
@@ -1,10 +1,10 @@
# 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-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
-G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I/var/obj/mac68k/usr/src3/destdir.mac68k/usr/include -I/var/obj/mac68k/usr/src3/destdir.mac68k/usr/include -I/var/obj/mac68k/usr/src3/destdir.mac68k/usr/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Jul 3 22:47:25 UTC 2011 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.sparc64 src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.sparc64 Log Message: updates for GCC 4.5 components. sort. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/comp/md.sparc64 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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.56 src/distrib/sets/lists/base/ad.mips64eb:1.57 --- src/distrib/sets/lists/base/ad.mips64eb:1.56 Fri Jul 1 02:10:08 2011 +++ src/distrib/sets/lists/base/ad.mips64eb Sun Jul 3 22:47:24 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.56 2011/07/01 02:10:08 mrg Exp $ +# $NetBSD: ad.mips64eb,v 1.57 2011/07/03 22:47:24 mrg Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -99,6 +99,8 @@ ./usr/lib/64/libform.so.6.0 base-compat-shlib compat,pic ./usr/lib/64/libgcc_s.so.1 base-compat-shlib compat,pic ./usr/lib/64/libgcc_s.so.1.0 base-compat-shlib compat,pic +./usr/lib/64/libgmp.so.10 base-compat-shlib compat,pic,gcc=45 +./usr/lib/64/libgmp.so.10.2 base-compat-shlib compat,pic,gcc=45 ./usr/lib/64/libgnumalloc.so.1 base-compat-shlib compat,pic ./usr/lib/64/libgnumalloc.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/libgssapi.so.10 base-compat-shlib compat,pic,kerberos @@ -159,6 +161,10 @@ ./usr/lib/64/libmenu.so.6.0 base-compat-shlib compat,pic ./usr/lib/64/libmj.so.1base-compat-shlib compat,pic,crypto ./usr/lib/64/libmj.so.1.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libmpc.so.2 base-compat-shlib compat,pic,gcc=45 +./usr/lib/64/libmpc.so.2.0 base-compat-shlib compat,pic,gcc=45 +./usr/lib/64/libmpfr.so.4 base-compat-shlib compat,pic,gcc=45 +./usr/lib/64/libmpfr.so.4.1 base-compat-shlib compat,pic,gcc=45 ./usr/lib/64/libnetpgp.so.3 base-compat-shlib compat,pic,crypto ./usr/lib/64/libnetpgp.so.3.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libnpf.so.0 base-compat-shlib compat,pic,npf @@ -169,12 +175,10 @@ ./usr/lib/64/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils ./usr/lib/64/libossaudio.so.1 base-compat-shlib compat,pic ./usr/lib/64/libossaudio.so.1.0 base-compat-shlib compat,pic -./usr/lib/64/libpam.so.3 base-compat-shlib compat,pic,pam -./usr/lib/64/libpam.so.3.0 base-compat-shlib compat,pic,pam -./usr/lib/64/librefuse.so.2 base-compat-shlib compat,pic -./usr/lib/64/librefuse.so.2.0 base-compat-shlib compat,pic ./usr/lib/64/libp2k.so.2 base-compat-shlib compat,pic ./usr/lib/64/libp2k.so.2.0 base-compat-shlib compat,pic +./usr/lib/64/libpam.so.3 base-compat-shlib compat,pic,pam +./usr/lib/64/libpam.so.3.0 base-compat-shlib compat,pic,pam ./usr/lib/64/libpcap.so.4 base-compat-shlib compat,pic ./usr/lib/64/libpcap.so.4.0 base-compat-shlib compat,pic ./usr/lib/64/libpci.so.2 base-compat-shlib compat,pic @@ -195,6 +199,8 @@ ./usr/lib/64/libquota.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/libradius.so.4 base-compat-shlib compat,pic ./usr/lib/64/libradius.so.4.0 base-compat-shlib compat,pic +./usr/lib/64/librefuse.so.2 base-compat-shlib compat,pic +./usr/lib/64/librefuse.so.2.0 base-compat-shlib compat,pic ./usr/lib/64/libresolv.so.2 base-compat-shlib compat,pic ./usr/lib/64/libresolv.so.2.0 base-compat-shlib compat,pic ./usr/lib/64/libroken.so.19 base-compat-shlib compat,pic,kerberos @@ -207,16 +213,16 @@ ./usr/lib/64/librump.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpclient.so.0 base-compat-shlib compat,pic ./usr/lib/64/librumpclient.so.0.0 base-compat-shlib compat,pic -./usr/lib/64/librumpnet.so.0 base-compat-shlib compat,pic -./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic -./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic -./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic -./usr/lib/64/librumphijack.so.0 base-compat-shlib compat,pic -./usr/lib/64/librumphijack.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpcrypto.so.0 base-obsolete obsolete ./usr/lib/64/librumpcrypto.so.0.0 base-obsolete obsolete ./usr/lib/64/librumpdev.so.0 base-compat-shlib compat,pic ./usr/lib/64/librumpdev.so.0.0 base-compat-shlib compat,pic +./usr/lib/64/librumphijack.so.0 base-compat-shlib compat,pic +./usr/lib/64/librumphijack.so.0.0 base-compat-shlib compat,pic
CVS commit: src/lib/libc/softfloat
Module Name:src
Committed By: mrg
Date: Mon Jul 4 02:53:15 UTC 2011
Modified Files:
src/lib/libc/softfloat: Makefile.inc
Log Message:
sh3 also needs -Wno-enum-compare here.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/softfloat/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/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.9 src/lib/libc/softfloat/Makefile.inc:1.10
--- src/lib/libc/softfloat/Makefile.inc:1.9 Sun Jul 3 15:26:58 2011
+++ src/lib/libc/softfloat/Makefile.inc Mon Jul 4 02:53:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2011/07/03 15:26:58 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.10 2011/07/04 02:53:15 mrg Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@@ -22,6 +22,7 @@
# XXX
.if defined(HAVE_GCC) ${HAVE_GCC} = 45 \
(${MACHINE_CPU} == arm || \
- ${MACHINE_CPU} == mips)
+ ${MACHINE_CPU} == mips || \
+ ${MACHINE_CPU} == sh3)
COPTS.softfloat.c+= -Wno-enum-compare
.endif
CVS commit: src/lib/libc/rpc
Module Name:src
Committed By: mrg
Date: Mon Jul 4 11:01:41 UTC 2011
Modified Files:
src/lib/libc/rpc: xdr_sizeof.c
Log Message:
insert some (uintptr_t) between int and pointer casts.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/rpc/xdr_sizeof.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/libc/rpc/xdr_sizeof.c
diff -u src/lib/libc/rpc/xdr_sizeof.c:1.1 src/lib/libc/rpc/xdr_sizeof.c:1.2
--- src/lib/libc/rpc/xdr_sizeof.c:1.1 Mon Jul 4 07:54:38 2011
+++ src/lib/libc/rpc/xdr_sizeof.c Mon Jul 4 11:01:40 2011
@@ -39,7 +39,7 @@
#if 0
__FBSDID($FreeBSD: src/lib/libc/xdr/xdr_sizeof.c,v 1.5.38.1 2010/12/21 17:10:29 kensmith Exp $);
#else
-__RCSID($NetBSD: xdr_sizeof.c,v 1.1 2011/07/04 07:54:38 manu Exp $);
+__RCSID($NetBSD: xdr_sizeof.c,v 1.2 2011/07/04 11:01:40 mrg Exp $);
#endif
#include namespace.h
@@ -109,7 +109,7 @@
if (xdrs-x_op != XDR_ENCODE) {
return (NULL);
}
- if (len (u_int)xdrs-x_base) {
+ if (len (u_int)(uintptr_t)xdrs-x_base) {
/* x_private was already allocated */
xdrs-x_handy += len;
return ((int32_t *) xdrs-x_private);
@@ -121,7 +121,7 @@
xdrs-x_base = 0;
return (NULL);
}
- xdrs-x_base = (caddr_t) len;
+ xdrs-x_base = (caddr_t)(uintptr_t)len;
xdrs-x_handy += len;
return ((int32_t *) xdrs-x_private);
}
CVS commit: src/common/lib/libc/arch/sparc/string
Module Name:src Committed By: mrg Date: Mon Jul 4 11:18:23 UTC 2011 Modified Files: src/common/lib/libc/arch/sparc/string: ffs.S Log Message: add a weak alias from ffs to __ffssi2. sparc dynamic works with gcc 4.5 now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/sparc/string/ffs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/sparc/string/ffs.S diff -u src/common/lib/libc/arch/sparc/string/ffs.S:1.2 src/common/lib/libc/arch/sparc/string/ffs.S:1.3 --- src/common/lib/libc/arch/sparc/string/ffs.S:1.2 Sat Dec 19 19:09:48 2009 +++ src/common/lib/libc/arch/sparc/string/ffs.S Mon Jul 4 11:18:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.S,v 1.2 2009/12/19 19:09:48 pooka Exp $ */ +/* $NetBSD: ffs.S,v 1.3 2011/07/04 11:18:23 mrg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,7 +40,7 @@ #if 0 .asciz @(#)ffs.s 8.1 (Berkeley) 6/4/93 #else - RCSID($NetBSD: ffs.S,v 1.2 2009/12/19 19:09:48 pooka Exp $) + RCSID($NetBSD: ffs.S,v 1.3 2011/07/04 11:18:23 mrg Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -58,6 +58,7 @@ * one, we just return the table value plus 24. This means * that ffstab[0] must be -24 so that ffs(0) will return 0. */ +WEAK_ALIAS(__ffssi2,ffs) ENTRY(ffs) #ifdef PIC PICCY_SET(ffstab, %o2, %o3)
CVS commit: src
Module Name:src
Committed By: mrg
Date: Mon Jul 4 11:22:39 UTC 2011
Modified Files:
src/common/lib/libc/quad: quad.h
src/lib/libc/quad: Makefile.inc
Added Files:
src/lib/libc/quad: floatundisf.c
Log Message:
add support for __floatunsisf().
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/quad/quad.h
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/quad/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/quad/floatundisf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/quad/quad.h
diff -u src/common/lib/libc/quad/quad.h:1.2 src/common/lib/libc/quad/quad.h:1.3
--- src/common/lib/libc/quad/quad.h:1.2 Mon Jul 4 06:23:50 2011
+++ src/common/lib/libc/quad/quad.h Mon Jul 4 11:22:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quad.h,v 1.2 2011/07/04 06:23:50 matt Exp $ */
+/* $NetBSD: quad.h,v 1.3 2011/07/04 11:22:39 mrg Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -123,6 +123,7 @@
double __floatdidf __P((quad_t));
float __floatdisf __P((quad_t));
double __floatundidf __P((u_quad_t));
+float __floatundisf __P((u_quad_t));
quad_t __iordi3 __P((quad_t, quad_t));
quad_t __lshldi3 __P((quad_t, qshift_t));
quad_t __lshrdi3 __P((quad_t, qshift_t));
Index: src/lib/libc/quad/Makefile.inc
diff -u src/lib/libc/quad/Makefile.inc:1.12 src/lib/libc/quad/Makefile.inc:1.13
--- src/lib/libc/quad/Makefile.inc:1.12 Mon Jul 4 06:23:50 2011
+++ src/lib/libc/quad/Makefile.inc Mon Jul 4 11:22:39 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.12 2011/07/04 06:23:50 matt Exp $
+# $NetBSD: Makefile.inc,v 1.13 2011/07/04 11:22:39 mrg Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# Quad support
SRCS.quad= cmpdi2.c divdi3.c fixdfdi.c fixsfdi.c fixunsdfdi.c \
- fixunssfdi.c floatdidf.c floatdisf.c floatundidf.c \
+ fixunssfdi.c floatdidf.c floatdisf.c floatundisf.c floatundidf.c \
moddi3.c muldi3.c negdi2.c qdivrem.c \
ucmpdi2.c udivdi3.c umoddi3.c
Added files:
Index: src/lib/libc/quad/floatundisf.c
diff -u /dev/null src/lib/libc/quad/floatundisf.c:1.1
--- /dev/null Mon Jul 4 11:22:39 2011
+++ src/lib/libc/quad/floatundisf.c Mon Jul 4 11:22:39 2011
@@ -0,0 +1,71 @@
+/* $NetBSD: floatundisf.c,v 1.1 2011/07/04 11:22:39 mrg Exp $ */
+
+/*-
+ * Copyright (c) 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include sys/cdefs.h
+#if defined(LIBC_SCCS) !defined(lint)
+#if 0
+static char sccsid[] = @(#)floatdisf.c 8.1 (Berkeley) 6/4/93;
+#else
+__RCSID($NetBSD: floatundisf.c,v 1.1 2011/07/04 11:22:39 mrg Exp $);
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include quad.h
+
+/*
+ * Convert (unsigned) quad to float.
+ */
+float
+__floatundisf(u_quad_t x)
+{
+ float f;
+ union uu u;
+
+ u.q = x;
+
+ /*
+ * Now u.ul[H] has the factor of 2^32 (or whatever) and u.ul[L]
+ * has the units. Ideally we could just set f, add INT_BITS to
+ * its exponent, and then add the units, but this is portable
+ * code and does not know how to get at an exponent. Machine-
+ * specific code may be able to do this more efficiently.
+ *
+ * Using double here may be excessive paranoia.
+ */
+ f = (double)u.ul[H] * (((int)1 (INT_BITS - 2)) * 4.0);
+ f += u.ul[L];
+
+
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: mrg Date: Mon Jul 4 11:31:37 UTC 2011 Modified Files: src/sys/rump/librump/rumpvfs: rump_vfs.c Log Message: don't define multiple cwdi0's, mark this one as extern. fixes various mips build issues i've seen with both GCC 4.1 and 4.5. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/rump/librump/rumpvfs/rump_vfs.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/rump/librump/rumpvfs/rump_vfs.c diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.66 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.67 --- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.66 Sun Jun 12 03:35:59 2011 +++ src/sys/rump/librump/rumpvfs/rump_vfs.c Mon Jul 4 11:31:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_vfs.c,v 1.66 2011/06/12 03:35:59 rmind Exp $ */ +/* $NetBSD: rump_vfs.c,v 1.67 2011/07/04 11:31:37 mrg Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.66 2011/06/12 03:35:59 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.67 2011/07/04 11:31:37 mrg Exp $); #include sys/param.h #include sys/buf.h @@ -56,7 +56,7 @@ #include rump_private.h #include rump_vfs_private.h -struct cwdinfo cwdi0; +extern struct cwdinfo cwdi0; const char *rootfstype = ROOT_FSTYPE_ANY; static void
CVS commit: src/common/lib/libc/arch/mips/string
Module Name:src Committed By: mrg Date: Mon Jul 4 11:35:26 UTC 2011 Modified Files: src/common/lib/libc/arch/mips/string: ffs.S Log Message: add a weak alias from ffs to __ffssi2. newsmips kernels link now. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/mips/string/ffs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/mips/string/ffs.S diff -u src/common/lib/libc/arch/mips/string/ffs.S:1.3 src/common/lib/libc/arch/mips/string/ffs.S:1.4 --- src/common/lib/libc/arch/mips/string/ffs.S:1.3 Sun Jan 23 06:47:14 2011 +++ src/common/lib/libc/arch/mips/string/ffs.S Mon Jul 4 11:35:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.S,v 1.3 2011/01/23 06:47:14 matt Exp $ */ +/* $NetBSD: ffs.S,v 1.4 2011/07/04 11:35:26 mrg Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,13 +31,14 @@ #include mips/asm.h -RCSID($NetBSD: ffs.S,v 1.3 2011/01/23 06:47:14 matt Exp $) +RCSID($NetBSD: ffs.S,v 1.4 2011/07/04 11:35:26 mrg Exp $) /* bit = ffs(value) */ .text .set noreorder +WEAK_ALIAS(__ffssi2,ffs) #if __mips == 64 || __mips == 32 LEAF(ffs) #ifndef _LP64
CVS commit: src/lib
Module Name:src
Committed By: mrg
Date: Mon Jul 4 11:46:42 UTC 2011
Modified Files:
src/lib/libc/gdtoa: hdtoa.c
src/lib/libm/src: s_fmaxl.c s_fminl.c
Log Message:
avoid some uninitalised variable warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/gdtoa/hdtoa.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/s_fmaxl.c \
src/lib/libm/src/s_fminl.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/libc/gdtoa/hdtoa.c
diff -u src/lib/libc/gdtoa/hdtoa.c:1.8 src/lib/libc/gdtoa/hdtoa.c:1.9
--- src/lib/libc/gdtoa/hdtoa.c:1.8 Mon Mar 21 23:37:42 2011
+++ src/lib/libc/gdtoa/hdtoa.c Mon Jul 4 11:46:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdtoa.c,v 1.8 2011/03/21 23:37:42 enami Exp $ */
+/* $NetBSD: hdtoa.c,v 1.9 2011/07/04 11:46:41 mrg Exp $ */
/*-
* Copyright (c) 2004, 2005 David Schultz d...@freebsd.org
@@ -30,7 +30,7 @@
#if 0
__FBSDID($FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.4 2007/01/03 04:57:58 das Exp $);
#else
-__RCSID($NetBSD: hdtoa.c,v 1.8 2011/03/21 23:37:42 enami Exp $);
+__RCSID($NetBSD: hdtoa.c,v 1.9 2011/07/04 11:46:41 mrg Exp $);
#endif
#include float.h
@@ -261,6 +261,7 @@
char *s, *s0;
size_t bufsize;
+ memset(u, 0, sizeof u);
u.extu_ld = e;
*sign = u.extu_ext.ext_sign;
Index: src/lib/libm/src/s_fmaxl.c
diff -u src/lib/libm/src/s_fmaxl.c:1.2 src/lib/libm/src/s_fmaxl.c:1.3
--- src/lib/libm/src/s_fmaxl.c:1.2 Mon Mar 8 01:05:20 2010
+++ src/lib/libm/src/s_fmaxl.c Mon Jul 4 11:46:41 2011
@@ -25,11 +25,12 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: s_fmaxl.c,v 1.2 2010/03/08 01:05:20 snj Exp $);
+__RCSID($NetBSD: s_fmaxl.c,v 1.3 2011/07/04 11:46:41 mrg Exp $);
#ifdef notdef
__FBSDID($FreeBSD: src/lib/msun/src/s_fmaxl.c,v 1.1 2004/06/30 07:04:01 das Exp $);
#endif
+#include string.h
#include math.h
#include machine/ieee.h
@@ -39,6 +40,7 @@
{
union ieee_ext_u u[2];
+ memset(u, 0, sizeof u);
u[0].extu_ld = x;
u[0].extu_ext.ext_frach = ~0x8000;
u[1].extu_ld = y;
Index: src/lib/libm/src/s_fminl.c
diff -u src/lib/libm/src/s_fminl.c:1.2 src/lib/libm/src/s_fminl.c:1.3
--- src/lib/libm/src/s_fminl.c:1.2 Mon Mar 8 01:05:20 2010
+++ src/lib/libm/src/s_fminl.c Mon Jul 4 11:46:41 2011
@@ -25,12 +25,13 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: s_fminl.c,v 1.2 2010/03/08 01:05:20 snj Exp $);
+__RCSID($NetBSD: s_fminl.c,v 1.3 2011/07/04 11:46:41 mrg Exp $);
#ifdef notdef
__FBSDID($FreeBSD: src/lib/msun/src/s_fminl.c,v 1.1 2004/06/30 07:04:01 das Exp $);
#endif
#include math.h
+#include string.h
#include machine/ieee.h
#ifdef EXT_EXP_INFNAN
@@ -39,6 +40,7 @@
{
union ieee_ext_u u[2];
+ memset(u, 0, sizeof u);
u[0].extu_ld = x;
u[0].extu_ext.ext_frach = ~0x8000;
u[1].extu_ld = y;
CVS commit: src/external/lgpl3/gmp/lib/libgmp
Module Name:src
Committed By: mrg
Date: Mon Jul 4 12:00:15 UTC 2011
Modified Files:
src/external/lgpl3/gmp/lib/libgmp: Makefile
Log Message:
don't force LIBGMP_MACHINE_ARCH:=${MLIBDIR}.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.8
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.7 Sun Jul 3 15:25:11 2011
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Mon Jul 4 12:00:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/07/03 15:25:11 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2011/07/04 12:00:15 mrg Exp $
.include bsd.init.mk
@@ -176,7 +176,7 @@
CLEANFILES+= ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr gen-trialdivtab
.if defined(MLIBDIR)
-LIBGMP_MACHINE_ARCH:=${MLIBDIR}
+LIBGMP_MACHINE_ARCH?=${MLIBDIR}
.endif
LIBGMP_MACHINE_ARCH?=${MACHINE_ARCH}
CVS commit: src/compat/mips64
Module Name:src
Committed By: mrg
Date: Mon Jul 4 12:00:49 UTC 2011
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
Log Message:
the gmp/mpfr subdirs are mipsel/mipseb.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.5 -r1.6 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.5 src/compat/mips64/64/bsd.64.mk:1.6
--- src/compat/mips64/64/bsd.64.mk:1.5 Fri Jul 1 01:30:16 2011
+++ src/compat/mips64/64/bsd.64.mk Mon Jul 4 12:00:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.64.mk,v 1.5 2011/07/01 01:30:16 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
.if ${MACHINE_ARCH} == mips64eb
LD+= -m elf64btsmip
@@ -13,7 +13,7 @@
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
-LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
-LIBGMP_MACHINE_ARCH= ${MLIBDIR}
+LIBMPFR_MACHINE_ARCH= mipseb
+LIBGMP_MACHINE_ARCH= mipseb
.include ${.PARSEDIR}/../../Makefile.compat
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.5 src/compat/mips64/o32/bsd.o32.mk:1.6
--- src/compat/mips64/o32/bsd.o32.mk:1.5 Fri Jul 1 01:30:16 2011
+++ src/compat/mips64/o32/bsd.o32.mk Mon Jul 4 12:00:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.5 2011/07/01 01:30:16 mrg Exp $
+# $NetBSD: bsd.o32.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
.if ${MACHINE_ARCH} == mips64eb
LD+= -m elf32btsmip
@@ -13,7 +13,7 @@
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
-LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
-LIBGMP_MACHINE_ARCH= ${MLIBDIR}
+LIBMPFR_MACHINE_ARCH= mipsel
+LIBGMP_MACHINE_ARCH= mipsel
.include ${.PARSEDIR}/../../Makefile.compat
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el
Module Name:src Committed By: mrg Date: Mon Jul 4 12:01:56 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: c++config.h config.h Log Message: regenerate To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/config.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/lib/libstdc++-v3/arch/sh3el/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h:1.3 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h:1.2 Sun Jul 3 14:41:54 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h Mon Jul 4 12:01:56 2011 @@ -499,7 +499,7 @@ /* #undef _GLIBCXX_HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -#define _GLIBCXX_HAVE_FENV_H 1 +/* #undef _GLIBCXX_HAVE_FENV_H */ /* Define to 1 if you have the `finite' function. */ #define _GLIBCXX_HAVE_FINITE 1 @@ -662,7 +662,7 @@ /* #undef _GLIBCXX_HAVE_NAN_H */ /* Define if poll is available in poll.h. */ -/* #undef _GLIBCXX_HAVE_POLL */ +#define _GLIBCXX_HAVE_POLL 1 /* Define to 1 if you have the `powf' function. */ /* #undef _GLIBCXX_HAVE_POWF */ @@ -773,7 +773,7 @@ /* #undef _GLIBCXX_HAVE_S_IFREG */ /* Define if S_IFREG is available in sys/stat.h. */ -/* #undef _GLIBCXX_HAVE_S_ISREG */ +#define _GLIBCXX_HAVE_S_ISREG 1 /* Define to 1 if you have the `tanf' function. */ /* #undef _GLIBCXX_HAVE_TANF */ @@ -788,7 +788,7 @@ /* #undef _GLIBCXX_HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -#define _GLIBCXX_HAVE_TGMATH_H 1 +/* #undef _GLIBCXX_HAVE_TGMATH_H */ /* Define to 1 if the target supports thread-local storage. */ /* #undef _GLIBCXX_HAVE_TLS */ @@ -815,7 +815,7 @@ #define _GLIBCXX_HAVE_WCTYPE_H 1 /* Define if writev is available in sys/uio.h. */ -/* #undef _GLIBCXX_HAVE_WRITEV */ +#define _GLIBCXX_HAVE_WRITEV 1 /* Define to 1 if you have the `_acosf' function. */ /* #undef _GLIBCXX_HAVE__ACOSF */ Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/config.h:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/config.h:1.3 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/config.h:1.2 Sun Jul 3 14:41:54 2011 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/config.h Mon Jul 4 12:01:56 2011 @@ -120,7 +120,7 @@ /* #undef HAVE_FABSL */ /* Define to 1 if you have the fenv.h header file. */ -#define HAVE_FENV_H 1 +/* #undef HAVE_FENV_H */ /* Define to 1 if you have the `finite' function. */ #define HAVE_FINITE 1 @@ -283,7 +283,7 @@ /* #undef HAVE_NAN_H */ /* Define if poll is available in poll.h. */ -/* #undef HAVE_POLL */ +#define HAVE_POLL 1 /* Define to 1 if you have the `powf' function. */ /* #undef HAVE_POWF */ @@ -394,7 +394,7 @@ /* #undef HAVE_S_IFREG */ /* Define if S_IFREG is available in sys/stat.h. */ -/* #undef HAVE_S_ISREG */ +#define HAVE_S_ISREG 1 /* Define to 1 if you have the `tanf' function. */ /* #undef HAVE_TANF */ @@ -409,7 +409,7 @@ /* #undef HAVE_TANL */ /* Define to 1 if you have the tgmath.h header file. */ -#define HAVE_TGMATH_H 1 +/* #undef HAVE_TGMATH_H */ /* Define to 1 if the target supports thread-local storage. */ /* #undef HAVE_TLS */ @@ -436,7 +436,7 @@ #define HAVE_WCTYPE_H 1 /* Define if writev is available in sys/uio.h. */ -/* #undef HAVE_WRITEV */ +#define HAVE_WRITEV 1 /* Define to 1 if you have the `_acosf' function. */ /* #undef HAVE__ACOSF */
CVS commit: src/sys/arch/mmeye/stand/boot
Module Name:src Committed By: mrg Date: Mon Jul 4 12:03:56 UTC 2011 Modified Files: src/sys/arch/mmeye/stand/boot: wd.c Log Message: convert a cast structure assignment to a memcpy() to avoid potential pointer aliasing issues. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mmeye/stand/boot/wd.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/mmeye/stand/boot/wd.c diff -u src/sys/arch/mmeye/stand/boot/wd.c:1.1 src/sys/arch/mmeye/stand/boot/wd.c:1.2 --- src/sys/arch/mmeye/stand/boot/wd.c:1.1 Thu Mar 3 05:59:37 2011 +++ src/sys/arch/mmeye/stand/boot/wd.c Mon Jul 4 12:03:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.1 2011/03/03 05:59:37 kiyohara Exp $ */ +/* $NetBSD: wd.c,v 1.2 2011/07/04 12:03:56 mrg Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ if ((error = wdc_exec_identify(wd, buf)) != 0) return error; - wd-sc_params = *(struct ataparams *)buf; + memcpy(wd-sc_params, buf, sizeof wd-sc_params); /* 48-bit LBA addressing */ if ((wd-sc_params.atap_cmd2_en ATA_CMD2_LBA48) != 0)
CVS commit: src/common/lib/libc/arch/sh3/string
Module Name:src Committed By: mrg Date: Mon Jul 4 12:18:06 UTC 2011 Modified Files: src/common/lib/libc/arch/sh3/string: ffs.S Log Message: sh3 needs the __ffssi2 weak symbol, too. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/sh3/string/ffs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/sh3/string/ffs.S diff -u src/common/lib/libc/arch/sh3/string/ffs.S:1.2 src/common/lib/libc/arch/sh3/string/ffs.S:1.3 --- src/common/lib/libc/arch/sh3/string/ffs.S:1.2 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/arch/sh3/string/ffs.S Mon Jul 4 12:18:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.S,v 1.2 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: ffs.S,v 1.3 2011/07/04 12:18:05 mrg Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include machine/asm.h #if defined(LIBC_SCCS) !defined(lint) - RCSID($NetBSD: ffs.S,v 1.2 2008/04/28 20:22:52 martin Exp $) + RCSID($NetBSD: ffs.S,v 1.3 2011/07/04 12:18:05 mrg Exp $) #endif /* @@ -42,6 +42,7 @@ * The remaining 8bit is tested in every 2bit. */ +WEAK_ALIAS(__ffssi2,ffs) ENTRY(ffs) mov r4,r0 ! using r0 specific instructions tst #0xff,r0
CVS commit: src/sys/arch/sgimips/include
Module Name:src Committed By: mrg Date: Mon Jul 4 12:18:53 UTC 2011 Modified Files: src/sys/arch/sgimips/include: param.h Log Message: don't mark delay as extern inline. it's defined normally in machdep.c. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/include/param.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/sgimips/include/param.h diff -u src/sys/arch/sgimips/include/param.h:1.15 src/sys/arch/sgimips/include/param.h:1.16 --- src/sys/arch/sgimips/include/param.h:1.15 Fri Mar 18 16:33:41 2011 +++ src/sys/arch/sgimips/include/param.h Mon Jul 4 12:18:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.15 2011/03/18 16:33:41 tsutsui Exp $ */ +/* $NetBSD: param.h,v 1.16 2011/07/04 12:18:53 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -54,7 +54,7 @@ #ifdef _KERNEL #ifndef _LOCORE -__inline extern void delay(unsigned long); +extern void delay(unsigned long); #define DELAY(n) delay(n) #include machine/intr.h
CVS commit: src/external/lgpl3/mpfr/lib/libmpfr
Module Name:src
Committed By: mrg
Date: Mon Jul 4 12:38:29 UTC 2011
Modified Files:
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
support LIBMPFR_MACHINE_ARCH, for compat.
expand the list of platforms here significantly.
XXX: someone who knows FP well across our platforms should have a look
XXX: at this list and fix any errors / omissions i've made.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.5
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.4 Sat Jul 2 14:08:45 2011
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Mon Jul 4 12:38:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/02 14:08:45 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/07/04 12:38:29 mrg Exp $
.include bsd.init.mk
@@ -470,12 +470,29 @@
-DHAVE_CEIL=1 \
-DHAVE_ATTRIBUTE_MODE=1
+LIBMPFR_MACHINE_ARCH?= ${MACHINE_ARCH}
+
+# XXX
+# XXX XXX check mips*
# XXX XXX do something more, more ports!!
-.if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386
+# XXX
+# XXX missing: arm* sparc sh3* m68k/m68000 (powerpc64/ia64)
+
+# IEEE FP support. No VAX here.
+.if ${LIBMPFR_MACHINE_ARCH} == x86_64 || \
+${LIBMPFR_MACHINE_ARCH} == i386
+${LIBMPFR_MACHINE_ARCH} == mipsel
CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_EXT_LITTLE=1
.endif
-.if ${MACHINE_ARCH} == sparc64
+.if ${LIBMPFR_MACHINE_ARCH} == mips64el
+CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_QUAD_LITTLE=1
+.endif
+
+.if ${LIBMPFR_MACHINE_ARCH} == sparc64 || \
+${LIBMPFR_MACHINE_ARCH} == powerpc || \
+${LIBMPFR_MACHINE_ARCH} == powerpc64 || \
+${LIBMPFR_MACHINE_ARCH} == mips64eb
CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_QUAD_BIG=1
.endif
@@ -490,6 +507,6 @@
.PATH: ${.CURDIR}/../../dist
-.if ${MACHINE_ARCH} == vax
+.if ${LIBMPFR_MACHINE_ARCH} == vax
COPTS.set_ld.c+= -Wno-error
.endif
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: mrg Date: Mon Jul 4 12:39:36 UTC 2011 Modified Files: src/sys/compat/linux/common: linux_termios.h Log Message: avoid array bounds violation on netbsd/mips when dealing with termio structures. (did linux/mips ever support termio?). the effect of this is that termio linux apps won't have VEOF support. i can't tell what it should be since that code isn't in linux going back quite some years. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/compat/linux/common/linux_termios.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/compat/linux/common/linux_termios.h diff -u src/sys/compat/linux/common/linux_termios.h:1.19 src/sys/compat/linux/common/linux_termios.h:1.20 --- src/sys/compat/linux/common/linux_termios.h:1.19 Sun Mar 15 15:55:51 2009 +++ src/sys/compat/linux/common/linux_termios.h Mon Jul 4 12:39:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_termios.h,v 1.19 2009/03/15 15:55:51 cegger Exp $ */ +/* $NetBSD: linux_termios.h,v 1.20 2011/07/04 12:39:36 mrg Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -263,7 +263,9 @@ bts-c_cc[VQUIT] = lt-c_cc[LINUX_OLD_VQUIT]; bts-c_cc[VERASE] = lt-c_cc[LINUX_OLD_VERASE]; bts-c_cc[VKILL] = lt-c_cc[LINUX_OLD_VKILL]; +#if LINUX_VEOF LINUX_NCC bts-c_cc[VEOF] = lt-c_cc[LINUX_OLD_VEOF]; +#endif bts-c_cc[VTIME] = lt-c_cc[LINUX_OLD_VTIME]; bts-c_cc[VMIN] = lt-c_cc[LINUX_OLD_VMIN]; } @@ -347,7 +349,9 @@ lt-c_cc[LINUX_VQUIT] = bts-c_cc[VQUIT]; lt-c_cc[LINUX_VERASE] = bts-c_cc[VERASE]; lt-c_cc[LINUX_VKILL] = bts-c_cc[VKILL]; +#if LINUX_VEOF LINUX_NCC lt-c_cc[LINUX_VEOF] = bts-c_cc[VEOF]; +#endif lt-c_cc[LINUX_VTIME] = bts-c_cc[VTIME]; lt-c_cc[LINUX_VMIN] = bts-c_cc[VMIN]; lt-c_cc[LINUX_VSWTC] = 0;
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Mon Jul 4 12:54:24 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/sh: t-netbsd
src/external/gpl3/gcc/lib/libgcc/arch: sh3eb.mk sh3el.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el: configargs.h
Log Message:
don't use libgcc softfloat stuff now that it is in our libc. regenerate.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/sh/t-netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/sh3eb.mk \
src/external/gpl3/gcc/lib/libgcc/arch/sh3el.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/configargs.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/sh/t-netbsd
diff -u src/external/gpl3/gcc/dist/gcc/config/sh/t-netbsd:1.2 src/external/gpl3/gcc/dist/gcc/config/sh/t-netbsd:1.3
--- src/external/gpl3/gcc/dist/gcc/config/sh/t-netbsd:1.2 Tue Jun 21 02:41:37 2011
+++ src/external/gpl3/gcc/dist/gcc/config/sh/t-netbsd Mon Jul 4 12:54:24 2011
@@ -21,7 +21,7 @@
# Use sh specific libgcc-std.ver to avoid exporting some
# lib1func routines which shoud not be called via PLT.
-SHLIB_MAPFILES = $(srcdir)/config/sh/libgcc-std.ver
+#SHLIB_MAPFILES = $(srcdir)/config/sh/libgcc-std.ver
LIB2FUNCS_EXTRA=
Index: src/external/gpl3/gcc/lib/libgcc/arch/sh3eb.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/sh3eb.mk:1.2 src/external/gpl3/gcc/lib/libgcc/arch/sh3eb.mk:1.3
--- src/external/gpl3/gcc/lib/libgcc/arch/sh3eb.mk:1.2 Sun Jul 3 14:41:51 2011
+++ src/external/gpl3/gcc/lib/libgcc/arch/sh3eb.mk Mon Jul 4 12:54:24 2011
@@ -3,14 +3,14 @@
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf
-G_LIB2ADD=${GNUHOSTDIST}/gcc/config/floatunsidf.c ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+G_LIB2ADD=
G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
G_LIB2ADD_ST=
G_LIB1ASMFUNCS=_ashiftrt _ashiftrt_n _ashiftlt _lshiftrt _movmem _movmem_i4 _mulsi3 _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr _div_table _udiv_qrnnd_16 _ic_invalidate
G_LIB1ASMSRC=sh/lib1funcs.asm
G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
G_LIB2FUNCS_ST=_eprintf __gcc_bcmp
-G_LIB2FUNCS_EXTRA=${GNUHOSTDIST}/gcc/config/floatunsidf.c ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+G_LIB2FUNCS_EXTRA=
G_LIBGCC2_CFLAGS=-O2 -DIN_GCC -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fpic -mieee -g -DHAVE_GTHR_DEFAULT -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
G_SHLIB_MKMAP=${GNUHOSTDIST}/gcc/mkmap-symver.awk
G_SHLIB_MKMAP_OPTS=
Index: src/external/gpl3/gcc/lib/libgcc/arch/sh3el.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/sh3el.mk:1.2 src/external/gpl3/gcc/lib/libgcc/arch/sh3el.mk:1.3
--- src/external/gpl3/gcc/lib/libgcc/arch/sh3el.mk:1.2 Sun Jul 3 14:41:51 2011
+++ src/external/gpl3/gcc/lib/libgcc/arch/sh3el.mk Mon Jul 4 12:54:24 2011
@@ -3,14 +3,14 @@
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf
-G_LIB2ADD=${GNUHOSTDIST}/gcc/config/floatunsidf.c ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+G_LIB2ADD=
G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
G_LIB2ADD_ST=
G_LIB1ASMFUNCS=_ashiftrt _ashiftrt_n _ashiftlt _lshiftrt _movmem _movmem_i4 _mulsi3 _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr _div_table _udiv_qrnnd_16 _ic_invalidate
G_LIB1ASMSRC=sh/lib1funcs.asm
G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
G_LIB2FUNCS_ST=_eprintf __gcc_bcmp
-G_LIB2FUNCS_EXTRA=${GNUHOSTDIST}/gcc/config/floatunsidf.c ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+G_LIB2FUNCS_EXTRA=
G_LIBGCC2_CFLAGS=-O2 -DIN_GCC -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fpic -mieee -g -DHAVE_GTHR_DEFAULT -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
G_SHLIB_MKMAP=${GNUHOSTDIST}/gcc/mkmap-symver.awk
G_SHLIB_MKMAP_OPTS=
Index: src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/configargs.h
diff -u
CVS commit: src/sys/conf
Module Name:src
Committed By: mrg
Date: Mon Jul 4 13:00:19 UTC 2011
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
apply some -Wno-foo to 3 files that are non-trivial to solve, for GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/conf/Makefile.kern.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/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.140 src/sys/conf/Makefile.kern.inc:1.141
--- src/sys/conf/Makefile.kern.inc:1.140 Mon Jun 20 06:52:38 2011
+++ src/sys/conf/Makefile.kern.inc Mon Jul 4 13:00:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.140 2011/06/20 06:52:38 mrg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.141 2011/07/04 13:00:19 mrg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -510,12 +510,19 @@
uvm/uvm_pager.c dev/ic/aic7xxx.c dev/ic/aic79xx.c arch/xen/i386/gdt.c \
dev/ofw/ofw_subr.c
-. if defined(HAVE_GCC) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for __varstack in ${VARSTACK}
COPTS.${__varstack:T} += -Wno-stack-protector
.endfor
.endif
+# XXX ugly ugly to fix
+.if defined(HAVE_GCC) ${HAVE_GCC} == 45
+CWARNFLAGS.tulip.c+= -Wno-array-bounds
+CWARNFLAGS.radeonfb.c+= -Wno-cast-qual
+CWARNFLAGS.dbcool.c+= -Wno-cast-qual
+.endif
+
AFLAGS+= ${AOPTS.${.IMPSRC:T}}
CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}}
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CVS commit: src/lib/csu/sparc64
Module Name:src
Committed By: mrg
Date: Mon Jul 4 21:54:18 UTC 2011
Modified Files:
src/lib/csu/sparc64: Makefile
Log Message:
XXX: for now, build sparc64 csu with -O1 if using GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/csu/sparc64/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/csu/sparc64/Makefile
diff -u src/lib/csu/sparc64/Makefile:1.6 src/lib/csu/sparc64/Makefile:1.7
--- src/lib/csu/sparc64/Makefile:1.6 Fri May 19 19:11:12 2006
+++ src/lib/csu/sparc64/Makefile Mon Jul 4 21:54:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/05/19 19:11:12 christos Exp $
+# $NetBSD: Makefile,v 1.7 2011/07/04 21:54:18 mrg Exp $
#Uncomment the next line to enable the new .init fallthru
CPPFLAGS+= -I${.CURDIR}/../sparc_elf
@@ -6,3 +6,9 @@
ELFSIZE=64
.include ${.CURDIR}/../common_elf/Makefile.inc
+
+# XXX something is wrong with the -O2 crt0.o and the code in ___start
+# accesses data outside of the mapped space - crash
+.if defined(HAVE_GCC) ${HAVE_GCC} == 45
+DBG+= -O1
+.endif
CVS commit: src/tests/lib
Module Name:src
Committed By: mrg
Date: Mon Jul 4 22:33:29 UTC 2011
Modified Files:
src/tests/lib/libc/stdlib: t_strtod.c
src/tests/lib/libm: t_ceil.c t_floor.c t_round.c
Log Message:
XXX: ugly hack to make these valid for vax fp.
XXX: could consolidate some of this into a common header, but i'll
leave that clean up for another time.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/tests/lib/libc/stdlib/t_strtod.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libm/t_ceil.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libm/t_floor.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libm/t_round.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/stdlib/t_strtod.c
diff -u src/tests/lib/libc/stdlib/t_strtod.c:1.21 src/tests/lib/libc/stdlib/t_strtod.c:1.22
--- src/tests/lib/libc/stdlib/t_strtod.c:1.21 Tue Jun 14 02:37:31 2011
+++ src/tests/lib/libc/stdlib/t_strtod.c Mon Jul 4 22:33:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strtod.c,v 1.21 2011/06/14 02:37:31 jruoho Exp $ */
+/* $NetBSD: t_strtod.c,v 1.22 2011/07/04 22:33:29 mrg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/* Public domain, Otto Moerbeek o...@drijf.net, 2006. */
#include sys/cdefs.h
-__RCSID($NetBSD: t_strtod.c,v 1.21 2011/06/14 02:37:31 jruoho Exp $);
+__RCSID($NetBSD: t_strtod.c,v 1.22 2011/07/04 22:33:29 mrg Exp $);
#include errno.h
#include math.h
@@ -82,6 +82,12 @@
atf_tc_set_md_var(tc, descr, A strtod(3) with hexadecimals);
}
+#ifdef __vax__
+#define SMALL_NUM 1.0e-38
+#else
+#define SMALL_NUM 1.0e-40
+#endif
+
ATF_TC_BODY(strtod_hex, tc)
{
const char *str;
@@ -93,14 +99,14 @@
ATF_REQUIRE(end == str + 4);
ATF_REQUIRE(signbit(d) != 0);
- ATF_REQUIRE(fabs(d) 1.0e-40);
+ ATF_REQUIRE(fabs(d) SMALL_NUM);
str = -0x;
d = strtod(str, end); /* -0.0 */
ATF_REQUIRE(end == str + 2);
ATF_REQUIRE(signbit(d) != 0);
- ATF_REQUIRE(fabs(d) 1.0e-40);
+ ATF_REQUIRE(fabs(d) SMALL_NUM);
}
ATF_TC(strtod_inf);
Index: src/tests/lib/libm/t_ceil.c
diff -u src/tests/lib/libm/t_ceil.c:1.3 src/tests/lib/libm/t_ceil.c:1.4
--- src/tests/lib/libm/t_ceil.c:1.3 Fri Mar 25 10:42:38 2011
+++ src/tests/lib/libm/t_ceil.c Mon Jul 4 22:33:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ceil.c,v 1.3 2011/03/25 10:42:38 jruoho Exp $ */
+/* $NetBSD: t_ceil.c,v 1.4 2011/07/04 22:33:29 mrg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_ceil.c,v 1.3 2011/03/25 10:42:38 jruoho Exp $);
+__RCSID($NetBSD: t_ceil.c,v 1.4 2011/07/04 22:33:29 mrg Exp $);
#include math.h
#include limits.h
@@ -42,6 +42,12 @@
atf_tc_set_md_var(tc, descr, A basic test of ceil(3));
}
+#ifdef __vax__
+#define SMALL_NUM 1.0e-38
+#else
+#define SMALL_NUM 1.0e-40
+#endif
+
ATF_TC_BODY(ceil, tc)
{
const int n = 10240;
@@ -53,8 +59,8 @@
x = i + 0.9;
y = i + 0.1;
- ATF_REQUIRE(fabs(ceil(x) - (double)(i + 1)) 1.0e-40);
- ATF_REQUIRE(fabs(ceil(x) - (double)(i + 1)) 1.0e-40);
+ ATF_REQUIRE(fabs(ceil(x) - (double)(i + 1)) SMALL_NUM);
+ ATF_REQUIRE(fabs(ceil(x) - (double)(i + 1)) SMALL_NUM);
}
}
Index: src/tests/lib/libm/t_floor.c
diff -u src/tests/lib/libm/t_floor.c:1.4 src/tests/lib/libm/t_floor.c:1.5
--- src/tests/lib/libm/t_floor.c:1.4 Fri Mar 25 10:42:38 2011
+++ src/tests/lib/libm/t_floor.c Mon Jul 4 22:33:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_floor.c,v 1.4 2011/03/25 10:42:38 jruoho Exp $ */
+/* $NetBSD: t_floor.c,v 1.5 2011/07/04 22:33:29 mrg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_floor.c,v 1.4 2011/03/25 10:42:38 jruoho Exp $);
+__RCSID($NetBSD: t_floor.c,v 1.5 2011/07/04 22:33:29 mrg Exp $);
#include math.h
#include limits.h
@@ -43,6 +43,12 @@
atf_tc_set_md_var(tc, descr, A basic test of floor(3));
}
+#ifdef __vax__
+#define SMALL_NUM 1.0e-38
+#else
+#define SMALL_NUM 1.0e-40
+#endif
+
ATF_TC_BODY(floor, tc)
{
const int n = 10240;
@@ -60,8 +66,8 @@
x = i + 0.9;
y = i + 0.1;
- ATF_REQUIRE(fabs(floor(x) - (double)i) 1.0e-40);
- ATF_REQUIRE(fabs(floor(y) - (double)i) 1.0e-40);
+ ATF_REQUIRE(fabs(floor(x) - (double)i) SMALL_NUM);
+ ATF_REQUIRE(fabs(floor(y) - (double)i) SMALL_NUM);
}
}
Index: src/tests/lib/libm/t_round.c
diff -u src/tests/lib/libm/t_round.c:1.1 src/tests/lib/libm/t_round.c:1.2
--- src/tests/lib/libm/t_round.c:1.1 Fri Apr 8 06:49:21 2011
+++ src/tests/lib/libm/t_round.c Mon Jul 4 22:33:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_round.c,v 1.1 2011/04/08 06:49:21 jruoho Exp $ */
+/* $NetBSD: t_round.c,v 1.2 2011/07/04 22:33:29 mrg Exp $ */
#include atf-c.h
#include math.h
@@ -13,6 +13,12 @@
#define VAL 0x0.7cp0
#define VALF
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Mon Jul 4 22:44:56 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: t-netbsd
src/external/gpl3/gcc/lib/libgcc/arch: arm.mk armeb.mk
Log Message:
oops, put back _arm_fixunssfsi into arm libgcc.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgcc/arch/arm.mk
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk
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.2 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.3
--- src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.2 Sun Jul 3 06:40:38 2011
+++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd Mon Jul 4 22:44:56 2011
@@ -26,7 +26,7 @@
# 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_fixunsdfsi _arm_fixunssfsi \
_arm_floatdidf _arm_floatdisf _arm_floatundidf _arm_floatundisf \
_lshrdi3 _ashrdi3 _ashldi3 \
_clzsi2 _clzdi2
Index: src/external/gpl3/gcc/lib/libgcc/arch/arm.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/arm.mk:1.3 src/external/gpl3/gcc/lib/libgcc/arch/arm.mk:1.4
--- src/external/gpl3/gcc/lib/libgcc/arch/arm.mk:1.3 Sun Jul 3 14:41:51 2011
+++ src/external/gpl3/gcc/lib/libgcc/arch/arm.mk Mon Jul 4 22:44:55 2011
@@ -6,7 +6,7 @@
G_LIB2ADD=${GNUHOSTDIST}/gcc/config/floatunsidf.c ${GNUHOSTDIST}/gcc/config/floatunsisf.c
G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
G_LIB2ADD_ST=
-G_LIB1ASMFUNCS=_thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi _thumb1_case_uhi _thumb1_case_si _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
+G_LIB1ASMFUNCS=_thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi _thumb1_case_uhi _thumb1_case_si _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func _call_via_rX _interwork_call_via_rX _arm_fixunsdfsi _arm_fixunssfsi _arm_floatdidf _arm_floatdisf _arm_floatundidf _arm_floatundisf _lshrdi3 _ashrdi3 _ashldi3 _clzsi2 _clzdi2
G_LIB1ASMSRC=arm/lib1funcs.asm
G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
G_LIB2FUNCS_ST=_eprintf __gcc_bcmp
Index: src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk:1.2 src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk:1.3
--- src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk:1.2 Sun Jul 3 14:41:51 2011
+++ src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk Mon Jul 4 22:44:55 2011
@@ -6,7 +6,7 @@
G_LIB2ADD=${GNUHOSTDIST}/gcc/config/floatunsidf.c ${GNUHOSTDIST}/gcc/config/floatunsisf.c
G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
G_LIB2ADD_ST=
-G_LIB1ASMFUNCS=_thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi _thumb1_case_uhi _thumb1_case_si _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
+G_LIB1ASMFUNCS=_thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi _thumb1_case_uhi _thumb1_case_si _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func _call_via_rX _interwork_call_via_rX _arm_fixunsdfsi _arm_fixunssfsi _arm_floatdidf _arm_floatdisf _arm_floatundidf _arm_floatundisf _lshrdi3 _ashrdi3 _ashldi3 _clzsi2 _clzdi2
G_LIB1ASMSRC=arm/lib1funcs.asm
G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
G_LIB2FUNCS_ST=_eprintf __gcc_bcmp
CVS commit: src/sys/arch/i386/pci
Module Name:src
Committed By: mrg
Date: Tue Jul 5 07:08:18 UTC 2011
Modified Files:
src/sys/arch/i386/pci: viapcib.c
Log Message:
avoid an uninitialised variable warning GCC 4.5 -O3 picks up.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/pci/viapcib.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/i386/pci/viapcib.c
diff -u src/sys/arch/i386/pci/viapcib.c:1.13 src/sys/arch/i386/pci/viapcib.c:1.14
--- src/sys/arch/i386/pci/viapcib.c:1.13 Wed Jun 8 22:43:10 2011
+++ src/sys/arch/i386/pci/viapcib.c Tue Jul 5 07:08:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: viapcib.c,v 1.13 2011/06/08 22:43:10 rmind Exp $ */
+/* $NetBSD: viapcib.c,v 1.14 2011/07/05 07:08:17 mrg Exp $ */
/* $FreeBSD: src/sys/pci/viapm.c,v 1.10 2005/05/29 04:42:29 nyan Exp $ */
/*-
@@ -55,7 +55,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: viapcib.c,v 1.13 2011/06/08 22:43:10 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: viapcib.c,v 1.14 2011/07/05 07:08:17 mrg Exp $);
#include sys/types.h
#include sys/param.h
@@ -232,7 +232,7 @@
viapcib_wait(struct viapcib_softc *sc)
{
int rv, timeout;
- uint8_t val;
+ uint8_t val = 0;
timeout = VIAPCIB_SMBUS_TIMEOUT;
rv = 0;
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Tue Jul 5 08:36:17 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
fix the ordering of gmp, mpfr and mpc libraries. add to DPLIB.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cc1plus/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/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.2 Tue Jun 28 10:15:40 2011
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Tue Jul 5 08:36:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/28 10:15:40 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 08:36:17 mrg Exp $
PROG= cc1
SRCS= ${G_C_OBJS:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -13,6 +13,7 @@
COPTS+= -Wno-stack-protector
-LDADD+= -lintl -lgmp -lmpfr -lmpc -lz
+LDADD+= -lmpc -lmpfr -lgmp -lintl -lz
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
.PATH: ${DIST}/gcc ${G_out_file:H}
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.2 Wed Jun 29 01:57:59 2011
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Tue Jul 5 08:36:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/29 01:57:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 08:36:17 mrg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -16,6 +16,7 @@
COPTS+= -Wno-stack-protector
-LDADD+= -lintl -lgmp -lmpfr -lmpc -lz
+LDADD+= -lmpc -lmpfr -lgmp -lintl -lz
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
.PATH: ${DIST}/gcc/objc ${DIST}/gcc ${G_out_file:H}
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.2 Wed Jun 29 01:57:59 2011
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Tue Jul 5 08:36:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/29 01:57:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 08:36:17 mrg Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -16,6 +16,7 @@
# YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN
CFLAGS+= -Wno-error # not good enough: -Wno-return-type
-LDADD+= -lintl -lgmp -lmpfr -lmpc -lz
+LDADD+= -lmpc -lmpfr -lgmp -lintl -lz
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
.PATH: ${DIST}/gcc/cp ${DIST}/gcc ${G_out_file:H}
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: mrg
Date: Wed Jul 6 01:18:08 UTC 2011
Modified Files:
src/distrib/utils/sysinst: run.c
Log Message:
fix check against errstr to use the right variable. GCC 4.5 rightly
complained that err (the libc function) is always not NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/distrib/utils/sysinst/run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/run.c
diff -u src/distrib/utils/sysinst/run.c:1.67 src/distrib/utils/sysinst/run.c:1.68
--- src/distrib/utils/sysinst/run.c:1.67 Mon May 30 14:20:19 2011
+++ src/distrib/utils/sysinst/run.c Wed Jul 6 01:18:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.67 2011/05/30 14:20:19 joerg Exp $ */
+/* $NetBSD: run.c,v 1.68 2011/07/06 01:18:08 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -677,7 +677,7 @@
if (actionwin != NULL) {
if (actionwin != stdscr)
delwin(actionwin);
- if (err == 0 || !(flags RUN_NO_CLEAR)) {
+ if (errstr == 0 || !(flags RUN_NO_CLEAR)) {
wclear(stdscr);
touchwin(stdscr);
clearok(stdscr, 1);
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: mrg
Date: Wed Jul 6 01:18:33 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
fix update build break on sh3.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.8 Sun Jul 3 06:42:03 2011
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Wed Jul 6 01:18:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/07/03 06:42:03 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2011/07/06 01:18:32 mrg Exp $
LIBISPRIVATE= yes
@@ -107,6 +107,7 @@
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 \
+ rm -f sysroot-suffix.h; \
ln -s ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/sysroot-suffix.h ; \
fi
./gengtype ${DIST}/gcc gtyp-input.list.tmp
CVS commit: src/sys/arch/landisk/stand/boot
Module Name:src
Committed By: mrg
Date: Wed Jul 6 01:19:45 UTC 2011
Modified Files:
src/sys/arch/landisk/stand/boot: biosdisk.c
Log Message:
avoid a multi-level non-const cast warning from GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/landisk/stand/boot/biosdisk.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/landisk/stand/boot/biosdisk.c
diff -u src/sys/arch/landisk/stand/boot/biosdisk.c:1.1 src/sys/arch/landisk/stand/boot/biosdisk.c:1.2
--- src/sys/arch/landisk/stand/boot/biosdisk.c:1.1 Fri Sep 1 21:26:18 2006
+++ src/sys/arch/landisk/stand/boot/biosdisk.c Wed Jul 6 01:19:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
+/* $NetBSD: biosdisk.c,v 1.2 2011/07/06 01:19:45 mrg Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -133,6 +133,7 @@
static int
read_label(struct biosdisk *d)
{
+ struct mbr_sector *mbr_sect;
struct disklabel dflt_lbl;
struct mbr_partition mbr[MBR_PART_COUNT];
struct partition *p;
@@ -158,13 +159,15 @@
for (;;) {
this_ext = ext_base + next_ext;
next_ext = 0;
+ mbr_sect = (struct mbr_sector *)d-buf;
+ memcpy(mbr, mbr_sect-mbr_parts, sizeof(mbr));
if (readsects(d-dev, this_ext, d-buf, 1)) {
#ifdef DISK_DEBUG
printf(error reading MBR sector %d\n, this_ext);
#endif
return (EIO);
}
- memcpy(mbr, ((struct mbr_sector *)d-buf)-mbr_parts, sizeof(mbr));
+ memcpy(mbr, mbr_sect-mbr_parts, sizeof(mbr));
/* Look for NetBSD partition ID */
for (i = 0; i MBR_PART_COUNT; i++) {
typ = mbr[i].mbrp_type;
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: mrg
Date: Wed Jul 6 01:20:03 UTC 2011
Modified Files:
src/distrib/utils/sysinst: label.c
Log Message:
avoid a multi-level non-const cast warning from GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/utils/sysinst/label.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.56 src/distrib/utils/sysinst/label.c:1.57
--- src/distrib/utils/sysinst/label.c:1.56 Mon May 30 14:20:48 2011
+++ src/distrib/utils/sysinst/label.c Wed Jul 6 01:20:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.56 2011/05/30 14:20:48 joerg Exp $ */
+/* $NetBSD: label.c,v 1.57 2011/07/06 01:20:03 mrg Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: label.c,v 1.56 2011/05/30 14:20:48 joerg Exp $);
+__RCSID($NetBSD: label.c,v 1.57 2011/07/06 01:20:03 mrg Exp $);
#endif
#include sys/types.h
@@ -710,7 +710,7 @@
get_last_mounted(int fd, int partstart, partinfo *lp)
{
static char sblk[SBLOCKSIZE]; /* is this enough? */
- #define SB ((struct fs *)sblk)
+ struct fs *SB = (struct fs *)sblk;
static const int sblocks[] = SBLOCKSEARCH;
const int *sbp;
char *cp;
@@ -726,7 +726,7 @@
partstart * (off_t)512 + *sbp) != sizeof sblk)
continue;
/* Maybe we should validate the checksum??? */
- switch (((struct fs *)sblk)-fs_magic) {
+ switch (SB-fs_magic) {
case FS_UFS1_MAGIC:
case FS_UFS1_MAGIC_SWAPPED:
if (!(SB-fs_old_flags FS_FLAGS_UPDATED)) {
