CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Thu Jun 30 07:01:14 UTC 2011 Modified Files: src/tools/gcc: mknative-gcc Log Message: also pull tr1_impl_headers parallel_headers and decimal_headers for libstdc++ To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 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.53 src/tools/gcc/mknative-gcc:1.54 --- src/tools/gcc/mknative-gcc:1.53 Wed Jun 29 05:06:03 2011 +++ src/tools/gcc/mknative-gcc Thu Jun 30 07:01:14 2011 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mknative-gcc,v 1.53 2011/06/29 05:06:03 mrg Exp $ +# $NetBSD: mknative-gcc,v 1.54 2011/06/30 07:01:14 mrg Exp $ # # Shell script for generating all the constants needed for a native # platform build of src/gnu/dist/gcc. @@ -479,7 +479,7 @@ *) _src_CC_files="atomicity_file CCODECVT_CC CCOLLATE_CC CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_CC CLOCALE_CC BASIC_FILE_CC" _headers1="host_headers debug_headers tr1_headers c_compatibility_headers_extra" - _headers2="thread_host_headers host_headers_extra" + _headers2="thread_host_headers host_headers_extra tr1_impl_headers parallel_headers decimal_headers" _build_headers="c++allocator.h c++config.h cxxabi_tweaks.h gthr-default.h gthr-posix.h gthr-single.h gthr-tpf.h gthr.h" _unwind="UNWIND_H" ;;
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Jun 30 07:02:18 UTC 2011
Modified Files:
src/tools/gcc: Makefile
Log Message:
- repurpose MKNATIVE_CONFIG_TARGET_LIBS to list all the targets
- disable building pch for the mknative run
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/tools/gcc/Makefile
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.40 src/tools/gcc/Makefile:1.41
--- src/tools/gcc/Makefile:1.40 Wed Jun 29 02:02:38 2011
+++ src/tools/gcc/Makefile Thu Jun 30 07:02:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2011/06/29 02:02:38 mrg Exp $
+# $NetBSD: Makefile,v 1.41 2011/06/30 07:02:17 mrg Exp $
.include
@@ -10,7 +10,10 @@
.else
MKNATIVE_TARGET= gcc4
.endif
-MKNATIVE_CONFIG_TARGET_LIBS=
+MKNATIVE_CONFIG_TARGET_LIBS= \
+ configure-target-libiberty \
+ configure-target-libstdc++-v3 \
+ configure-target-libobjc
BINENV= /usr/bin/env -i
VAX_CONFIGURE_ARGS=
@@ -130,6 +133,7 @@
NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
--disable-symvers \
+ --disable-libstdcxx-pch \
--build=`${GCCSRCDIR}/config.guess` \
--host=${MACHINE_GNU_PLATFORM}
@@ -147,15 +151,15 @@
# edit Makefile so that maybe-all-gcc does not depend on all-gcc any more.
(cd .native && mv Makefile Makefile.config && \
${TOOL_SED} -e 's/\(maybe-all-gcc:\) all-gcc/\1/' \
-< Makefile.config > Makefile) && \
+< Makefile.config > Makefile)
+ PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h unwind.h)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so && \
- ${MKNATIVE_ENV} ${BUILD_MAKE} configure-target-libiberty \
- ${MKNATIVE_CONFIG_TARGET_LIBS} configure-target-libobjc \
- configure-target-libstdc++-v3 \
+ ${MKNATIVE_ENV} ${BUILD_MAKE} \
+ ${MKNATIVE_CONFIG_TARGET_LIBS} \
ALL_GCC_C= ALL_GCC_CXX= \
CC_FOR_TARGET=${CC:Q}' '${CCADDFLAGS:Q} \
CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Jun 30 07:16:59 UTC 2011
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
fix previous; they belong in _headers1
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 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.54 src/tools/gcc/mknative-gcc:1.55
--- src/tools/gcc/mknative-gcc:1.54 Thu Jun 30 07:01:14 2011
+++ src/tools/gcc/mknative-gcc Thu Jun 30 07:16:59 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.54 2011/06/30 07:01:14 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -478,8 +478,8 @@
case ${_subdir} in
*)
_src_CC_files="atomicity_file CCODECVT_CC CCOLLATE_CC CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_CC CLOCALE_CC BASIC_FILE_CC"
- _headers1="host_headers debug_headers tr1_headers c_compatibility_headers_extra"
- _headers2="thread_host_headers host_headers_extra tr1_impl_headers parallel_headers decimal_headers"
+ _headers1="host_headers debug_headers tr1_headers c_compatibility_headers_extra tr1_impl_headers parallel_headers decimal_headers"
+ _headers2="thread_host_headers host_headers_extra"
_build_headers="c++allocator.h c++config.h cxxabi_tweaks.h gthr-default.h gthr-posix.h gthr-single.h gthr-tpf.h gthr.h"
_unwind="UNWIND_H"
;;
CVS commit: [netbsd-5] src/sys/netatalk
Module Name:src
Committed By: sborrill
Date: Thu Jun 30 09:31:15 UTC 2011
Modified Files:
src/sys/netatalk [netbsd-5]: aarp.c aarp.h ddp_usrreq.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1622):
sys/netatalk/aarp.c:revision 1.35
sys/netatalk/aarp.h:revision 1.3
sys/netatalk/ddp_usrreq.c: revision 1.40
aarpprobe() is called before MOWNER_ATTACH(&aarp_mowner), leading
to a DIAGNOSTIC panic when MBUFTRACE is defined and atalkd is started.
Fix by moving MOWNER_ATTACH(&aarp_mowner) to ddp_init().
Fixes PR kern/44734
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.12.1 src/sys/netatalk/aarp.c
cvs rdiff -u -r1.2 -r1.2.86.1 src/sys/netatalk/aarp.h
cvs rdiff -u -r1.33 -r1.33.10.1 src/sys/netatalk/ddp_usrreq.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/netatalk/aarp.c
diff -u src/sys/netatalk/aarp.c:1.27 src/sys/netatalk/aarp.c:1.27.12.1
--- src/sys/netatalk/aarp.c:1.27 Thu Apr 24 11:38:37 2008
+++ src/sys/netatalk/aarp.c Thu Jun 30 09:31:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aarp.c,v 1.27 2008/04/24 11:38:37 ad Exp $ */
+/* $NetBSD: aarp.c,v 1.27.12.1 2011/06/30 09:31:15 sborrill Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.27 2008/04/24 11:38:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.27.12.1 2011/06/30 09:31:15 sborrill Exp $");
#include "opt_mbuftrace.h"
@@ -511,7 +511,6 @@
first = 0;
callout_init(&aarptimer_callout, 0);
callout_reset(&aarptimer_callout, hz, aarptimer, NULL);
- MOWNER_ATTACH(&aarp_mowner);
}
aat = &aarptab[AARPTAB_HASH(*addr) * AARPTAB_BSIZ];
for (n = 0; n < AARPTAB_BSIZ; n++, aat++) {
Index: src/sys/netatalk/aarp.h
diff -u src/sys/netatalk/aarp.h:1.2 src/sys/netatalk/aarp.h:1.2.86.1
--- src/sys/netatalk/aarp.h:1.2 Sat Dec 10 23:29:05 2005
+++ src/sys/netatalk/aarp.h Thu Jun 30 09:31:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aarp.h,v 1.2 2005/12/10 23:29:05 elad Exp $ */
+/* $NetBSD: aarp.h,v 1.2.86.1 2011/06/30 09:31:15 sborrill Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -76,4 +76,6 @@
#define AARPOP_RESPONSE 0x02
#define AARPOP_PROBE 0x03
+extern struct mowner aarp_mowner;
+
#endif /* !_NETATALK_AARP_H_ */
Index: src/sys/netatalk/ddp_usrreq.c
diff -u src/sys/netatalk/ddp_usrreq.c:1.33 src/sys/netatalk/ddp_usrreq.c:1.33.10.1
--- src/sys/netatalk/ddp_usrreq.c:1.33 Sun May 4 07:22:14 2008
+++ src/sys/netatalk/ddp_usrreq.c Thu Jun 30 09:31:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_usrreq.c,v 1.33 2008/05/04 07:22:14 thorpej Exp $ */
+/* $NetBSD: ddp_usrreq.c,v 1.33.10.1 2011/06/30 09:31:15 sborrill Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.33 2008/05/04 07:22:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.33.10.1 2011/06/30 09:31:15 sborrill Exp $");
#include "opt_mbuftrace.h"
@@ -569,6 +569,7 @@
MOWNER_ATTACH(&atalk_tx_mowner);
MOWNER_ATTACH(&atalk_rx_mowner);
+ MOWNER_ATTACH(&aarp_mowner);
}
#if 0
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Thu Jun 30 09:32:07 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket #1622 To generate a diff of this commit: cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.88 src/doc/CHANGES-5.2:1.1.2.89 --- src/doc/CHANGES-5.2:1.1.2.88 Sun Jun 19 20:48:11 2011 +++ src/doc/CHANGES-5.2 Thu Jun 30 09:32:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.88 2011/06/19 20:48:11 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.89 2011/06/30 09:32:07 sborrill Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -5319,3 +5319,13 @@ _gr_copy() can get called with fromgrp->gr_mem == NULL. [sjg, ticket #1636] +sys/netatalk/aarp.c1.35 +sys/netatalk/aarp.h1.3 +sys/netatalk/ddp_usrreq.c 1.40 + + aarpprobe() is called before MOWNER_ATTACH(&aarp_mowner), + leading to a DIAGNOSTIC panic when MBUFTRACE is defined and + atalkd is started. Fix by moving MOWNER_ATTACH(&aarp_mowner) + to ddp_init(). Should fix PR kern/44734 + [bouyer, ticket #1622] +
CVS commit: src/share/man/man4
Module Name:src
Committed By: macallan
Date: Thu Jun 30 14:52:37 UTC 2011
Modified Files:
src/share/man/man4: wsdisplay.4
Log Message:
document ioctl(WSDISPLAYIO_GET_EDID)
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/share/man/man4/wsdisplay.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/wsdisplay.4
diff -u src/share/man/man4/wsdisplay.4:1.35 src/share/man/man4/wsdisplay.4:1.36
--- src/share/man/man4/wsdisplay.4:1.35 Mon Mar 22 18:58:31 2010
+++ src/share/man/man4/wsdisplay.4 Thu Jun 30 14:52:37 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: wsdisplay.4,v 1.35 2010/03/22 18:58:31 joerg Exp $
+.\" $NetBSD: wsdisplay.4,v 1.36 2011/06/30 14:52:37 macallan Exp $
.\"
.\" Copyright (c) 1999 Matthias Drochner.
.\" Copyright (c) 2002 Ben Harris.
@@ -119,7 +119,7 @@
(In some cases \- if no screen is set up or if a screen
was just deleted \- it is possible that no focus is present at all.)
The focus can be switched by either special keyboard input (typically
-.Tn CTRL-ALT-F Ns Ar n )
+.Tn CTRL-ALT-F Ns Ar n, STOP-F Ns Ar n on Sun hardware )
or an ioctl command issued by a user program.
Screens are created and deleted through the
.Pa /dev/ttyEcfg
@@ -543,6 +543,21 @@
and
.Dv SPLASHSCREEN_PROGRESS
kernel options.
+.It Dv WSDISPLAYIO_GET_EDID Pq Li struct wsdisplay_edid_info
+Retrieve EDID data from a driver.
+.Bd -literal -offset indent
+struct wsdisplayio_edid_info {
+ uint32_t buffer_size;
+ uint32_t data_size;
+ void *edid_data;
+};
+.Ed
+The caller is responsible for allocating a buffer of at least 128 bytes
+( the minimum size of an EDID block ) and set data_size to its size. If
+the EDID block is bigger the call will fail with EAGAIN and the driver
+will set data_size to the required buffer size. Otherwise the EDID
+block will be written into the buffer pointed at by edid_data and
+data_size will be set to the number of bytes written.
.El
.Sh FILES
.Bl -item
CVS commit: src/share/man/man4
Module Name:src Committed By: macallan Date: Thu Jun 30 14:56:09 UTC 2011 Modified Files: src/share/man/man4: wsdisplay.4 Log Message: mention how to switch consoles on ADB keyboards To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/share/man/man4/wsdisplay.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/wsdisplay.4 diff -u src/share/man/man4/wsdisplay.4:1.36 src/share/man/man4/wsdisplay.4:1.37 --- src/share/man/man4/wsdisplay.4:1.36 Thu Jun 30 14:52:37 2011 +++ src/share/man/man4/wsdisplay.4 Thu Jun 30 14:56:09 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsdisplay.4,v 1.36 2011/06/30 14:52:37 macallan Exp $ +.\" $NetBSD: wsdisplay.4,v 1.37 2011/06/30 14:56:09 macallan Exp $ .\" .\" Copyright (c) 1999 Matthias Drochner. .\" Copyright (c) 2002 Ben Harris. @@ -119,7 +119,8 @@ (In some cases \- if no screen is set up or if a screen was just deleted \- it is possible that no focus is present at all.) The focus can be switched by either special keyboard input (typically -.Tn CTRL-ALT-F Ns Ar n, STOP-F Ns Ar n on Sun hardware ) +.Tn CTRL-ALT-F Ns Ar n, STOP-F Ns Ar n on Sun hardware, Command-F Ns Ar n +on ADB keyboards ) or an ioctl command issued by a user program. Screens are created and deleted through the .Pa /dev/ttyEcfg
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Thu Jun 30 18:09:54 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
After making sure USE_PIGZGZIP is defined, add a TOOL_GZIP which will be
gzip or ${TOOL_PIGZ}. Use of gzip can be replaced with ${TOOL_GZIP} and
automatically get to use pigz if USE_PIGZGZIP is defined as "yes". This
avoid having to special case each of gzip.
To generate a diff of this commit:
cvs rdiff -u -r1.671 -r1.672 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.671 src/share/mk/bsd.own.mk:1.672
--- src/share/mk/bsd.own.mk:1.671 Mon Jun 20 06:52:37 2011
+++ src/share/mk/bsd.own.mk Thu Jun 30 18:09:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.671 2011/06/20 06:52:37 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.672 2011/06/30 18:09:54 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -950,6 +950,12 @@
${var}?= no
.endfor
+.if ${USE_PIGZGZIP} != "no"
+TOOL_GZIP= ${TOOL_PIGZ}
+.else
+TOOL_GZIP= gzip
+.endif
+
#
# Where X11 sources are and where it is installed to.
#
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Thu Jun 30 18:13:51 UTC 2011
Modified Files:
src/share/mk: bsd.README bsd.man.mk
Log Message:
Replace gzip with ${TOOL_GZIP} in manual compression.
Modify the description of USE_PIGZGZIP.
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/share/mk/bsd.README
cvs rdiff -u -r1.107 -r1.108 src/share/mk/bsd.man.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.283 src/share/mk/bsd.README:1.284
--- src/share/mk/bsd.README:1.283 Mon May 30 13:47:01 2011
+++ src/share/mk/bsd.README Thu Jun 30 18:13:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.283 2011/05/30 13:47:01 joerg Exp $
+# $NetBSD: bsd.README,v 1.284 2011/06/30 18:13:51 matt Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -415,9 +415,9 @@
various system utilities/libraries that support it.
If ${MKYP} is "no", USE_YP will also be forced to "no".
-USE_PIGZGZIP If "no", use the host "gzip" program to compress sets.
+USE_PIGZGZIP If "no", use the host "gzip" program to compress things.
Otherwise, build tools/pigz and use nbpigz to compress
- the sets.
+ things.
Default: "no".
X11FLAVOUR Set to "Xorg" or "XFree86", depending on whether to build
Index: src/share/mk/bsd.man.mk
diff -u src/share/mk/bsd.man.mk:1.107 src/share/mk/bsd.man.mk:1.108
--- src/share/mk/bsd.man.mk:1.107 Tue Mar 8 12:20:17 2011
+++ src/share/mk/bsd.man.mk Thu Jun 30 18:13:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.107 2011/03/08 12:20:17 njoly Exp $
+# $NetBSD: bsd.man.mk,v 1.108 2011/06/30 18:13:51 matt Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include
@@ -34,7 +34,7 @@
MANCOMPRESS?=
MANSUFFIX?=
.else
-MANCOMPRESS?= gzip -ncf
+MANCOMPRESS?= ${TOOL_GZIP} -ncf
MANSUFFIX?= .gz
.endif
CVS commit: src/etc
Module Name:src
Committed By: matt
Date: Thu Jun 30 18:15:14 UTC 2011
Modified Files:
src/etc: Makefile
Log Message:
Add COMPRESS_PROGRAM=${TOOL_GZIP:Q} for pax.
Replace gzip with ${TOOL_GZIP}
To generate a diff of this commit:
cvs rdiff -u -r1.390 -r1.391 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.390 src/etc/Makefile:1.391
--- src/etc/Makefile:1.390 Sun Apr 17 13:07:18 2011
+++ src/etc/Makefile Thu Jun 30 18:15:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.390 2011/04/17 13:07:18 martin Exp $
+# $NetBSD: Makefile,v 1.391 2011/06/30 18:15:13 matt Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -571,7 +571,7 @@
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
- pax_cmd="GZIP=-9 ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+ pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9 ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
cd $${kerndir} && { \
kernels=; newest=; \
for kernel in $${kernlist}; do \
@@ -612,8 +612,8 @@
knl_gz="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${kernel}-${configfile:C/.*\///}$${s}.gz"; \
[ $${knl_gz} -nt $${ks} ] && continue; \
rm -f $${knl_gz}; \
-echo "gzip -c -9 < $${kerndir}/$${ks} > $${knl_gz}"; \
-gzip -c -9 < $${ks} > $${knl_gz}; \
+echo "${TOOL_GZIP} -c -9 < $${kerndir}/$${ks} > $${knl_gz}"; \
+${TOOL_GZIP} -c -9 < $${ks} > $${knl_gz}; \
done; \
done; \
}
CVS commit: src/sys/arch/powerpc/conf
Module Name:src
Committed By: matt
Date: Thu Jun 30 18:17:11 UTC 2011
Modified Files:
src/sys/arch/powerpc/conf: Makefile.powerpc
Log Message:
Get rid of local TOOL_GZIP definition that now bsd.own.mk does it for us.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/powerpc/conf/Makefile.powerpc
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/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.47 src/sys/arch/powerpc/conf/Makefile.powerpc:1.48
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.47 Sat Jun 25 02:26:53 2011
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Thu Jun 30 18:17:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.47 2011/06/25 02:26:53 matt Exp $
+# $NetBSD: Makefile.powerpc,v 1.48 2011/06/30 18:17:11 matt Exp $
#
# Makefile for NetBSD
#
@@ -106,10 +106,6 @@
MKUBOOTIMAGEARGS+= -a ${TEXTADDR:C/$//} -e $(TEXTADDR)
MKUBOOTIMAGEARGS+= -n "NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))"
-.if defined(USE_PIGZGZIP) && ${USE_PIGZGZIP} != "no"
-TOOL_GZIP?= ${TOOL_PIGZ}
-.endif
-TOOL_GZIP?= gzip
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${TOOL_GZIP} -9cn $@.bin '>' $@.bin.gz; \
${TOOL_GZIP} -9cn $@.bin > $@.bin.gz; \
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: matt
Date: Thu Jun 30 18:20:24 UTC 2011
Modified Files:
src/sys/arch/evbarm/conf: mk.g42xxeb mk.gumstix mk.lubbock mk.marvell
mk.mpcsa mk.netwalker mk.viper
Log Message:
Use ${TOOL_GZIP}
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.g42xxeb \
src/sys/arch/evbarm/conf/mk.marvell src/sys/arch/evbarm/conf/mk.mpcsa \
src/sys/arch/evbarm/conf/mk.viper
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.gumstix
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.lubbock \
src/sys/arch/evbarm/conf/mk.netwalker
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/mk.g42xxeb
diff -u src/sys/arch/evbarm/conf/mk.g42xxeb:1.2 src/sys/arch/evbarm/conf/mk.g42xxeb:1.3
--- src/sys/arch/evbarm/conf/mk.g42xxeb:1.2 Sun Dec 11 12:17:07 2005
+++ src/sys/arch/evbarm/conf/mk.g42xxeb Thu Jun 30 18:20:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mk.g42xxeb,v 1.2 2005/12/11 12:17:07 christos Exp $
+# $NetBSD: mk.g42xxeb,v 1.3 2011/06/30 18:20:24 matt Exp $
SYSTEM_FIRST_OBJ= g42xxeb_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/g42xxeb/g42xxeb_start.S
@@ -9,8 +9,8 @@
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
${OBJCOPY} -S -O binary $@ $@.bin; \
- echo gzip \< $@.bin \> $@.bin.gz; \
- gzip < $@.bin > $@.bin.gz
+ echo ${TOOL_GZIP} \< $@.bin \> $@.bin.gz; \
+ ${TOOL_GZIP} < $@.bin > $@.bin.gz
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
Index: src/sys/arch/evbarm/conf/mk.marvell
diff -u src/sys/arch/evbarm/conf/mk.marvell:1.2 src/sys/arch/evbarm/conf/mk.marvell:1.3
--- src/sys/arch/evbarm/conf/mk.marvell:1.2 Mon Jan 31 06:09:32 2011
+++ src/sys/arch/evbarm/conf/mk.marvell Thu Jun 30 18:20:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mk.marvell,v 1.2 2011/01/31 06:09:32 matt Exp $
+# $NetBSD: mk.marvell,v 1.3 2011/06/30 18:20:24 matt Exp $
SYSTEM_FIRST_OBJ= marvell_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/marvell/marvell_start.S
@@ -21,8 +21,8 @@
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
${OBJCOPY} -S -O binary $@ $@.bin; \
- echo gzip -c $@.bin > $@.bin.gz; \
- gzip -c $@.bin > $@.bin.gz; \
+ echo ${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
+ ${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
Index: src/sys/arch/evbarm/conf/mk.mpcsa
diff -u src/sys/arch/evbarm/conf/mk.mpcsa:1.2 src/sys/arch/evbarm/conf/mk.mpcsa:1.3
--- src/sys/arch/evbarm/conf/mk.mpcsa:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/evbarm/conf/mk.mpcsa Thu Jun 30 18:20:24 2011
@@ -9,8 +9,8 @@
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
${OBJCOPY} -S -O binary $@ $@.bin; \
- echo gzip \< $@.bin \> $@.bin.gz; \
- gzip < $@.bin > $@.bin.gz; \
+ echo ${TOOL_GZIP} \< $@.bin \> $@.bin.gz; \
+ ${TOOL_GZIP} < $@.bin > $@.bin.gz; \
echo ${OBJCOPY} --input-target=binary --output-target=srec --change-addresses=$(KERNEL_LOAD_PHYS) -v $@.bin $@.bin.srec; \
${OBJCOPY} --input-target=binary --output-target=srec --change-addresses=$(KERNEL_LOAD_PHYS) -v $@.bin $@.bin.srec; \
# echo "(perl /emb/bin/gen_tagff.perl --arch=arm --ver=4.0_BETA2 --infoprog=/emb/bin/modinfo "--hwid=MPCSA v1.x" --crc32 $@.bin.srec > $@.tff)"; \
Index: src/sys/arch/evbarm/conf/mk.viper
diff -u src/sys/arch/evbarm/conf/mk.viper:1.2 src/sys/arch/evbarm/conf/mk.viper:1.3
--- src/sys/arch/evbarm/conf/mk.viper:1.2 Sun Dec 11 12:17:07 2005
+++ src/sys/arch/evbarm/conf/mk.viper Thu Jun 30 18:20:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mk.viper,v 1.2 2005/12/11 12:17:07 christos Exp $
+# $NetBSD: mk.viper,v 1.3 2011/06/30 18:20:24 matt Exp $
SYSTEM_FIRST_OBJ= viper_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/viper/viper_start.S
@@ -9,8 +9,8 @@
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
${OBJCOPY} -S -O binary $@ $@.bin; \
- echo gzip \< $@.bin \> $@.bin.gz; \
- gzip < $@.bin > $@.bin.gz
+ echo ${TOOL_GZIP} \< $@.bin \> $@.bin.gz; \
+ ${TOOL_GZIP} < $@.bin > $@.bin.gz
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
Index: src/sys/arch/evbarm/conf/mk.gumstix
diff -u src/sys/arch/evbarm/conf/mk.gumstix:1.3 src/sys/arch/evbarm/conf/mk.gumstix:1.4
--- src/sys/arch/evbarm/conf/mk.gumstix:1.3 Mon Jan 31 06:09:32 2011
+++ src/sys/arch/evbarm/conf/mk.gumstix Thu Jun 30 18:20:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mk.gumstix,v 1.3 2011/01/31 06:09:32 matt Exp $
+# $NetBSD: mk.gumstix,v 1.4 2011/06/30 18:20:24 matt Exp $
SYSTEM_FIRST_OBJ= gumstix_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/gumstix/gumstix_start.S
@@ -24,8 +24,8 @@
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O bi
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: joerg
Date: Thu Jun 30 19:46:07 UTC 2011
Modified Files:
src/lib/libc/gen: execl.c execle.c execlp.c
Log Message:
Drop special cases for i386 and m68k. It is not a validate assumption
that the address of an argument is at the same stack slot the caller
placed in it. It is perfectely valid to copy it into the local frame
first.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/gen/execl.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/execle.c \
src/lib/libc/gen/execlp.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/gen/execl.c
diff -u src/lib/libc/gen/execl.c:1.16 src/lib/libc/gen/execl.c:1.17
--- src/lib/libc/gen/execl.c:1.16 Wed Jan 9 11:26:03 2008
+++ src/lib/libc/gen/execl.c Thu Jun 30 19:46:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: execl.c,v 1.16 2008/01/09 11:26:03 simonb Exp $ */
+/* $NetBSD: execl.c,v 1.17 2011/06/30 19:46:07 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: execl.c,v 1.16 2008/01/09 11:26:03 simonb Exp $");
+__RCSID("$NetBSD: execl.c,v 1.17 2011/06/30 19:46:07 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,10 +56,6 @@
execl(const char *name, const char *arg, ...)
{
int r;
-#if defined(__i386__) || defined(__m68k__)
- r = execve(name, __UNCONST(&arg), environ);
- return r;
-#else
va_list ap;
char **argv;
int i;
@@ -82,5 +78,4 @@
r = execve(name, argv, environ);
return r;
-#endif
}
Index: src/lib/libc/gen/execle.c
diff -u src/lib/libc/gen/execle.c:1.11 src/lib/libc/gen/execle.c:1.12
--- src/lib/libc/gen/execle.c:1.11 Wed Jan 9 11:26:03 2008
+++ src/lib/libc/gen/execle.c Thu Jun 30 19:46:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: execle.c,v 1.11 2008/01/09 11:26:03 simonb Exp $ */
+/* $NetBSD: execle.c,v 1.12 2011/06/30 19:46:07 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: execle.c,v 1.11 2008/01/09 11:26:03 simonb Exp $");
+__RCSID("$NetBSD: execle.c,v 1.12 2011/06/30 19:46:07 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -50,18 +50,6 @@
int
execle(const char *name, const char *arg, ...)
{
-#if defined(__i386__) || defined(__m68k__)
- va_list ap;
- char **envp;
-
- va_start(ap, arg);
- while ((va_arg(ap, char *)) != NULL)
- continue;
- envp = va_arg(ap, char **);
- va_end(ap);
-
- return execve(name, __UNCONST(&arg), envp);
-#else
va_list ap;
char **argv, **envp;
int i;
@@ -81,5 +69,4 @@
va_end(ap);
return execve(name, argv, envp);
-#endif
}
Index: src/lib/libc/gen/execlp.c
diff -u src/lib/libc/gen/execlp.c:1.11 src/lib/libc/gen/execlp.c:1.12
--- src/lib/libc/gen/execlp.c:1.11 Wed Jan 9 11:26:03 2008
+++ src/lib/libc/gen/execlp.c Thu Jun 30 19:46:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: execlp.c,v 1.11 2008/01/09 11:26:03 simonb Exp $ */
+/* $NetBSD: execlp.c,v 1.12 2011/06/30 19:46:07 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: execlp.c,v 1.11 2008/01/09 11:26:03 simonb Exp $");
+__RCSID("$NetBSD: execlp.c,v 1.12 2011/06/30 19:46:07 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -50,9 +50,6 @@
int
execlp(const char *name, const char *arg, ...)
{
-#if defined(__i386__) || defined(__m68k__)
- return execvp(name, __UNCONST(&arg));
-#else
va_list ap;
char **argv;
int i;
@@ -71,5 +68,4 @@
va_end(ap);
return execvp(name, argv);
-#endif
}
CVS commit: src/lib/csu
Module Name:src
Committed By: joerg
Date: Thu Jun 30 19:48:43 UTC 2011
Modified Files:
src/lib/csu/arch/i386: crt0.S
src/lib/csu/arch/x86_64: crt0.S
src/lib/csu/common: crt0-common.c
Log Message:
Assert that ps_strings is valid. Use it to drop the first three
arguments to ___start to make the assembler callers simpler.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/i386/crt0.S
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/x86_64/crt0.S
cvs rdiff -u -r1.5 -r1.6 src/lib/csu/common/crt0-common.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/csu/arch/i386/crt0.S
diff -u src/lib/csu/arch/i386/crt0.S:1.1 src/lib/csu/arch/i386/crt0.S:1.2
--- src/lib/csu/arch/i386/crt0.S:1.1 Sat Aug 7 18:01:33 2010
+++ src/lib/csu/arch/i386/crt0.S Thu Jun 30 19:48:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.S,v 1.1 2010/08/07 18:01:33 joerg Exp $ */
+/* $NetBSD: crt0.S,v 1.2 2011/06/30 19:48:43 joerg Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -37,17 +37,11 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.1 2010/08/07 18:01:33 joerg Exp $")
+RCSID("$NetBSD: crt0.S,v 1.2 2011/06/30 19:48:43 joerg Exp $")
STRONG_ALIAS(_start,__start)
_ENTRY(__start)
pushl %ebx
pushl %ecx
pushl %edx
- movl 12(%esp),%eax
- leal 16(%esp),%edx
- leal 20(%esp,%eax,4),%ecx
- pushl %ecx
- pushl %edx
- pushl %eax
call ___start
Index: src/lib/csu/arch/x86_64/crt0.S
diff -u src/lib/csu/arch/x86_64/crt0.S:1.1 src/lib/csu/arch/x86_64/crt0.S:1.2
--- src/lib/csu/arch/x86_64/crt0.S:1.1 Sat Aug 7 18:01:34 2010
+++ src/lib/csu/arch/x86_64/crt0.S Thu Jun 30 19:48:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
+/* $NetBSD: crt0.S,v 1.2 2011/06/30 19:48:43 joerg Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -35,18 +35,14 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
+RCSID("$NetBSD: crt0.S,v 1.2 2011/06/30 19:48:43 joerg Exp $")
STRONG_ALIAS(_start,__start)
_ENTRY(__start)
- movq %rbx,%r9
- movq %rcx,%r8
- movq %rdx,%rcx
- movq (%rsp),%rdi
- leaq 16(%rsp,%rdi,8),%rdx
- leaq 8(%rsp),%rsi
- subq $8,%rsp
- andq $~15,%rsp
- addq $8,%rsp
+ andq$~15,%rsp
+ subq$8,%rsp
+ movq %rdx, %rdi
+ movq %rcx, %rsi
+ movq %rbx, %rdx
jmp ___start
Index: src/lib/csu/common/crt0-common.c
diff -u src/lib/csu/common/crt0-common.c:1.5 src/lib/csu/common/crt0-common.c:1.6
--- src/lib/csu/common/crt0-common.c:1.5 Mon Mar 7 05:09:09 2011
+++ src/lib/csu/common/crt0-common.c Thu Jun 30 19:48:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0-common.c,v 1.5 2011/03/07 05:09:09 joerg Exp $ */
+/* $NetBSD: crt0-common.c,v 1.6 2011/06/30 19:48:43 joerg Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -36,9 +36,10 @@
*/
#include
-__RCSID("$NetBSD: crt0-common.c,v 1.5 2011/03/07 05:09:09 joerg Exp $");
+__RCSID("$NetBSD: crt0-common.c,v 1.6 2011/06/30 19:48:43 joerg Exp $");
#include
+#include
#include
#include
#include
@@ -73,8 +74,8 @@
static char empty_string[] = "";
char *__progname = empty_string;
-void ___start(int, char **, char **, void (*)(void),
-const Obj_Entry *, struct ps_strings *);
+void ___start(void (*)(void), const Obj_Entry *,
+ struct ps_strings *);
#define write(fd, s, n) __syscall(SYS_write, (fd), (s), (n))
@@ -85,17 +86,21 @@
} while (0)
void
-___start(int argc, char **argv, char **envp,
-void (*cleanup)(void), /* from shared loader */
+___start(void (*cleanup)(void), /* from shared loader */
const Obj_Entry *obj, /* from shared loader */
struct ps_strings *ps_strings)
{
- environ = envp;
- if (argv[0] != NULL) {
+ if (ps_strings == NULL)
+ _FATAL("ps_strings missing\n");
+ __ps_strings = ps_strings;
+
+ environ = ps_strings->ps_envstr;
+
+ if (ps_strings->ps_argvstr[0] != NULL) {
char *c;
- __progname = argv[0];
- for (c = argv[0]; *c; ++c) {
+ __progname = ps_strings->ps_argvstr[0];
+ for (c = ps_strings->ps_argvstr[0]; *c; ++c) {
if (*c == '/')
__progname = c + 1;
}
@@ -103,9 +108,6 @@
__progname = empty_string;
}
- if (ps_strings != NULL)
- __ps_strings = ps_strings;
-
if (&rtld_DYNAMIC != NULL) {
if (obj == NULL)
_FATAL("NULL Obj_Entry pointer in GOT\n");
@@ -126,5 +128,5 @@
atexit(_fini);
_init();
- exit(main(argc, argv, environ));
+ exit(main(ps_strings->ps_nargvstr, ps_strings->ps_argvstr, environ));
}
CVS commit: src/lib/csu/common
Module Name:src
Committed By: matt
Date: Thu Jun 30 20:07:36 UTC 2011
Modified Files:
src/lib/csu/common: crt0-common.c
Log Message:
Mark ___start as .hidden (for MKPIE=yes executables).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/csu/common/crt0-common.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/csu/common/crt0-common.c
diff -u src/lib/csu/common/crt0-common.c:1.6 src/lib/csu/common/crt0-common.c:1.7
--- src/lib/csu/common/crt0-common.c:1.6 Thu Jun 30 19:48:43 2011
+++ src/lib/csu/common/crt0-common.c Thu Jun 30 20:07:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0-common.c,v 1.6 2011/06/30 19:48:43 joerg Exp $ */
+/* $NetBSD: crt0-common.c,v 1.7 2011/06/30 20:07:35 matt Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -36,7 +36,7 @@
*/
#include
-__RCSID("$NetBSD: crt0-common.c,v 1.6 2011/06/30 19:48:43 joerg Exp $");
+__RCSID("$NetBSD: crt0-common.c,v 1.7 2011/06/30 20:07:35 matt Exp $");
#include
#include
@@ -74,7 +74,7 @@
static char empty_string[] = "";
char *__progname = empty_string;
-void ___start(void (*)(void), const Obj_Entry *,
+__dso_hidden void ___start(void (*)(void), const Obj_Entry *,
struct ps_strings *);
#define write(fd, s, n) __syscall(SYS_write, (fd), (s), (n))
CVS commit: src/lib/csu/arch/powerpc
Module Name:src
Committed By: matt
Date: Thu Jun 30 20:10:17 UTC 2011
Modified Files:
src/lib/csu/arch/powerpc: crt0.S
Log Message:
Adapt to new ___start definition.
Use PIC method to load %r13 with address of _SDA_BASE_
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/powerpc/crt0.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/powerpc/crt0.S
diff -u src/lib/csu/arch/powerpc/crt0.S:1.1 src/lib/csu/arch/powerpc/crt0.S:1.2
--- src/lib/csu/arch/powerpc/crt0.S:1.1 Tue Feb 8 02:02:25 2011
+++ src/lib/csu/arch/powerpc/crt0.S Thu Jun 30 20:10:17 2011
@@ -29,21 +29,23 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.1 2011/02/08 02:02:25 matt Exp $")
+RCSID("$NetBSD: crt0.S,v 1.2 2011/06/30 20:10:17 matt Exp $")
STRONG_ALIAS(_start,__start)
.weak _SDA_BASE_
- .weak _SDA_BASE2_
ENTRY_NOPROFILE(__start)
+ bcl 20,31,1f
+1:
+ mflr %r11
/* SVR4 ABI says small data is in r13 */
- lis %r13,_SDA_BASE_@ha
- addi %r13,%r13,_SDA_BASE_@l
+ addis %r13,%r11,_SDA_BASE_-1b@ha
+ addi %r13,%r13,_SDA_BASE_-1b@l
- /* E[mbedded] ABI says small data is in r2 */
- lis %r2,_SDA_BASE2_@ha
- addi %r2,%r2,_SDA_BASE2_@l
+ mr %r3,%r6
+ mr %r4,%r7
+ mr %r5,%r8
b ___start
END(__start)
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Jun 30 22:13:03 UTC 2011 Modified Files: src/share/man/man4: wsdisplay.4 Log Message: New sentence, new line. Use more markup. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/share/man/man4/wsdisplay.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/wsdisplay.4 diff -u src/share/man/man4/wsdisplay.4:1.37 src/share/man/man4/wsdisplay.4:1.38 --- src/share/man/man4/wsdisplay.4:1.37 Thu Jun 30 14:56:09 2011 +++ src/share/man/man4/wsdisplay.4 Thu Jun 30 22:13:02 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsdisplay.4,v 1.37 2011/06/30 14:56:09 macallan Exp $ +.\" $NetBSD: wsdisplay.4,v 1.38 2011/06/30 22:13:02 wiz Exp $ .\" .\" Copyright (c) 1999 Matthias Drochner. .\" Copyright (c) 2002 Ben Harris. @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 19, 2009 +.Dd June 30, 2011 .Dt WSDISPLAY 4 .Os .Sh NAME @@ -554,11 +554,13 @@ }; .Ed The caller is responsible for allocating a buffer of at least 128 bytes -( the minimum size of an EDID block ) and set data_size to its size. If -the EDID block is bigger the call will fail with EAGAIN and the driver -will set data_size to the required buffer size. Otherwise the EDID -block will be written into the buffer pointed at by edid_data and -data_size will be set to the number of bytes written. +(the minimum size of an EDID block) and set data_size to its size. +If the EDID block is bigger the call will fail with +.Er EAGAIN +and the driver will set data_size to the required buffer size. +Otherwise the EDID block will be written into the buffer pointed +at by edid_data and data_size will be set to the number of bytes +written. .El .Sh FILES .Bl -item
CVS commit: src/sys/kern
Module Name:src Committed By: dyoung Date: Thu Jun 30 22:38:50 UTC 2011 Modified Files: src/sys/kern: sys_socket.c Log Message: Don't cast a pointer void * before passing to memset(), that's not necessary. Use NULL instead of (type *)0. This patch produces no change in the generated assembly. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/kern/sys_socket.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/kern/sys_socket.c diff -u src/sys/kern/sys_socket.c:1.63 src/sys/kern/sys_socket.c:1.64 --- src/sys/kern/sys_socket.c:1.63 Sun Dec 20 09:36:06 2009 +++ src/sys/kern/sys_socket.c Thu Jun 30 22:38:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_socket.c,v 1.63 2009/12/20 09:36:06 dsl Exp $ */ +/* $NetBSD: sys_socket.c,v 1.64 2011/06/30 22:38:50 dyoung Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.63 2009/12/20 09:36:06 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.64 2011/06/30 22:38:50 dyoung Exp $"); #include #include @@ -100,8 +100,7 @@ struct socket *so = fp->f_data; int error; - error = (*so->so_receive)(so, (struct mbuf **)0, - uio, (struct mbuf **)0, (struct mbuf **)0, (int *)0); + error = (*so->so_receive)(so, NULL, uio, NULL, NULL, NULL); return error; } @@ -114,8 +113,7 @@ struct socket *so = fp->f_data; int error; - error = (*so->so_send)(so, (struct mbuf *)0, - uio, (struct mbuf *)0, (struct mbuf *)0, 0, curlwp); + error = (*so->so_send)(so, NULL, uio, NULL, NULL, 0, curlwp); return error; } @@ -234,13 +232,12 @@ struct socket *so = fp->f_data; int error; - memset((void *)ub, 0, sizeof(*ub)); + memset(ub, 0, sizeof(*ub)); ub->st_mode = S_IFSOCK; solock(so); error = (*so->so_proto->pr_usrreq)(so, PRU_SENSE, - (struct mbuf *)ub, (struct mbuf *)0, (struct mbuf *)0, - curlwp); + (struct mbuf *)ub, NULL, NULL, curlwp); sounlock(so); return error;
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: joerg
Date: Thu Jun 30 23:28:03 UTC 2011
Modified Files:
src/sys/arch/i386/i386: machdep.c
Log Message:
Fix sizeof() usage in memcpy, curtesy of the new warning in clang.
To generate a diff of this commit:
cvs rdiff -u -r1.704 -r1.705 src/sys/arch/i386/i386/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/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.704 src/sys/arch/i386/i386/machdep.c:1.705
--- src/sys/arch/i386/i386/machdep.c:1.704 Sun Jun 12 03:35:42 2011
+++ src/sys/arch/i386/i386/machdep.c Thu Jun 30 23:28:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.704 2011/06/12 03:35:42 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.705 2011/06/30 23:28:03 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.704 2011/06/12 03:35:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.705 2011/06/30 23:28:03 joerg Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -1861,7 +1861,7 @@
memcpy(
&pcb->pcb_savefpu.sv_xmm,
&mcp->__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm,
- sizeof (&pcb->pcb_savefpu.sv_xmm));
+ sizeof (pcb->pcb_savefpu.sv_xmm));
} else {
/* This is a weird corner case */
process_xmm_to_s87((struct savexmm *)
CVS commit: src/lib/libc/compat/gen
Module Name:src
Committed By: joerg
Date: Fri Jul 1 01:08:59 UTC 2011
Modified Files:
src/lib/libc/compat/gen: compat_utmpx.c
Log Message:
Fix memcpy usage.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/gen/compat_utmpx.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/compat/gen/compat_utmpx.c
diff -u src/lib/libc/compat/gen/compat_utmpx.c:1.3 src/lib/libc/compat/gen/compat_utmpx.c:1.4
--- src/lib/libc/compat/gen/compat_utmpx.c:1.3 Sun Jan 11 02:46:25 2009
+++ src/lib/libc/compat/gen/compat_utmpx.c Fri Jul 1 01:08:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_utmpx.c,v 1.3 2009/01/11 02:46:25 christos Exp $ */
+/* $NetBSD: compat_utmpx.c,v 1.4 2011/07/01 01:08:59 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_utmpx.c,v 1.3 2009/01/11 02:46:25 christos Exp $");
+__RCSID("$NetBSD: compat_utmpx.c,v 1.4 2011/07/01 01:08:59 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -79,7 +79,7 @@
{
(void)memcpy(ll->ll_line, ll50->ll_line, sizeof(ll->ll_line));
(void)memcpy(ll->ll_host, ll50->ll_host, sizeof(ll->ll_host));
- (void)memcpy(&ll->ll_ss, &ll50->ll_ss, sizeof(&ll->ll_ss));
+ (void)memcpy(&ll->ll_ss, &ll50->ll_ss, sizeof(ll->ll_ss));
timeval50_to_timeval(&ll50->ll_tv, &ll->ll_tv);
}
@@ -88,7 +88,7 @@
{
(void)memcpy(ll50->ll_line, ll->ll_line, sizeof(ll50->ll_line));
(void)memcpy(ll50->ll_host, ll->ll_host, sizeof(ll50->ll_host));
- (void)memcpy(&ll50->ll_ss, &ll->ll_ss, sizeof(&ll50->ll_ss));
+ (void)memcpy(&ll50->ll_ss, &ll->ll_ss, sizeof(ll50->ll_ss));
timeval_to_timeval50(&ll->ll_tv, &ll50->ll_tv);
}
CVS commit: src/lib/libtelnet
Module Name:src
Committed By: joerg
Date: Fri Jul 1 01:15:27 UTC 2011
Modified Files:
src/lib/libtelnet: sra.c
Log Message:
Fix memset usage. XXX should use static allocate and proper sizeof()
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libtelnet/sra.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/libtelnet/sra.c
diff -u src/lib/libtelnet/sra.c:1.8 src/lib/libtelnet/sra.c:1.9
--- src/lib/libtelnet/sra.c:1.8 Tue Oct 25 23:36:07 2005
+++ src/lib/libtelnet/sra.c Fri Jul 1 01:15:27 2011
@@ -32,7 +32,7 @@
#ifdef notdef
__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/sra.c,v 1.16 2002/05/06 09:48:02 markm Exp $");
#else
-__RCSID("$NetBSD: sra.c,v 1.8 2005/10/25 23:36:07 christos Exp $");
+__RCSID("$NetBSD: sra.c,v 1.9 2011/07/01 01:15:27 joerg Exp $");
#endif
#ifdef SRA
@@ -328,7 +328,7 @@
(void)strcpy(passprompt, "Password: ");
}
/* encode password */
- memset(pass,0,sizeof(pass));
+ memset(pass,0,256);
if (telnet_gets(passprompt,pass,255,0) == NULL) {
printf("\n");
exit(1);
CVS commit: src/lib/libcurses
Module Name:src
Committed By: joerg
Date: Fri Jul 1 01:19:33 UTC 2011
Modified Files:
src/lib/libcurses: addbytes.c
Log Message:
Fix memset usage.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/lib/libcurses/addbytes.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/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.38 src/lib/libcurses/addbytes.c:1.39
--- src/lib/libcurses/addbytes.c:1.38 Thu Dec 16 17:42:28 2010
+++ src/lib/libcurses/addbytes.c Fri Jul 1 01:19:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.38 2010/12/16 17:42:28 wiz Exp $ */
+/* $NetBSD: addbytes.c,v 1.39 2011/07/01 01:19:33 joerg Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.38 2010/12/16 17:42:28 wiz Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.39 2011/07/01 01:19:33 joerg Exp $");
#endif
#endif/* not lint */
@@ -157,7 +157,7 @@
/* not a valid conversion just eat a char */
wc = *bytes;
n = 1;
- (void)memset(&st, 0, sizeof(&st));
+ (void)memset(&st, 0, sizeof(st));
} else if (wc == 0) {
break;
}
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:21:39 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile
Added Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl: Makefile
Log Message:
install decimal, parallel and tr1_impl headers
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/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/libstdc++-v3/include/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.4 src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.5
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.4 Wed Jun 29 02:01:37 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile Fri Jul 1 01:21:38 2011
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2011/06/29 02:01:37 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/07/01 01:21:38 mrg Exp $
-SUBDIR= backward ext bits debug tr1
+SUBDIR= backward ext bits debug decimal parallel tr1 tr1_impl
#SUBDIR+= pb_assoc
.include
Added files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile:1.1
--- /dev/null Fri Jul 1 01:21:39 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile Fri Jul 1 01:21:38 2011
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2011/07/01 01:21:38 mrg Exp $
+
+.include
+
+.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+
+.cc: # disable .cc->NULL transform
+
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+
+INCS= ${G_decimal_headers}
+INCSDIR= /usr/include/g++/decimal
+
+.PATH: ${DIST}/libstdc++-v3/include/decimal
+
+# Get default targets including .
+.include
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile:1.1
--- /dev/null Fri Jul 1 01:21:39 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile Fri Jul 1 01:21:38 2011
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2011/07/01 01:21:38 mrg Exp $
+
+.include
+
+.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+
+.cc: # disable .cc->NULL transform
+
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+
+INCS= ${G_parallel_headers}
+INCSDIR= /usr/include/g++/parallel
+
+.PATH: ${DIST}/libstdc++-v3/include/parallel
+
+# Get default targets including .
+.include
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile:1.1
--- /dev/null Fri Jul 1 01:21:39 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile Fri Jul 1 01:21:39 2011
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2011/07/01 01:21:39 mrg Exp $
+
+.include
+
+.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+
+.cc: # disable .cc->NULL transform
+
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+
+INCS= ${G_tr1_impl_headers}
+INCSDIR= /usr/include/g++/tr1_impl
+
+.PATH: ${DIST}/libstdc++-v3/include/tr1_impl
+
+# Get default targets including .
+.include
CVS commit: src/external/gpl3/gcc/usr.bin/include
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:22:07 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/include: Makefile
Log Message:
install the posix_memalign version of mm_malloc.h, clean up
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/include/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/include/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/Makefile:1.2 src/external/gpl3/gcc/usr.bin/include/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/include/Makefile:1.2 Wed Jun 29 08:37:10 2011
+++ src/external/gpl3/gcc/usr.bin/include/Makefile Fri Jul 1 01:22:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/29 08:37:10 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/01 01:22:07 mrg Exp $
.include "../Makefile.inc"
@@ -6,30 +6,29 @@
INCS= altivec.h
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
INCS= \
- mmintrin.h \
- mm3dnow.h \
- xmmintrin.h \
- emmintrin.h \
- pmmintrin.h \
- tmmintrin.h \
+ abmintrin.h \
ammintrin.h \
- smmintrin.h \
- nmmintrin.h \
+ avxintrin.h \
bmmintrin.h \
+ emmintrin.h \
fma4intrin.h \
- wmmintrin.h \
+ ia32intrin.h \
immintrin.h \
+ lwpintrin.h \
+ mm3dnow.h \
+ mmintrin.h \
+ nmmintrin.h \
+ pmmintrin.h \
+ popcntintrin.h \
+ smmintrin.h \
+ tmmintrin.h \
+ wmmintrin.h \
x86intrin.h \
- avxintrin.h \
+ xmmintrin.h \
xopintrin.h \
- ia32intrin.h \
- popcntintrin.h \
- lwpintrin.h \
- abmintrin.h
+ mm_malloc.h
-# XXX this comment is no longer true:
-# We don't have posix_memalign, so use the gmm_malloc.h version.
-mm_malloc.h: ${DIST}/gcc/config/i386/gmm_malloc.h
+mm_malloc.h: ${DIST}/gcc/config/i386/pmm_malloc.h
cp $> ${.TARGET}
CLEANFILES+= mm_malloc.h
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:23:01 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: gcc.c
src/external/gpl3/gcc/dist/gcc/config: netbsd.h
Log Message:
move the LIBGCC_PICSUFFIX hack into netbsd.h as the REAL_LIBGCC_SPEC.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/gcc.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/netbsd.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/gcc.c
diff -u src/external/gpl3/gcc/dist/gcc/gcc.c:1.6 src/external/gpl3/gcc/dist/gcc/gcc.c:1.7
--- src/external/gpl3/gcc/dist/gcc/gcc.c:1.6 Thu Jun 30 03:37:23 2011
+++ src/external/gpl3/gcc/dist/gcc/gcc.c Fri Jul 1 01:23:00 2011
@@ -1753,47 +1753,24 @@
{
char *buf;
- buf = concat ("%{static",
-#ifdef LIBGCC_PICSUFFIX
- ": ", static_name, " ", eh_name, "}",
- "%{static-libgcc: ",
- "%{!shared:", static_name, " ", eh_name, "}",
- "%{shared:", static_name, LIBGCC_PICSUFFIX, " ",
- eh_name, LIBGCC_PICSUFFIX, "}",
-#else
- "|static-libgcc:", static_name, " ", eh_name,
-#endif
- "}"
+ buf = concat ("%{static|static-libgcc:", static_name, " ", eh_name, "}"
"%{!static:%{!static-libgcc:"
#if USE_LD_AS_NEEDED
"%{!shared-libgcc:",
- static_name,
-#ifdef LIBGCC_PICSUFFIX
- LIBGCC_PICSUFFIX,
-#endif
- " --as-needed ", shared_name, " --no-as-needed"
+ static_name, " --as-needed ", shared_name, " --no-as-needed"
"}"
"%{shared-libgcc:",
- shared_name, "%{!shared: ", static_name,
-#ifdef LIBGCC_PICSUFFIX
- LIBGCC_PICSUFFIX,
-#endif
- "}"
+ shared_name, "%{!shared: ", static_name, "}"
"}"
#else
"%{!shared:"
"%{!shared-libgcc:", static_name, " ", eh_name, "}"
"%{shared-libgcc:", shared_name, " ", static_name, "}"
"}"
-/* XXX NH XXX */
-#ifdef LINK_EH_SPEC || 1
+#ifdef LINK_EH_SPEC
"%{shared:"
"%{shared-libgcc:", shared_name, "}"
- "%{!shared-libgcc:", static_name,
-#ifdef LIBGCC_PICSUFFIX
- LIBGCC_PICSUFFIX,
-#endif
- "}"
+ "%{!shared-libgcc:", static_name, "}"
"}"
#else
"%{shared:", shared_name, "}"
Index: src/external/gpl3/gcc/dist/gcc/config/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.4 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.5
--- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.4 Tue Jun 28 09:27:39 2011
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h Fri Jul 1 01:23:01 2011
@@ -149,12 +149,21 @@
#undef LIB_SPEC
#define LIB_SPEC NETBSD_LIB_SPEC
-/* Don't provide a LIBGCC_SPEC appropriate for NetBSD as the default
- is correct. In the --disabled-shared case -lgcc is perfect. */
+/* Provide a LIBGCC_SPEC for NetBSD that will find libgcc_pic. Override
+ the this entirely by defining REAL_LIBGCC_SPEC. */
-#if defined(NETBSD_TOOLS) || defined(NETBSD_NATIVE)
-#define LIBGCC_PICSUFFIX "_pic"
-#endif
+#define NETBSD_LIBGCC_SPEC \
+ "%{static:-lgcc -lgcc_eh} \
+ %{static-libgcc: \
+ %{!shared:-lgcc -lgcc_eh \
+ %{shared:-lgcc_pic -lgcc_eh_pic}}}\
+ %{!static:\
+ %{!static-libgcc: \
+ %{!shared-libgcc:-lgcc_pic --as-needed -lgcc_s --no-as-needed } \
+ %{shared-libgcc:-lgcc_s \
+ %{!shared: -lgcc_pic" \
+
+#define REAL_LIBGCC_SPEC NETBSD_LIBGCC_SPEC
/* Pass -cxx-isystem to cc1/cc1plus. */
#define NETBSD_CC1_AND_CC1PLUS_SPEC \
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: mrg Date: Fri Jul 1 01:23:23 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: arm.h Log Message: define HANDLE_PRAGMA_PACK_PUSH_POP to 1 not just define it To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/config/arm/arm.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/arm.h diff -u src/external/gpl3/gcc/dist/gcc/config/arm/arm.h:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/arm/arm.h:1.2 --- src/external/gpl3/gcc/dist/gcc/config/arm/arm.h:1.1.1.1 Tue Jun 21 01:22:22 2011 +++ src/external/gpl3/gcc/dist/gcc/config/arm/arm.h Fri Jul 1 01:23:23 2011 @@ -2111,7 +2111,7 @@ (GET_CODE (X) == REG && ARM_REG_OK_FOR_INDEX_P (X)) /* Define this for compatibility reasons. */ -#define HANDLE_PRAGMA_PACK_PUSH_POP +#define HANDLE_PRAGMA_PACK_PUSH_POP 1 /* Specify the machine mode that this machine uses for the index in the tablejump instruction. */
CVS commit: src/external/gpl3/gcc/dist/gcc/config/sparc
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:24:04 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/sparc: netbsd-elf.h
Log Message:
fix a merge error.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/gcc/config/sparc/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/sparc/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.2 src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.3
--- src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.2 Tue Jun 21 02:41:37 2011
+++ src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h Fri Jul 1 01:24:04 2011
@@ -132,7 +132,9 @@
%{!mf934: \
%{!mv8*: \
%{!msupersparc:-mcpu=ultrasparc}}} \
-%{!mno-vis:%{!mcpu=v9:-mvis}}" \
+%{!mno-vis:%{!mcpu=v9:-mvis}} \
+%{p:-mcmodel=medlow} \
+%{pg:-mcmodel=medlow}}" \
NETBSD_CC1_AND_CC1PLUS_SPEC
#define CC1_SPEC64 \
@@ -150,7 +152,10 @@
%{!mf930: \
%{!mf934: \
%{!mv8*: \
- %{!msupersparc:-mcpu=cypress" \
+ %{!msupersparc:-mcpu=cypress \
+ %{!m32: \
+ %{p:-mcmodel=medlow} \
+ %{pg:-mcmodel=medlow}}" \
NETBSD_CC1_AND_CC1PLUS_SPEC
/* Make sure we use the right output format. Pick a default and then
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:24:53 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/crtstuff: Makefile
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libobjc: Makefile
Added Files:
src/external/gpl3/gcc/lib: Makefile.hacks
Log Message:
consolidate unwind.h and other hacks into a new Makefile.hacks that
everyone else can use
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/Makefile.hacks
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/crtstuff/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 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/crtstuff/Makefile
diff -u src/external/gpl3/gcc/lib/crtstuff/Makefile:1.3 src/external/gpl3/gcc/lib/crtstuff/Makefile:1.4
--- src/external/gpl3/gcc/lib/crtstuff/Makefile:1.3 Wed Jun 29 01:56:57 2011
+++ src/external/gpl3/gcc/lib/crtstuff/Makefile Fri Jul 1 01:24:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/29 01:56:57 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/01 01:24:53 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -51,14 +51,7 @@
.PATH: ${DIST}/gcc ${DIST}/gcc/config ${G_CONFIGDIR}
.include "../Makefile.tconfigh"
-
-# these aren't necessary but are #include'd
-FAKEHEADERS=options.h insn-flags.h insn-constants.h
-${FAKEHEADERS}:
- ${_MKTARGET_CREATE}
- touch ${.TARGET}
-DPSRCS+= ${FAKEHEADERS}
-CLEANFILES+= ${FAKEHEADERS}
+.include "../Makefile.hacks"
${OBJS}: ${DPSRCS}
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.5 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.6
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.5 Wed Jun 29 08:05:52 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Jul 1 01:24:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2011/06/29 08:05:52 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.6 2011/07/01 01:24:53 mrg Exp $
.if ${MKGCC} != "no"
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -82,7 +82,7 @@
CLEANFILES+= ${LIB1ASMFUNCS}
.endif
-.for file in ${G_LIB2ADD:M${GNUHOSTDIST}*}
+.for file in ${G_LIB2ADD:M${GNUHOSTDIST}*:N*.c}
BUILDSYMLINKS+= ${file} ${file:T:S/.asm$/.S/}
.endfor
@@ -150,13 +150,8 @@
.include "../Makefile.tconfigh"
DPSRCS+= tconfig.h
+${SRCS}: unwind.h
BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h
DPSRCS+= unwind.h
-# these aren't necessary but are #include'd
-FAKEHEADERS=options.h insn-flags.h insn-constants.h
-${FAKEHEADERS}:
- ${_MKTARGET_CREATE}
- touch ${.TARGET}
-DPSRCS+= ${FAKEHEADERS}
-CLEANFILES+= ${FAKEHEADERS}
+.include "../../Makefile.hacks"
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.3 src/external/gpl3/gcc/lib/libobjc/Makefile:1.4
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.3 Wed Jun 29 01:56:58 2011
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Fri Jul 1 01:24:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/29 01:56:58 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/01 01:24:53 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -73,24 +73,13 @@
${OBJS} ${POBJS} ${SOBJS}: runtime-info.h
-# these aren't necessary but are #include'd
-FAKEHEADERS= ${EXTRA_FAKEHEADERS} insn-flags.h insn-constants.h
-${FAKEHEADERS}:
- ${_MKTARGET_CREATE}
- touch ${.TARGET}
-tm.h ${SRCS}: ${FAKEHEADERS}
-CLEANFILES+= ${FAKEHEADERS}
-
${SRCS}: tconfig.h unwind.h options.h
-.include "../Makefile.tconfigh"
-
-unwind.h: ${G_UNWIND_H}
- ${_MKTARGET_CREATE}
- rm -f ${.TARGET}
- ln -s ${G_UNWIND_H} ${.TARGET}
+BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h
+DPSRCS+= unwind.h
-CLEANFILES+= unwind.h
+.include "../Makefile.tconfigh"
+.include "../Makefile.hacks"
# XXX just while all platforms defs.mk are updated..
.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk)
Added files:
Index: src/external/gpl3/gcc/lib/Makefile.hacks
diff -u /dev/null src/external/gpl3/gcc/lib/Makefile.hacks:1.1
--- /dev/null Fri Jul 1 01:24:53 2011
+++ src/external/gpl3/gcc/lib/Makefile.hacks Fri Jul 1 01:24:53 2011
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.hacks,v 1.1 2011/07/01 01:24:53 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}:
+ ${_MKTARGET_CREATE}
+ touch ${.TARGET}
+tm.h ${SRCS}: ${FAKEHEADERS}
+CLEANFILES+= ${FAKEHEADERS}
+
+# arm.h wants MACHMODE aka "enum machine_mode" so we provide a hackful
+# one here to help build libs before gcc itself is built.
+
+# XXX arm hack
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb"
+${OBJS}: insn-modes.h
+# XXX XXX
+${__DPSRCS.d}: insn-modes.h
+insn-modes.h:
+ ${_MKTARGET_CREATE}
+ echo "enum machine_mode { X };" > ${.TARGE
CVS commit: src
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:25:52 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xtrap: Makefile.xtrap
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libXaw: Makefile
src/external/mit/xorg/lib/libXaw6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/lib/libc/softfloat: Makefile.inc
Log Message:
XXX: apply -Wno-error/friends to a few files
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xtrap/Makefile.xtrap
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXaw6/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.7 -r1.8 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/external/mit/xorg/bin/xtrap/Makefile.xtrap
diff -u src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.1.1.1 src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.2
--- src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xtrap/Makefile.xtrap Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xtrap,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile.xtrap,v 1.2 2011/07/01 01:25:52 mrg Exp $
NOMAN= 1
@@ -15,3 +15,8 @@
.include
.include
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS+= -Wno-error
+.endif
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.8 src/external/mit/xorg/lib/libGLU/Makefile:1.9
--- src/external/mit/xorg/lib/libGLU/Makefile:1.8 Mon Nov 22 21:05:29 2010
+++ src/external/mit/xorg/lib/libGLU/Makefile Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/22 21:05:29 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2011/07/01 01:25:52 mrg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -89,3 +89,10 @@
.include
.include
+
+# XXX
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
+COPTS.arcsorter.cc+= -Wno-error
+COPTS.sorter.cc+= -Wno-error
+COPTS.tobezier.cc+= -Wno-error
+.endif
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.7 src/external/mit/xorg/lib/libXaw/Makefile:1.8
--- src/external/mit/xorg/lib/libXaw/Makefile:1.7 Sun May 15 21:05:12 2011
+++ src/external/mit/xorg/lib/libXaw/Makefile Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/05/15 21:05:12 christos Exp $
+# $NetBSD: Makefile,v 1.8 2011/07/01 01:25:52 mrg Exp $
.include
@@ -70,3 +70,8 @@
.include
.include
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS.XawIm.c+= -Wno-error
+.endif
Index: src/external/mit/xorg/lib/libXaw6/Makefile
diff -u src/external/mit/xorg/lib/libXaw6/Makefile:1.7 src/external/mit/xorg/lib/libXaw6/Makefile:1.8
--- src/external/mit/xorg/lib/libXaw6/Makefile:1.7 Sun May 15 21:09:30 2011
+++ src/external/mit/xorg/lib/libXaw6/Makefile Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/05/15 21:09:30 christos Exp $
+# $NetBSD: Makefile,v 1.8 2011/07/01 01:25:52 mrg Exp $
NOCHECKVER= yes # we want to install an older version ...
MKLINKLIB= no
@@ -36,3 +36,8 @@
.include
.include
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS.XawIm.c+= -Wno-error
+.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.2 Tue Jun 8 04:31:43 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/06/08 04:31:43 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/01 01:25:52 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -42,3 +42,8 @@
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
.include "../Makefile.xf86-driver"
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS.via_dri.c+= -Wno-error
+.endif
Index: src/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.7 src/lib/libc/softfloat/Makefile.inc:1.8
--- src/lib/libc/softfloat/Makefile.inc:1.7 Mon Jan 17 10:08:35 2011
+++ src/lib/libc/softfloat/Makefile.inc Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/01/17 10:08:35 matt Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/07/01 01:25:52 mrg Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@@ -18,3 +18,9 @@
nexf2.c gtxf2.c gexf2.c negxf2.c unordsf2.c unorddf2.c
SRCS+= ${SRCS.softfloat}
+
+# XXX
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && \
+(${MACHINE_ARCH} == "a
CVS commit: src
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:26:16 UTC 2011
Modified Files:
src/sbin/newfs_v7fs: Makefile
src/sys/arch/i386/stand/boot: Makefile.boot
Log Message:
remove HAVE_GCC == 4 conditional
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/newfs_v7fs/Makefile
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/i386/stand/boot/Makefile.boot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_v7fs/Makefile
diff -u src/sbin/newfs_v7fs/Makefile:1.1 src/sbin/newfs_v7fs/Makefile:1.2
--- src/sbin/newfs_v7fs/Makefile:1.1 Mon Jun 27 11:52:58 2011
+++ src/sbin/newfs_v7fs/Makefile Fri Jul 1 01:26:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/27 11:52:58 uch Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/01 01:26:15 mrg Exp $
.include
@@ -16,7 +16,7 @@
CPPFLAGS+=-DV7FS_EI -I${V7FS} -I${FSCK} -g
.PATH: ${V7FS} ${FSCK}
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
+.if defined(HAVE_GCC)
COPTS.newfs_v7fs.c+= -Wno-pointer-sign
.endif
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.53 src/sys/arch/i386/stand/boot/Makefile.boot:1.54
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.53 Mon Jun 20 06:52:37 2011
+++ src/sys/arch/i386/stand/boot/Makefile.boot Fri Jul 1 01:26:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.53 2011/06/20 06:52:37 mrg Exp $
+# $NetBSD: Makefile.boot,v 1.54 2011/07/01 01:26:16 mrg Exp $
S= ${.CURDIR}/../../../../..
@@ -83,7 +83,7 @@
SAMISCMAKEFLAGS+= SA_USE_CREAD=yes # Read compressed kernels
SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no # Netboot via TFTP, NFS
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
CPPFLAGS+= -Wno-pointer-sign
.endif
CVS commit: src/sys/arch
Module Name:src Committed By: mrg Date: Fri Jul 1 01:26:38 UTC 2011 Modified Files: src/sys/arch/arm/include: stdarg.h src/sys/arch/powerpc/include: stdarg.h Log Message: add GCC 4.5 support To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/include/stdarg.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/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/arm/include/stdarg.h diff -u src/sys/arch/arm/include/stdarg.h:1.10 src/sys/arch/arm/include/stdarg.h:1.11 --- src/sys/arch/arm/include/stdarg.h:1.10 Sat Jun 21 00:56:39 2008 +++ src/sys/arch/arm/include/stdarg.h Fri Jul 1 01:26:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stdarg.h,v 1.10 2008/06/21 00:56:39 gmcgarry Exp $ */ +/* $NetBSD: stdarg.h,v 1.11 2011/07/01 01:26:38 mrg Exp $ */ /* * Copyright (c) 1991, 1993 @@ -41,13 +41,18 @@ #ifdef __lint__ #define __builtin_next_arg(t) ((t) ? 0 : 0) #define __builtin_stdarg_start(a, l) ((a) = ((l) ? 0 : 0)) +#define __builtin_va_start(a, l) ((a) = ((l) ? 0 : 0)) #define __builtin_va_arg(a, t) ((t)((a) ? 0 : 0)) #define __builtin_va_end /* nothing */ #define __builtin_va_copy(d, s) ((d) = (s)) #endif #if __GNUC_PREREQ__(2, 96) +#if __GNUC_PREREQ__(4, 5) +#define va_start(ap, last) __builtin_va_start((ap), (last)) +#else #define va_start(ap, last) __builtin_stdarg_start((ap), (last)) +#endif #define va_arg __builtin_va_arg #define va_end __builtin_va_end #define __va_copy(dest, src) __builtin_va_copy((dest), (src)) Index: src/sys/arch/powerpc/include/stdarg.h diff -u src/sys/arch/powerpc/include/stdarg.h:1.16 src/sys/arch/powerpc/include/stdarg.h:1.17 --- src/sys/arch/powerpc/include/stdarg.h:1.16 Sat Jun 21 00:56:39 2008 +++ src/sys/arch/powerpc/include/stdarg.h Fri Jul 1 01:26:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stdarg.h,v 1.16 2008/06/21 00:56:39 gmcgarry Exp $ */ +/* $NetBSD: stdarg.h,v 1.17 2011/07/01 01:26:38 mrg Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -53,7 +53,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: Fri Jul 1 01:27:17 UTC 2011
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
- call each ${MKNATIVE_CONFIG_TARGET_LIBS} target separately
- comment out maybe-all-target-libgcc
- cope with the special transformation needed for gtyp-input.list
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/tools/gcc/Makefile
cvs rdiff -u -r1.55 -r1.56 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.41 src/tools/gcc/Makefile:1.42
--- src/tools/gcc/Makefile:1.41 Thu Jun 30 07:02:17 2011
+++ src/tools/gcc/Makefile Fri Jul 1 01:27:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2011/06/30 07:02:17 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2011/07/01 01:27:17 mrg Exp $
.include
@@ -151,15 +151,17 @@
# edit Makefile so that maybe-all-gcc does not depend on all-gcc any more.
(cd .native && mv Makefile Makefile.config && \
${TOOL_SED} -e 's/\(maybe-all-gcc:\) all-gcc/\1/' \
+-e 's/\(maybe-all-target-libgcc:\) all-target-libgcc/\1/' \
< Makefile.config > Makefile)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h unwind.h)
+ (cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
+.for _lib in ${MKNATIVE_CONFIG_TARGET_LIBS}
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
- (cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so && \
- ${MKNATIVE_ENV} ${BUILD_MAKE} \
- ${MKNATIVE_CONFIG_TARGET_LIBS} \
+ (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} \
+ ${_lib} \
ALL_GCC_C= ALL_GCC_CXX= \
CC_FOR_TARGET=${CC:Q}' '${CCADDFLAGS:Q} \
CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
@@ -167,6 +169,7 @@
CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
ac_cv_prog_cc_cross=yes) && \
true
+.endfor
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/${MACHINE_GNU_PLATFORM}/libstdc++-v3/include && \
${MKNATIVE_ENV} ${BUILD_MAKE} \
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.55 src/tools/gcc/mknative-gcc:1.56
--- src/tools/gcc/mknative-gcc:1.55 Thu Jun 30 07:16:59 2011
+++ src/tools/gcc/mknative-gcc Fri Jul 1 01:27:17 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.56 2011/07/01 01:27:17 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -611,10 +611,15 @@
write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
done
- # ones we want to keep identical
- for f in all-tree.def gtyp-input.list; do
+ # keep identical
+ for f in all-tree.def; do
cp $_TMPDIR/gcc/$f $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
done
+
+ # special transforms
+ 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
}
# main #
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:29:12 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
clean up and add some missing dependancies
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.6 Wed Jun 29 02:17:35 2011
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Fri Jul 1 01:29:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/06/29 02:17:35 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/07/01 01:29:12 mrg Exp $
LIBISPRIVATE= yes
@@ -93,12 +93,7 @@
${_MKTARGET_LINK}
${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
-.if 0
-gtyp-input.list: Makefile
- for f in ${G_GTFILES}; do echo $f; done > ${.TARGET}
-CLEANFILES+= gtyp-input.list
-.endif
-
+# be nice to generate this entirely; but difficult.
gtyp-input.list.tmp: ${GCCARCH}/gtyp-input.list
sed s#SRCDIR#${DIST}# < ${.ALLSRC} > ${.TARGET}
CLEANFILES+= gtyp-input.list.tmp
@@ -166,7 +161,7 @@
# TARGET_CPU_DEFAULT="$(G_target_cpu_default)" \
# ${HOST_SH} ${GNUHOSTDIST}/gcc/mkconfig.sh ${.TARGET}
-tm_p.h: Makefile
+tm_p.h: Makefile tm-preds.h
${_MKTARGET_CREATE}
TARGET_CPU_DEFAULT="" \
HEADERS="$(G_tm_p_include_list)" DEFINES="" \
@@ -295,26 +290,11 @@
./gen${f:R} ${G_md_file} >${.TARGET}
.endfor
-.if 0
-#
-# "One of these things is not like the other"
-#
-CLEANFILES+= genattrtab insn-attrtab.c
-genattrtab.lo: ${HH} gtype-desc.h
-genautomata.lo: ${HH}
-genattrtab: genattrtab.lo genautomata.lo ${EXTRADEPENDS} ${G_BUILD_VARRAY:.o=.lo}
- ${_MKTARGET_LINK}
- ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} -lm
-insn-attrtab.c: genattrtab ${G_md_file}
- ${_MKTARGET_CREATE}
- ./genattrtab ${G_md_file} >${.TARGET}
-.endif
-
#
# Required hard-coded dependancies.
#
genextract.lo: insn-config.h
-insn-conditions.lo: insn-constants.h tm_p.h tm-preds.h
+insn-conditions.lo: insn-constants.h tm_p.h
build-ggc-none.lo: gtype-desc.h
ggc-none.o: gtype-desc.h
@@ -323,13 +303,15 @@
toplev.d toplev.o: options.h
coverage.d: gcov-iov.h
gcov-io.h: gcov-iov.h
-alias.d alias.o: insn-constants.h tm_p.h tm-preds.h
+alias.d alias.o: insn-constants.h tm_p.h
cgraphunit.d cgraphunit.o: gcov-io.h
vec.lo: gtype-desc.h
+gtype-desc.d gtype-desc.o: insn-constants.h
# XXX
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
i386.d i386.o: tm-constrs.h
.endif
+insn-emit.d insn-emit.o: tm-constrs.h
COPTS+=-Wno-stack-protector
CVS commit: src
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:30:17 UTC 2011
Modified Files:
src/compat/amd64/i386: bsd.i386.mk
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
src/compat/sparc64/sparc: bsd.sparc.mk
src/external/lgpl3/gmp/lib/libgmp: Makefile
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
- add support for src/compat builds
- use .include not .sinclude for the arch Makefile.inc file
- clean up
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/amd64/i386/bsd.i386.mk
cvs rdiff -u -r1.4 -r1.5 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.4 -r1.5 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.2 -r1.3 src/compat/sparc64/sparc/bsd.sparc.mk
cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/Makefile
cvs rdiff -u -r1.2 -r1.3 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/compat/amd64/i386/bsd.i386.mk
diff -u src/compat/amd64/i386/bsd.i386.mk:1.2 src/compat/amd64/i386/bsd.i386.mk:1.3
--- src/compat/amd64/i386/bsd.i386.mk:1.2 Sat Dec 19 00:15:13 2009
+++ src/compat/amd64/i386/bsd.i386.mk Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386.mk,v 1.2 2009/12/19 00:15:13 christos Exp $
+# $NetBSD: bsd.i386.mk,v 1.3 2011/07/01 01:30:16 mrg Exp $
LD+= -m elf_i386
MLIBDIR= i386
@@ -10,5 +10,7 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
+LIBGMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.4 src/compat/mips64/64/bsd.64.mk:1.5
--- src/compat/mips64/64/bsd.64.mk:1.4 Sat Dec 19 04:11:32 2009
+++ src/compat/mips64/64/bsd.64.mk Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.64.mk,v 1.4 2009/12/19 04:11:32 christos Exp $
+# $NetBSD: bsd.64.mk,v 1.5 2011/07/01 01:30:16 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf64btsmip
@@ -13,4 +13,7 @@
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
+LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
+LIBGMP_MACHINE_ARCH= ${MLIBDIR}
+
.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.4 src/compat/mips64/o32/bsd.o32.mk:1.5
--- src/compat/mips64/o32/bsd.o32.mk:1.4 Sat Dec 19 04:11:33 2009
+++ src/compat/mips64/o32/bsd.o32.mk Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.4 2009/12/19 04:11:33 christos Exp $
+# $NetBSD: bsd.o32.mk,v 1.5 2011/07/01 01:30:16 mrg Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -13,4 +13,7 @@
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
+LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
+LIBGMP_MACHINE_ARCH= ${MLIBDIR}
+
.include "${.PARSEDIR}/../../Makefile.compat"
Index: src/compat/sparc64/sparc/bsd.sparc.mk
diff -u src/compat/sparc64/sparc/bsd.sparc.mk:1.2 src/compat/sparc64/sparc/bsd.sparc.mk:1.3
--- src/compat/sparc64/sparc/bsd.sparc.mk:1.2 Sat Dec 19 04:11:33 2009
+++ src/compat/sparc64/sparc/bsd.sparc.mk Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sparc.mk,v 1.2 2009/12/19 04:11:33 christos Exp $
+# $NetBSD: bsd.sparc.mk,v 1.3 2011/07/01 01:30:16 mrg Exp $
LD+= -m elf32_sparc
MLIBDIR= sparc
@@ -10,5 +10,7 @@
CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
+LIBMPFR_MACHINE_ARCH= ${MLIBDIR}
+LIBGMP_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
Index: src/external/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.4 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.5
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.4 Wed Jun 29 08:09:43 2011
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Fri Jul 1 01:30:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/29 08:09:43 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/07/01 01:30:16 mrg Exp $
.include
@@ -139,24 +139,10 @@
.endfor
-.if 0
-# Build the generic popcount/hamdist for now
-.for _srcfile in \
- ${MPN_GENERIC_SRCS}
-mpn_${_srcfile}: Makefile
- echo '#include "mpn/generic/popham.c"' > ${.TARGET}
-
-COPTS.mpn_${_srcfile}+= -DOPERATION_${_srcfile:R}
-
-SRCS+= mpn_${_srcfile}
-CLEANFILES+= mpn_${_srcfile}
-.endfor
-.endif
-
INCS= gmp.h
INCSDIR= /usr/include
-CPPFLAGS+= -I. -I${DIST} -I${.CURDIR}/arch/${MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
+CPPFLAGS+= -I. -I${DIST} -I${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
WITHOUT_MAN= yes
@@ -190,12 +176,17 @@
CLEANFILES+= ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr
-.sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+.if defined(MLIBDIR)
+LIBGMP_MACHINE_ARCH:=${MLIBDIR}
+.endif
+LIBGMP_MACHINE_ARCH?=${MACHINE_ARCH}
+
+.include "${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/Makefile.
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch
Module Name:src Committed By: mrg Date: Fri Jul 1 01:48:02 UTC 2011 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/sparc64: gmp-mparam.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/x86_64: gmp-mparam.h gmp.h Log Message: XXX: patch these files to let them work with src/compat style builds To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp-mparam.h \ src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp-mparam.h \ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/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/sparc64/gmp-mparam.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp-mparam.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp-mparam.h:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp-mparam.h:1.1 Wed Jun 29 02:56:24 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp-mparam.h Fri Jul 1 01:48:02 2011 @@ -18,8 +18,13 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ +#ifdef _LP64 #define GMP_LIMB_BITS 64 #define BYTES_PER_MP_LIMB 8 +#else +#define GMP_LIMB_BITS 32 +#define BYTES_PER_MP_LIMB 4 +#endif /* 500 MHz ultrasparc2 running GNU/Linux */ Index: src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp.h:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp.h:1.1 Wed Jun 29 02:56:24 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp.h Fri Jul 1 01:48:02 2011 @@ -30,7 +30,11 @@ #if ! defined (__GMP_WITHIN_CONFIGURE) #define __GMP_HAVE_HOST_CPU_FAMILY_power 0 #define __GMP_HAVE_HOST_CPU_FAMILY_powerpc 0 +#ifdef _LP64 #define GMP_LIMB_BITS 64 +#else +#define GMP_LIMB_BITS 32 +#endif #define GMP_NAIL_BITS 0 #endif #define GMP_NUMB_BITS (GMP_LIMB_BITS - GMP_NAIL_BITS) Index: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp-mparam.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp-mparam.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp-mparam.h:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp-mparam.h:1.1 Thu Jun 23 12:09:30 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp-mparam.h Fri Jul 1 01:48:02 2011 @@ -18,8 +18,13 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ +#ifdef _LP64 #define GMP_LIMB_BITS 64 #define BYTES_PER_MP_LIMB 8 +#else +#define GMP_LIMB_BITS 32 +#define BYTES_PER_MP_LIMB 4 +#endif #define MOD_1_NORM_THRESHOLD 0 /* always */ Index: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.1 Tue Jun 21 04:23:56 2011 +++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h Fri Jul 1 01:48:02 2011 @@ -30,7 +30,11 @@ #if ! defined (__GMP_WITHIN_CONFIGURE) #define __GMP_HAVE_HOST_CPU_FAMILY_power 0 #define __GMP_HAVE_HOST_CPU_FAMILY_powerpc 0 +#ifdef _LP64 #define GMP_LIMB_BITS 64 +#else +#define GMP_LIMB_BITS 32 +#endif #define GMP_NAIL_BITS 0 #endif #define GMP_NUMB_BITS (GMP_LIMB_BITS - GMP_NAIL_BITS)
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/i386
Module Name:src
Committed By: mrg
Date: Fri Jul 1 01:49:18 UTC 2011
Modified Files:
src/external/lgpl3/gmp/lib/libgmp/arch/i386: Makefile.inc config.h
Log Message:
use C versions of various sources for now. there's an m4 problem that
fails to properly deal with defframe() macro being defined.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc \
src/external/lgpl3/gmp/lib/libgmp/arch/i386/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/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.1 Wed Jun 29 08:06:47 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc Fri Jul 1 01:49:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/06/29 08:06:47 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/01 01:49:18 mrg Exp $
SRCS+= \
random.c \
@@ -134,25 +134,34 @@
andn_n.c mpn/generic/logops_n.c \
ASM_SRCS_LIST= \
- add_n.asm mpn/x86/aors_n.asm \
- sqr_basecase.asm mpn/x86/sqr_basecase.asm \
submul_1.asm mpn/x86/aorsmul_1.asm \
- umul.asm mpn/x86/umul.asm \
- mul_basecase.asm mpn/x86/mul_basecase.asm \
- lshift.asm mpn/x86/lshift.asm \
- mul_1.asm mpn/x86/mul_1.asm \
- divrem_1.asm mpn/x86/divrem_1.asm \
- copyd.asm mpn/x86/copyd.asm \
bdiv_dbm1c.asm mpn/x86/bdiv_dbm1c.asm \
- udiv.asm mpn/x86/udiv.asm \
- dive_1.asm mpn/x86/dive_1.asm \
- copyi.asm mpn/x86/copyi.asm \
- rshift.asm mpn/x86/rshift.asm \
- mod_34lsub1.asm mpn/x86/mod_34lsub1.asm \
- invert_limb.asm mpn/x86/invert_limb.asm \
addmul_1.asm mpn/x86/aorsmul_1.asm \
divrem_2.asm mpn/x86/divrem_2.asm \
- sub_n.asm mpn/x86/aors_n.asm \
+
+# XXX using C versions
+# add_n.asm mpn/x86/aors_n.asm \
+# bdiv_q_1.asm mpn/x86_64/bdiv_q_1.asm \
+# copyd.asm mpn/x86/copyd.asm \
+# copyi.asm mpn/x86/copyi.asm \
+# dive_1.asm mpn/x86/dive_1.asm \
+# divrem_1.asm mpn/x86/divrem_1.asm \
+# invert_limb.asm mpn/x86/invert_limb.asm \
+# lshift.asm mpn/x86/lshift.asm \
+# rshift.asm mpn/x86/rshift.asm \
+# mod_34lsub1.asm mpn/x86/mod_34lsub1.asm \
+# umul.asm mpn/x86/umul.asm \
+# mul_1.asm mpn/x86/mul_1.asm \
+# sqr_basecase.asm mpn/x86/sqr_basecase.asm \
+# mul_basecase.asm mpn/x86/mul_basecase.asm \
+# sub_n.asm mpn/x86/aors_n.asm \
+
+# udiv.asm mpn/x86/udiv.asm \
+
+SRCS+= add_n.c bdiv_q_1.c copyd.c copyi.c dive_1.c lshift.c rshift.c mod_34lsub1.c
+SRCS+= mul_1.c sqr_basecase.c mul_basecase.c sub_n.c divrem_1.c
+# XXX? put in C_SRCS_LIST?
+# divrem.c
gen-trialdivtab: gen-trialdivtab.c
${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
Index: src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.1 Wed Jun 29 08:06:47 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h Fri Jul 1 01:49:18 2011
@@ -215,7 +215,8 @@
implementation of the corresponding routine exists. */
#define HAVE_NATIVE_mpn_add_n 1
/* #undef HAVE_NATIVE_mpn_add_n_sub_n */
-#define HAVE_NATIVE_mpn_add_nc 1
+/* XXXMRG */
+/* #define HAVE_NATIVE_mpn_add_nc 1 */
/* #undef HAVE_NATIVE_mpn_addaddmul_1msb0 */
/* #undef HAVE_NATIVE_mpn_addlsh1_n */
/* #undef HAVE_NATIVE_mpn_addlsh2_n */
@@ -243,7 +244,8 @@
#define HAVE_NATIVE_mpn_divrem_2 1
/* #undef HAVE_NATIVE_mpn_gcd_1 */
/* #undef HAVE_NATIVE_mpn_hamdist */
-#define HAVE_NATIVE_mpn_invert_limb 1
+/* XXXMRG */
+/* #define HAVE_NATIVE_mpn_invert_limb 1 */
/* #undef HAVE_NATIVE_mpn_ior_n */
/* #undef HAVE_NATIVE_mpn_iorn_n */
#define HAVE_NATIVE_mpn_lshift 1
@@ -281,7 +283,7 @@
#define HAVE_NATIVE_mpn_sqr_basecase 1
/* #undef HAVE_NATIVE_mpn_sqr_diagonal */
#define HAVE_NATIVE_mpn_sub_n 1
-#define HAVE_NATIVE_mpn_sub_nc 1
+/* #define HAVE_NATIVE_mpn_sub_nc 1 */
/* #undef HAVE_NATIVE_mpn_sublsh1_n */
/* #undef HAVE_NATIVE_mpn_sublsh2_n */
/* #undef HAVE_NATIVE_mpn_sublsh_n */
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(,<`/usr/src/external/lgpl3/gmp/dist'>) +dnl define(,<`/usr/src/external/lgpl3/gmp/dist'>) define(,0) define(,<`no'>) define(,) 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(,<`/usr/src/external/lgpl3/gmp/dist'>) +dnl define(,<`/usr/src/external/lgpl3/gmp/dist'>) define(,0) define(,<`no'>) define(,)
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Fri Jul 1 02:04:15 UTC 2011 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: mipsX_subr.S Log Message: Some RMI TLB locking fixes. To generate a diff of this commit: cvs rdiff -u -r1.26.36.1.2.45 -r1.26.36.1.2.46 \ src/sys/arch/mips/mips/mipsX_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/mipsX_subr.S diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.45 src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.46 --- src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.45 Mon Jun 6 21:53:42 2011 +++ src/sys/arch/mips/mips/mipsX_subr.S Fri Jul 1 02:04:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.45 2011/06/06 21:53:42 matt Exp $ */ +/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.46 2011/07/01 02:04:15 matt Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -1662,7 +1662,7 @@ _MFC0 k1, MIPS_COP_0_OSSCRATCH, 2 # get tlblock addr li k0, __SIMPLELOCK_LOCKED 1: swapw k0, k1# set it to locked - bnez k1, 1b# was it locked? + bnez k0, 1b# was it locked? nop # if it was, try again #else #define TLB_INVALID_EXCEPTION_EXIT _C_LABEL(MIPSX(kern_gen_exception)) @@ -1736,6 +1736,10 @@ nop nop #endif +#if defined(MULTIPROCESSOR) && (MIPS64_RMIXL + MIPS64R2_RMIXL) > 0 + _MFC0 k1, MIPS_COP_0_OSSCRATCH, 2 # get tlblock addr + INT_S zero, 0(k1) # clear lock +#endif eret MIPSX(kern_tlbi_odd):
CVS commit: src/crypto/external/bsd/heimdal/dist/lib
Module Name:src
Committed By: joerg
Date: Fri Jul 1 02:10:20 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: cert.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: crypto-des3.c
Log Message:
Fix memset usage.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.1.1.1 Wed Apr 13 18:15:10 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c Fri Jul 1 02:10:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cert.c,v 1.1.1.1 2011/04/13 18:15:10 elric Exp $ */
+/* $NetBSD: cert.c,v 1.2 2011/07/01 02:10:19 joerg Exp $ */
/*
* Copyright (c) 2004 - 2007 Kungliga Tekniska Högskolan
@@ -357,7 +357,7 @@
free(cert->friendlyname);
if (cert->basename)
hx509_name_free(&cert->basename);
-memset(cert, 0, sizeof(cert));
+memset(cert, 0, sizeof(*cert));
free(cert);
}
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.1.1.1 Wed Apr 13 18:15:32 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c Fri Jul 1 02:10:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto-des3.c,v 1.1.1.1 2011/04/13 18:15:32 elric Exp $ */
+/* $NetBSD: crypto-des3.c,v 1.2 2011/07/01 02:10:19 joerg Exp $ */
/*
* Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
@@ -204,7 +204,7 @@
DES_cblock *k;
int i, j;
-memset(x, 0, sizeof(x));
+memset(x, 0, 32);
for (i = 0; i < 3; ++i) {
unsigned char foo;
for (j = 0; j < 7; ++j) {
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/openldap/dist/libraries/liblutil
Module Name:src Committed By: joerg Date: Fri Jul 1 02:01:21 UTC 2011 Modified Files: src/external/bsd/openldap/dist/libraries/liblutil: md5.c Log Message: Fix memset usage. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ src/external/bsd/openldap/dist/libraries/liblutil/md5.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/openldap/dist/libraries/liblutil/md5.c diff -u src/external/bsd/openldap/dist/libraries/liblutil/md5.c:1.1.1.3 src/external/bsd/openldap/dist/libraries/liblutil/md5.c:1.2 --- src/external/bsd/openldap/dist/libraries/liblutil/md5.c:1.1.1.3 Sun Dec 12 15:22:09 2010 +++ src/external/bsd/openldap/dist/libraries/liblutil/md5.c Fri Jul 1 02:01:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: md5.c,v 1.1.1.3 2010/12/12 15:22:09 adam Exp $ */ +/* $NetBSD: md5.c,v 1.2 2011/07/01 02:01:21 joerg Exp $ */ /* md5.c -- MD5 message-digest algorithm */ /* OpenLDAP: pkg/ldap/libraries/liblutil/md5.c,v 1.19.2.5 2010/04/13 20:23:06 kurt Exp */ @@ -187,7 +187,7 @@ putu32(ctx->buf[1], digest + 4); putu32(ctx->buf[2], digest + 8); putu32(ctx->buf[3], digest + 12); - memset(ctx, '\0', sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, '\0', sizeof(*ctx)); /* In case it's sensitive */ } #ifndef ASM_MD5
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) ((errcode<<8) & 0xff00)); + rpkt.status = htons((u_short) ((errcode & 0xff) << 8)); rpkt.count = 0; /*
CVS commit: src/external/bsd/bind/dist/lib/isc
Module Name:src
Committed By: joerg
Date: Fri Jul 1 02:24:14 UTC 2011
Modified Files:
src/external/bsd/bind/dist/lib/isc: hmacsha.c sha2.c
Log Message:
Fix memset usage. XXX audit the rest where hard coded sizes are used
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/lib/isc/hmacsha.c \
src/external/bsd/bind/dist/lib/isc/sha2.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/bind/dist/lib/isc/hmacsha.c
diff -u src/external/bsd/bind/dist/lib/isc/hmacsha.c:1.2 src/external/bsd/bind/dist/lib/isc/hmacsha.c:1.3
--- src/external/bsd/bind/dist/lib/isc/hmacsha.c:1.2 Wed Feb 16 03:47:11 2011
+++ src/external/bsd/bind/dist/lib/isc/hmacsha.c Fri Jul 1 02:24:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hmacsha.c,v 1.2 2011/02/16 03:47:11 christos Exp $ */
+/* $NetBSD: hmacsha.c,v 1.3 2011/07/01 02:24:14 joerg Exp $ */
/*
* Copyright (C) 2005-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -227,7 +227,7 @@
isc_hmacsha1_invalidate(isc_hmacsha1_t *ctx) {
isc_sha1_invalidate(&ctx->sha1ctx);
memset(ctx->key, 0, sizeof(ctx->key));
- memset(ctx, 0, sizeof(ctx));
+ memset(ctx, 0, sizeof(*ctx));
}
/*
@@ -295,7 +295,7 @@
void
isc_hmacsha224_invalidate(isc_hmacsha224_t *ctx) {
memset(ctx->key, 0, sizeof(ctx->key));
- memset(ctx, 0, sizeof(ctx));
+ memset(ctx, 0, sizeof(*ctx));
}
/*
@@ -362,7 +362,7 @@
void
isc_hmacsha256_invalidate(isc_hmacsha256_t *ctx) {
memset(ctx->key, 0, sizeof(ctx->key));
- memset(ctx, 0, sizeof(ctx));
+ memset(ctx, 0, sizeof(*ctx));
}
/*
@@ -429,7 +429,7 @@
void
isc_hmacsha384_invalidate(isc_hmacsha384_t *ctx) {
memset(ctx->key, 0, sizeof(ctx->key));
- memset(ctx, 0, sizeof(ctx));
+ memset(ctx, 0, sizeof(*ctx));
}
/*
@@ -496,7 +496,7 @@
void
isc_hmacsha512_invalidate(isc_hmacsha512_t *ctx) {
memset(ctx->key, 0, sizeof(ctx->key));
- memset(ctx, 0, sizeof(ctx));
+ memset(ctx, 0, sizeof(*ctx));
}
/*
Index: src/external/bsd/bind/dist/lib/isc/sha2.c
diff -u src/external/bsd/bind/dist/lib/isc/sha2.c:1.2 src/external/bsd/bind/dist/lib/isc/sha2.c:1.3
--- src/external/bsd/bind/dist/lib/isc/sha2.c:1.2 Wed Feb 16 03:47:11 2011
+++ src/external/bsd/bind/dist/lib/isc/sha2.c Fri Jul 1 02:24:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.2 2011/02/16 03:47:11 christos Exp $ */
+/* $NetBSD: sha2.c,v 1.3 2011/07/01 02:24:14 joerg Exp $ */
/*
* Copyright (C) 2005-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -897,7 +897,7 @@
}
/* Clean up state data: */
- memset(context, 0, sizeof(context));
+ memset(context, 0, sizeof(*context));
usedspace = 0;
}
@@ -1210,7 +1210,7 @@
}
/* Zero out state data */
- memset(context, 0, sizeof(context));
+ memset(context, 0, sizeof(*context));
}
@@ -1263,7 +1263,7 @@
}
/* Zero out state data */
- memset(context, 0, sizeof(context));
+ memset(context, 0, sizeof(*context));
}
#endif /* !ISC_PLATFORM_OPENSSLHASH */
@@ -1294,7 +1294,7 @@
#ifdef ISC_PLATFORM_OPENSSLHASH
EVP_MD_CTX_cleanup(context);
#else
- memset(context, 0, sizeof(context));
+ memset(context, 0, sizeof(*context));
#endif
}
memset(digest, 0, ISC_SHA224_DIGESTLENGTH);
@@ -1333,7 +1333,7 @@
#ifdef ISC_PLATFORM_OPENSSLHASH
EVP_MD_CTX_cleanup(context);
#else
- memset(context, 0, sizeof(context));
+ memset(context, 0, sizeof(*context));
#endif
}
memset(digest, 0, ISC_SHA256_DIGESTLENGTH);
@@ -1372,7 +1372,7 @@
#ifdef ISC_PLATFORM_OPENSSLHASH
EVP_MD_CTX_cleanup(context);
#else
- memset(context, 0, sizeof(context));
+ memset(context, 0, sizeof(*context));
#endif
}
memset(digest, 0, ISC_SHA512_DIGESTLENGTH);
@@ -1411,7 +1411,7 @@
#ifdef ISC_PLATFORM_OPENSSLHASH
EVP_MD_CTX_cleanup(context);
#else
- memset(context, 0, sizeof(context));
+ memset(context, 0, sizeof(*context));
#endif
}
memset(digest, 0, ISC_SHA384_DIGESTLENGTH);
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
-__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
@@ -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
@@ -8,3 +8,8 @@
.PATH: ${NETBSDSRCDIR}/lib/libc/time
.include
+
+# XXX
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
+COPTS.zdump.c+= -Wno-strict-overflow
+.endif
CVS commit: src/libexec/ftpd
Module Name:src
Committed By: joerg
Date: Fri Jul 1 02:46:15 UTC 2011
Modified Files:
src/libexec/ftpd: ftpcmd.y
Log Message:
Fix memcpy usage.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/libexec/ftpd/ftpcmd.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ftpd/ftpcmd.y
diff -u src/libexec/ftpd/ftpcmd.y:1.91 src/libexec/ftpd/ftpcmd.y:1.92
--- src/libexec/ftpd/ftpcmd.y:1.91 Fri Jan 14 23:56:13 2011
+++ src/libexec/ftpd/ftpcmd.y Fri Jul 1 02:46:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpcmd.y,v 1.91 2011/01/14 23:56:13 christos Exp $ */
+/* $NetBSD: ftpcmd.y,v 1.92 2011/07/01 02:46:15 joerg Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
#if 0
static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94";
#else
-__RCSID("$NetBSD: ftpcmd.y,v 1.91 2011/01/14 23:56:13 christos Exp $");
+__RCSID("$NetBSD: ftpcmd.y,v 1.92 2011/07/01 02:46:15 joerg Exp $");
#endif
#endif /* not lint */
@@ -974,7 +974,7 @@
data_dest.su_family = AF_INET6;
buf[0] = $39.i; buf[1] = $41.i;
(void)memcpy(&data_dest.su_port, buf,
- sizeof(&data_dest.su_port));
+ sizeof(data_dest.su_port));
buf[0] = $5.i; buf[1] = $7.i;
buf[2] = $9.i; buf[3] = $11.i;
buf[4] = $13.i; buf[5] = $15.i;
CVS commit: src/sys/net/agr
Module Name:src
Committed By: joerg
Date: Fri Jul 1 02:46:24 UTC 2011
Modified Files:
src/sys/net/agr: ieee8023ad_lacp.c
Log Message:
Fix memset usage.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/net/agr/ieee8023ad_lacp.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/net/agr/ieee8023ad_lacp.c
diff -u src/sys/net/agr/ieee8023ad_lacp.c:1.9 src/sys/net/agr/ieee8023ad_lacp.c:1.10
--- src/sys/net/agr/ieee8023ad_lacp.c:1.9 Fri May 29 04:57:05 2009
+++ src/sys/net/agr/ieee8023ad_lacp.c Fri Jul 1 02:46:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp.c,v 1.9 2009/05/29 04:57:05 darran Exp $ */
+/* $NetBSD: ieee8023ad_lacp.c,v 1.10 2011/07/01 02:46:24 joerg Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp.c,v 1.9 2009/05/29 04:57:05 darran Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp.c,v 1.10 2011/07/01 02:46:24 joerg Exp $");
#include
#include
@@ -447,7 +447,7 @@
{
struct ieee8023ad_port *iport = IEEE8023AD_PORT(port);
- memset(iport, 0, sizeof(iport));
+ memset(iport, 0, sizeof(*iport));
lacp_portinit(port);
}
CVS commit: src/libexec/lfs_cleanerd
Module Name:src Committed By: joerg Date: Fri Jul 1 02:48:48 UTC 2011 Modified Files: src/libexec/lfs_cleanerd: fdfs.c Log Message: Fix memset usage. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/libexec/lfs_cleanerd/fdfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/lfs_cleanerd/fdfs.c diff -u src/libexec/lfs_cleanerd/fdfs.c:1.7 src/libexec/lfs_cleanerd/fdfs.c:1.8 --- src/libexec/lfs_cleanerd/fdfs.c:1.7 Thu Aug 6 00:51:55 2009 +++ src/libexec/lfs_cleanerd/fdfs.c Fri Jul 1 02:48:48 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fdfs.c,v 1.7 2009/08/06 00:51:55 pooka Exp $ */ +/* $NetBSD: fdfs.c,v 1.8 2011/07/01 02:48:48 joerg Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -143,7 +143,7 @@ free(fs->fd_bufp[i].buf); free(fs->fd_bufp); free(fs); - memset(vp, 0, sizeof(vp)); + memset(vp, 0, sizeof(*vp)); } /*
CVS commit: src/sbin/pppoectl
Module Name:src
Committed By: joerg
Date: Fri Jul 1 02:51:52 UTC 2011
Modified Files:
src/sbin/pppoectl: pppoectl.c
Log Message:
Fix memset usage.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sbin/pppoectl/pppoectl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/pppoectl/pppoectl.c
diff -u src/sbin/pppoectl/pppoectl.c:1.21 src/sbin/pppoectl/pppoectl.c:1.22
--- src/sbin/pppoectl/pppoectl.c:1.21 Fri Mar 17 15:53:46 2006
+++ src/sbin/pppoectl/pppoectl.c Fri Jul 1 02:51:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pppoectl.c,v 1.21 2006/03/17 15:53:46 rumble Exp $ */
+/* $NetBSD: pppoectl.c,v 1.22 2011/07/01 02:51:52 joerg Exp $ */
/*
* Copyright (c) 1997 Joerg Wunsch
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: pppoectl.c,v 1.21 2006/03/17 15:53:46 rumble Exp $");
+__RCSID("$NetBSD: pppoectl.c,v 1.22 2011/07/01 02:51:52 joerg Exp $");
#endif
@@ -237,7 +237,7 @@
strncpy(status.ifname, ifname, sizeof status.ifname);
memset(&timeout, 0, sizeof timeout);
strncpy(timeout.ifname, ifname, sizeof timeout.ifname);
- memset(&authfailstats, 0, sizeof &authfailstats);
+ memset(&authfailstats, 0, sizeof authfailstats);
strncpy(authfailstats.ifname, ifname, sizeof authfailstats.ifname);
memset(&authfailset, 0, sizeof authfailset);
strncpy(authfailset.ifname, ifname, sizeof authfailset.ifname);
CVS commit: src/sbin/route
Module Name:src
Committed By: joerg
Date: Fri Jul 1 02:54:51 UTC 2011
Modified Files:
src/sbin/route: route.c
Log Message:
Fix memset usage.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sbin/route/route.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.130 src/sbin/route/route.c:1.131
--- src/sbin/route/route.c:1.130 Wed Jun 22 04:57:28 2011
+++ src/sbin/route/route.c Fri Jul 1 02:54:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.130 2011/06/22 04:57:28 kefren Exp $ */
+/* $NetBSD: route.c,v 1.131 2011/07/01 02:54:51 joerg Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: route.c,v 1.130 2011/06/22 04:57:28 kefren Exp $");
+__RCSID("$NetBSD: route.c,v 1.131 2011/07/01 02:54:51 joerg Exp $");
#endif
#endif /* not lint */
@@ -1464,7 +1464,7 @@
r = len & 7;
switch (af) {
case AF_INET:
- memset(soup->so_mask, 0, sizeof(soup->so_mask));
+ memset(soup->so_mask, 0, sizeof(*soup->so_mask));
soup->so_mask->sin.sin_family = AF_INET;
soup->so_mask->sin.sin_len = sizeof(struct sockaddr_in);
soup->so_mask->sin.sin_addr.s_addr = (len == 0 ? 0
CVS commit: src/lib/csu/arch
Module Name:src
Committed By: joerg
Date: Fri Jul 1 02:59:05 UTC 2011
Modified Files:
src/lib/csu/arch/i386: crt0.S
src/lib/csu/arch/powerpc: crt0.S
src/lib/csu/arch/x86_64: crt0.S
Log Message:
Explicitly declare ___start as hidden.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/i386/crt0.S
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/powerpc/crt0.S
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/x86_64/crt0.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/i386/crt0.S
diff -u src/lib/csu/arch/i386/crt0.S:1.2 src/lib/csu/arch/i386/crt0.S:1.3
--- src/lib/csu/arch/i386/crt0.S:1.2 Thu Jun 30 19:48:43 2011
+++ src/lib/csu/arch/i386/crt0.S Fri Jul 1 02:59:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.S,v 1.2 2011/06/30 19:48:43 joerg Exp $ */
+/* $NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -37,7 +37,9 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.2 2011/06/30 19:48:43 joerg Exp $")
+RCSID("$NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $")
+
+ .hidden ___start
STRONG_ALIAS(_start,__start)
_ENTRY(__start)
Index: src/lib/csu/arch/powerpc/crt0.S
diff -u src/lib/csu/arch/powerpc/crt0.S:1.2 src/lib/csu/arch/powerpc/crt0.S:1.3
--- src/lib/csu/arch/powerpc/crt0.S:1.2 Thu Jun 30 20:10:17 2011
+++ src/lib/csu/arch/powerpc/crt0.S Fri Jul 1 02:59:05 2011
@@ -29,10 +29,12 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.2 2011/06/30 20:10:17 matt Exp $")
+RCSID("$NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $")
STRONG_ALIAS(_start,__start)
+ .hidden ___start
+
.weak _SDA_BASE_
ENTRY_NOPROFILE(__start)
Index: src/lib/csu/arch/x86_64/crt0.S
diff -u src/lib/csu/arch/x86_64/crt0.S:1.2 src/lib/csu/arch/x86_64/crt0.S:1.3
--- src/lib/csu/arch/x86_64/crt0.S:1.2 Thu Jun 30 19:48:43 2011
+++ src/lib/csu/arch/x86_64/crt0.S Fri Jul 1 02:59:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.S,v 1.2 2011/06/30 19:48:43 joerg Exp $ */
+/* $NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -35,9 +35,10 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.2 2011/06/30 19:48:43 joerg Exp $")
+RCSID("$NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $")
STRONG_ALIAS(_start,__start)
+ .hidden ___start
_ENTRY(__start)
andq$~15,%rsp
CVS commit: src/usr.sbin/sdpd
Module Name:src
Committed By: joerg
Date: Fri Jul 1 03:07:21 UTC 2011
Modified Files:
src/usr.sbin/sdpd: server.c
Log Message:
Fix memset usage.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sdpd/server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sdpd/server.c
diff -u src/usr.sbin/sdpd/server.c:1.9 src/usr.sbin/sdpd/server.c:1.10
--- src/usr.sbin/sdpd/server.c:1.9 Mon Oct 18 20:43:23 2010
+++ src/usr.sbin/sdpd/server.c Fri Jul 1 03:07:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.9 2010/10/18 20:43:23 plunky Exp $ */
+/* $NetBSD: server.c,v 1.10 2011/07/01 03:07:21 joerg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -58,7 +58,7 @@
*/
#include
-__RCSID("$NetBSD: server.c,v 1.9 2010/10/18 20:43:23 plunky Exp $");
+__RCSID("$NetBSD: server.c,v 1.10 2011/07/01 03:07:21 joerg Exp $");
#include
#include
@@ -98,7 +98,7 @@
assert(srv != NULL);
assert(control != NULL);
- memset(srv, 0, sizeof(srv));
+ memset(srv, 0, sizeof(*srv));
FD_ZERO(&srv->fdset);
srv->sgroup = sgroup;
CVS commit: src/usr.sbin/ypserv/ypserv
Module Name:src
Committed By: joerg
Date: Fri Jul 1 03:09:29 UTC 2011
Modified Files:
src/usr.sbin/ypserv/ypserv: ypserv_proc.c
Log Message:
Replace malloc + incorrect memset with calloc.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/ypserv/ypserv/ypserv_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ypserv/ypserv/ypserv_proc.c
diff -u src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.14 src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.15
--- src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.14 Tue Oct 20 00:51:15 2009
+++ src/usr.sbin/ypserv/ypserv/ypserv_proc.c Fri Jul 1 03:09:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ypserv_proc.c,v 1.14 2009/10/20 00:51:15 snj Exp $ */
+/* $NetBSD: ypserv_proc.c,v 1.15 2011/07/01 03:09:29 joerg Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ypserv_proc.c,v 1.14 2009/10/20 00:51:15 snj Exp $");
+__RCSID("$NetBSD: ypserv_proc.c,v 1.15 2011/07/01 03:09:29 joerg Exp $");
#endif
#include
@@ -476,14 +476,12 @@
suffix = (char *)&dp->d_name[dp->d_namlen - 3];
if (strcmp(suffix, ".db") == 0) {
/* Found one. */
- m = (struct ypmaplist *)
- malloc(sizeof(struct ypmaplist));
+ m = calloc(1, sizeof(struct ypmaplist));
if (m == NULL) {
status = YP_YPERR;
goto out;
}
- (void)memset(m, 0, sizeof(m));
(void)strlcpy(m->ypml_name, dp->d_name,
(size_t)(dp->d_namlen - 2));
m->ypml_next = res.list;
CVS commit: src/lib/libc/gdtoa
Module Name:src
Committed By: matt
Date: Fri Jul 1 03:20:06 UTC 2011
Modified Files:
src/lib/libc/gdtoa: strtof_vaxf.c
Log Message:
Fix some bugs [exceed array bounds]. Simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gdtoa/strtof_vaxf.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/strtof_vaxf.c
diff -u src/lib/libc/gdtoa/strtof_vaxf.c:1.5 src/lib/libc/gdtoa/strtof_vaxf.c:1.6
--- src/lib/libc/gdtoa/strtof_vaxf.c:1.5 Fri Mar 28 00:56:54 2008
+++ src/lib/libc/gdtoa/strtof_vaxf.c Fri Jul 1 03:20:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: strtof_vaxf.c,v 1.5 2008/03/28 00:56:54 he Exp $ */
+/* $NetBSD: strtof_vaxf.c,v 1.6 2011/07/01 03:20:06 matt Exp $ */
/
@@ -56,14 +56,13 @@
k = strtodg(s, sp, &fpi, &expt, bits);
if (k == STRTOG_NoMemory) {
errno = ERANGE;
- u.L[0] = Big0;
- u.L[1] = Big1;
- return u.f;
+ return HUGE_VALF;
}
switch(k & STRTOG_Retmask) {
case STRTOG_NoNumber:
case STRTOG_Zero:
- u.L[0] = 0;
+ default:
+ u.f = 0.0;
break;
case STRTOG_Normal:
@@ -73,11 +72,11 @@
break;
case STRTOG_Infinite:
- u.L[0] = 0x7fff;
+ u.f = HUGE_VALF;
break;
}
if (k & STRTOG_Neg)
u.L[0] |= 0x8000L;
return u.f;
- }
+}
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
-
${OBJS} ${POBJS} ${SOBJS}: runtime-info.h
${SRCS}: tconfig.h unwind.h options.h
@@ -95,6 +93,8 @@
CLEANFILES+= options.h optionlist
.endif
+.include
+
.else
.include # 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 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 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 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 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 header file. */ -/* #undef _GLIBCXX_HAV
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Fri Jul 1 06:00:20 UTC 2011 Modified Files: src/sys/arch/mips/include: asm.h Log Message: xxx_SUB macros should use a variant of subu, not add To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mips/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/asm.h diff -u src/sys/arch/mips/include/asm.h:1.44 src/sys/arch/mips/include/asm.h:1.45 --- src/sys/arch/mips/include/asm.h:1.44 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/include/asm.h Fri Jul 1 06:00:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.44 2011/02/20 07:45:47 matt Exp $ */ +/* $NetBSD: asm.h,v 1.45 2011/07/01 06:00:20 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -338,7 +338,7 @@ #define PTR_ADDI addi #define PTR_ADDU addu #define PTR_ADDIU addiu -#define PTR_SUB add +#define PTR_SUB subu #define PTR_SUBI subi #define PTR_SUBU subu #define PTR_SUBIU subu @@ -360,7 +360,7 @@ #define PTR_ADDI daddi #define PTR_ADDU daddu #define PTR_ADDIU daddiu -#define PTR_SUB dadd +#define PTR_SUB dsubu #define PTR_SUBI dsubi #define PTR_SUBU dsubu #define PTR_SUBIU dsubu @@ -384,7 +384,7 @@ #define INT_ADDI addi #define INT_ADDU addu #define INT_ADDIU addiu -#define INT_SUB add +#define INT_SUB subu #define INT_SUBI subi #define INT_SUBU subu #define INT_SUBIU subu @@ -406,7 +406,7 @@ #define INT_ADDI daddi #define INT_ADDU daddu #define INT_ADDIU daddiu -#define INT_SUB dadd +#define INT_SUB dsubu #define INT_SUBI dsubi #define INT_SUBU dsubu #define INT_SUBIU dsubu @@ -430,7 +430,7 @@ #define LONG_ADDI addi #define LONG_ADDU addu #define LONG_ADDIU addiu -#define LONG_SUB add +#define LONG_SUB subu #define LONG_SUBI subi #define LONG_SUBU subu #define LONG_SUBIU subu @@ -452,7 +452,7 @@ #define LONG_ADDI daddi #define LONG_ADDU daddu #define LONG_ADDIU daddiu -#define LONG_SUB dadd +#define LONG_SUB dsubu #define LONG_SUBI dsubi #define LONG_SUBU dsubu #define LONG_SUBIU dsubu
