CVS commit: src/lib/csu/arch/m68k
Module Name:src Committed By: matt Date: Fri Jul 19 06:26:41 UTC 2013 Modified Files: src/lib/csu/arch/m68k: crtbegin.h Log Message: Deal with m68010 not having bsrl so usr jsr on !__pic__ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/m68k/crtbegin.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/arch/m68k/crtbegin.h diff -u src/lib/csu/arch/m68k/crtbegin.h:1.2 src/lib/csu/arch/m68k/crtbegin.h:1.3 --- src/lib/csu/arch/m68k/crtbegin.h:1.2 Thu Jul 18 18:43:04 2013 +++ src/lib/csu/arch/m68k/crtbegin.h Fri Jul 19 06:26:41 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: crtbegin.h,v 1.2 2013/07/18 18:43:04 matt Exp $ */ +/* $NetBSD: crtbegin.h,v 1.3 2013/07/19 06:26:41 matt Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,9 +29,17 @@ */ __asm( .pushsection .init +#ifdef __pic__ +\n\t bsrl __do_global_ctors_aux +#else \n\t jsr __do_global_ctors_aux +#endif \n\t .popsection); __asm( .pushsection .fini +#ifdef __pic__ +\n\t bsrl __do_global_ctors_aux +#else \n\t jsr __do_global_dtors_aux +#endif \n\t .popsection);
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: matt Date: Fri Jul 19 06:43:21 UTC 2013 Modified Files: src/sys/arch/powerpc/powerpc: powerpc_machdep.c Log Message: cpuset_info is no longer volatile To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/powerpc/powerpc/powerpc_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/powerpc/powerpc/powerpc_machdep.c diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.64 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.65 --- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.64 Fri Mar 16 07:41:55 2012 +++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Fri Jul 19 06:43:20 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: powerpc_machdep.c,v 1.64 2012/03/16 07:41:55 matt Exp $ */ +/* $NetBSD: powerpc_machdep.c,v 1.65 2013/07/19 06:43:20 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.64 2012/03/16 07:41:55 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.65 2013/07/19 06:43:20 matt Exp $); #include opt_altivec.h #include opt_modular.h @@ -90,7 +90,7 @@ const pcu_ops_t * const pcu_ops_md_defs[ }; #ifdef MULTIPROCESSOR -volatile struct cpuset_info cpuset_info; +struct cpuset_info cpuset_info; #endif /*
CVS commit: src/lib/libperfuse
Module Name:src Committed By: manu Date: Fri Jul 19 07:32:35 UTC 2013 Modified Files: src/lib/libperfuse: ops.c Log Message: Catch open without FREAD|FWRITE (it should not happen) To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/lib/libperfuse/ops.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/libperfuse/ops.c diff -u src/lib/libperfuse/ops.c:1.61 src/lib/libperfuse/ops.c:1.62 --- src/lib/libperfuse/ops.c:1.61 Thu Jul 18 09:01:20 2013 +++ src/lib/libperfuse/ops.c Fri Jul 19 07:32:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ops.c,v 1.61 2013/07/18 09:01:20 manu Exp $ */ +/* $NetBSD: ops.c,v 1.62 2013/07/19 07:32:35 manu Exp $ */ /*- * Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved. @@ -1391,6 +1391,10 @@ perfuse_node_open(struct puffs_usermount if (pnd-pnd_flags PND_RFH) mode = ~FREAD; break; + default: + DWARNX(open without either FREAD nor FWRITE); + error = EPERM; + goto out; } /*
CVS commit: src/external/mit/xorg/bin/xrdb
Module Name:src Committed By: prlw1 Date: Fri Jul 19 08:29:27 UTC 2013 Modified Files: src/external/mit/xorg/bin/xrdb: Makefile Log Message: Replace mrg's clean cpp+cpp_arg interface with xrdb version 420347005c to minimise upstream differences. OK wiz@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xrdb/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/mit/xorg/bin/xrdb/Makefile diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.3 src/external/mit/xorg/bin/xrdb/Makefile:1.4 --- src/external/mit/xorg/bin/xrdb/Makefile:1.3 Mon Feb 21 04:40:55 2011 +++ src/external/mit/xorg/bin/xrdb/Makefile Fri Jul 19 08:29:27 2013 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2011/02/21 04:40:55 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2013/07/19 08:29:27 prlw1 Exp $ .include bsd.own.mk PROG= xrdb -CPPFLAGS+=-DCPP=\/usr/bin/cpp\ -DHAS_MKSTEMP # XXX -CPPFLAGS+=-DCPP_ARGS=\-traditional\ +CPPFLAGS+=-DCPP=\/usr/bin/cpp -traditional\ -DHAS_MKSTEMP # XXX CPPFLAGS+=-DHAVE_ASPRINTF LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
CVS commit: xsrc/external/mit/xrdb/dist
Module Name:xsrc
Committed By: prlw1
Date: Fri Jul 19 08:29:24 UTC 2013
Modified Files:
xsrc/external/mit/xrdb/dist: xrdb.c
Log Message:
Replace mrg's clean cpp+cpp_arg interface with xrdb version 420347005c
to minimise upstream differences.
OK wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xrdb/dist/xrdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xrdb/dist/xrdb.c
diff -u xsrc/external/mit/xrdb/dist/xrdb.c:1.5 xsrc/external/mit/xrdb/dist/xrdb.c:1.6
--- xsrc/external/mit/xrdb/dist/xrdb.c:1.5 Wed Apr 6 02:07:24 2011
+++ xsrc/external/mit/xrdb/dist/xrdb.c Fri Jul 19 08:29:24 2013
@@ -120,17 +120,13 @@ static char *filename = NULL;
#ifdef PATHETICCPP
static Bool need_real_defines = False;
static char tmpname2[32];
+#endif
#ifdef WIN32
static char tmpname3[32];
#endif
-#endif
static int oper = OPLOAD;
static char *editFile = NULL;
static const char *cpp_program = NULL;
-#ifndef CPP_ARGS
-#define CPP_ARGS NULL
-#endif
-static const char *cpp_args = CPP_ARGS;
static const char* const cpp_locations[] = { CPP };
static char *backup_suffix = BACKUP_SUFFIX;
static Bool dont_execute = False;
@@ -424,7 +420,7 @@ AddDef(String *buff, char *title, char *
#ifdef PATHETICCPP
if (need_real_defines) {
addstring(buff, \n#define );
- addstring(buff, title);
+ addtokstring(buff, title);
if (value (value[0] != '\0')) {
addstring(buff, );
addstring(buff, value);
@@ -747,7 +743,7 @@ Syntax (void)
-Dname[=value], -Uname, -Idirectorypassed to preprocessor\n
\n
A - or no input filename represents stdin.\n,
- ProgramName, CPP, BACKUP_SUFFIX);
+ ProgramName, cpp_program ? cpp_program : , BACKUP_SUFFIX);
exit (1);
}
@@ -859,11 +855,19 @@ main(int argc, char *argv[])
int j;
for (j = 0; j number_of_elements; j++) {
- if (access(cpp_locations[j], X_OK) == 0) {
+ char *end, *dup;
+ /* cut off arguments */
+ dup = strdup(cpp_locations[j]);
+ end = strchr(dup,' ');
+ if (end)
+ *end = '\0';
+ if (access(dup, X_OK) == 0) {
cpp_program = cpp_locations[j];
+ free(dup);
break;
}
- }
+ free(dup);
+ }
}
/* needs to be replaced with XrmParseCommand */
@@ -890,10 +894,6 @@ main(int argc, char *argv[])
if (++i = argc) Syntax ();
cpp_program = argv[i];
continue;
- } else if (isabbreviation (-cppargs, arg, 2)) {
- if (++i = argc) Syntax ();
- cpp_args = argv[i];
- continue;
} else if (!strcmp (-n, arg)) {
dont_execute = True;
continue;
@@ -1238,10 +1238,7 @@ Process(int scrno, Bool doScreen, Bool e
fprintf(input, \n#include \%s\\n, filename);
fclose(input);
(void) mktemp(tmpname3);
- if (asprintf(cmd, %s%s%s -P%s %s %s, cpp_program,
- cpp_args ? : ,
- cpp_args ? cpp_args : ,
- includes.val,
+ if (asprintf(cmd, %s -P%s %s %s, cpp_program, includes.val,
tmpname2, tmpname3) == -1)
fatal(%s: Out of memory\n, ProgramName);
if (system(cmd) 0)
@@ -1256,10 +1253,7 @@ Process(int scrno, Bool doScreen, Bool e
fprintf(stdin, \n#include \%s\\n, filename);
fflush(stdin);
fseek(stdin, 0, 0);
- if (asprintf(cmd, %s%s%s -P%s, cpp_program,
- cpp_args ? : ,
- cpp_args ? cpp_args : ,
- includes.val) == -1)
+ if (asprintf(cmd, %s -P%s, cpp_program, includes.val) == -1)
fatal(%s: Out of memory\n, ProgramName);
if (!(input = popen(cmd, r)))
fatal(%s: cannot run '%s'\n, ProgramName, cmd);
@@ -1274,9 +1268,7 @@ Process(int scrno, Bool doScreen, Bool e
if (cpp_program) {
#ifdef WIN32
(void) mktemp(tmpname3);
- if (asprintf(cmd, %s%s%s -P%s %s %s %s, cpp_program,
- cpp_args ? : ,
- cpp_args ? cpp_args : ,
+ if (asprintf(cmd, %s -P%s %s %s %s, cpp_program,
includes.val, defines.val,
filename ? filename : , tmpname3) == -1)
fatal(%s: Out of memory\n, ProgramName);
@@ -1286,9 +1278,7 @@ Process(int scrno, Bool doScreen, Bool e
if (!(input = fopen(tmpname3, r)))
fatal(%s: can't open file '%s'\n, ProgramName, tmpname3);
#else
- if (asprintf(cmd, %s%s%s -P%s %s %s, cpp_program,
- cpp_args ? : ,
- cpp_args ? cpp_args : ,
+ if (asprintf(cmd, %s -P%s %s %s, cpp_program,
includes.val, defines.val,
filename ? filename : ) == -1)
fatal(%s: Out of memory\n, ProgramName);
CVS commit: src/bin/hostname
Module Name:src
Committed By: roy
Date: Fri Jul 19 10:34:51 UTC 2013
Modified Files:
src/bin/hostname: hostname.1 hostname.c
Log Message:
Add the following options
-A Display the FQDN of each address on all interfaces.
-a Display alias name(s) of the host.
-d Display the DNS domain.
-f Display the FQDN for the hostname.
-I Display each IP address on all interfaces.
-i Display the IP address(es) for the hostname.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/bin/hostname/hostname.1 \
src/bin/hostname/hostname.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/hostname/hostname.1
diff -u src/bin/hostname/hostname.1:1.17 src/bin/hostname/hostname.1:1.18
--- src/bin/hostname/hostname.1:1.17 Thu Aug 7 09:05:13 2003
+++ src/bin/hostname/hostname.1 Fri Jul 19 10:34:51 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: hostname.1,v 1.17 2003/08/07 09:05:13 agc Exp $
+.\ $NetBSD: hostname.1,v 1.18 2013/07/19 10:34:51 roy Exp $
.\
.\ Copyright (c) 1983, 1988, 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)hostname.1 8.2 (Berkeley) 4/28/95
.\
-.Dd April 28, 1995
+.Dd July 19, 2013
.Dt HOSTNAME 1
.Os
.Sh NAME
@@ -37,7 +37,7 @@
.Nd set or print name of current host system
.Sh SYNOPSIS
.Nm
-.Op Fl s
+.Op Fl AadIifs
.Op Ar name-of-host
.Sh DESCRIPTION
.Nm
@@ -50,14 +50,36 @@ time.
.Pp
Options:
.Bl -tag -width flag
+.It Fl A
+Display the FQDN of each address on all interfaces.
+.It Fl a
+Display alias name(s) of the host.
+.It Fl d
+Display the DNS domain.
+.It Fl f
+Display the FQDN for the hostname.
+.It Fl I
+Display each IP address on all interfaces.
+.It Fl i
+Display the IP address(es) for the hostname.
.It Fl s
-Trims off any domain information from the printed
-name.
+Display the short hostname.
.El
+.Sh NOTES
+With the exception of
+.Fl I
+and
+.Fl s ,
+the other options will retrieve their results from the resolver.
.Sh SEE ALSO
.Xr domainname 1 ,
+.Xr getaddrinfo 3 ,
.Xr gethostname 3 ,
-.Xr sethostname 3
+.Xr sethostname 3 ,
+.Xr gethostbyname 3 ,
+.Xr getifaddrs 3 ,
+.Xr getnameinfo 3 ,
+.Xr hosts 5
.Sh HISTORY
The
.Nm
Index: src/bin/hostname/hostname.c
diff -u src/bin/hostname/hostname.c:1.17 src/bin/hostname/hostname.c:1.18
--- src/bin/hostname/hostname.c:1.17 Mon Aug 29 14:51:18 2011
+++ src/bin/hostname/hostname.c Fri Jul 19 10:34:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hostname.c,v 1.17 2011/08/29 14:51:18 joerg Exp $ */
+/* $NetBSD: hostname.c,v 1.18 2013/07/19 10:34:51 roy Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,13 +39,19 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)hostname.c 8.2 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: hostname.c,v 1.17 2011/08/29 14:51:18 joerg Exp $);
+__RCSID($NetBSD: hostname.c,v 1.18 2013/07/19 10:34:51 roy Exp $);
#endif
#endif /* not lint */
#include sys/param.h
+#include sys/socket.h
+
+#include net/if.h
+#include netinet/in.h
#include err.h
+#include ifaddrs.h
+#include netdb.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -56,13 +62,36 @@ __dead static void usage(void);
int
main(int argc, char *argv[])
{
- int ch, sflag;
+ int ch, Aflag, aflag, dflag, Iflag, iflag, fflag, sflag, i;
char *p, hostname[MAXHOSTNAMELEN + 1];
+ struct addrinfo hints, *ainfos, *ai;
+ struct hostent *hent;
+ struct ifaddrs *ifa, *ifp;
+ struct sockaddr_in6 *sin6;
+ char buf[MAX(MAXHOSTNAMELEN + 1, INET6_ADDRSTRLEN)];
setprogname(argv[0]);
- sflag = 0;
- while ((ch = getopt(argc, argv, s)) != -1)
+ Aflag = aflag = dflag = Iflag = iflag = fflag = sflag = 0;
+ while ((ch = getopt(argc, argv, AadIifs)) != -1)
switch (ch) {
+ case 'A':
+ Aflag = 1;
+ break;
+ case 'a':
+ aflag = 1;
+ break;
+ case 'd':
+ dflag = 1;
+ break;
+ case 'I':
+ Iflag = 1;
+ break;
+ case 'i':
+ iflag = 1;
+ break;
+ case 'f':
+ fflag = 1;
+ break;
case 's':
sflag = 1;
break;
@@ -79,13 +108,89 @@ main(int argc, char *argv[])
if (*argv) {
if (sethostname(*argv, strlen(*argv)))
err(1, sethostname);
+ } else if (Aflag || Iflag) {
+ if (getifaddrs(ifa) == -1)
+ err(1, getifaddrs);
+ for (ifp = ifa; ifp; ifp = ifp-ifa_next) {
+ if (ifp-ifa_addr == NULL ||
+ ifp-ifa_flags IFF_LOOPBACK ||
+ !(ifp-ifa_flags IFF_UP))
+continue;
+
+ switch(ifp-ifa_addr-sa_family) {
+ case AF_INET:
+break;
+ case AF_INET6:
+/* Skip link local addresses */
+sin6 = (struct sockaddr_in6 *)ifp-ifa_addr;
+if (IN6_IS_ADDR_LINKLOCAL(sin6-sin6_addr) ||
+IN6_IS_ADDR_MC_LINKLOCAL(sin6-sin6_addr))
+ continue;
+break;
+ default:
+/* We only translate IPv4 or IPv6 addresses */
+continue;
+ }
+ i = getnameinfo(ifp-ifa_addr, ifp-ifa_addr-sa_len,
+ buf, sizeof(buf), NULL, 0,
+ Iflag ? NI_NUMERICHOST: NI_NAMEREQD);
+ if (i == -1) {
+if
CVS commit: src/tools/compat
Module Name:src Committed By: pooka Date: Fri Jul 19 10:53:20 UTC 2013 Modified Files: src/tools/compat: configure.ac Log Message: Fix some tests for musl libc -based systems. from Justin Cormack and Jens Staal To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/tools/compat/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/configure.ac diff -u src/tools/compat/configure.ac:1.76 src/tools/compat/configure.ac:1.77 --- src/tools/compat/configure.ac:1.76 Tue Mar 5 16:26:41 2013 +++ src/tools/compat/configure.ac Fri Jul 19 10:53:20 2013 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.76 2013/03/05 16:26:41 christos Exp $ +# $NetBSD: configure.ac,v 1.77 2013/07/19 10:53:20 pooka Exp $ # # Autoconf definition file for libnbcompat. # @@ -100,7 +100,9 @@ AC_CHECK_TYPES([id_t, long long, u_long, AC_CHECK_TYPE(socklen_t, [AC_DEFINE([HAVE_SOCKLEN_T], 1, [Define if you have the socklen_t type.])],, [#include sys/types.h +#ifdef HAVE_RPC_TYPES_H #include rpc/types.h +#endif #include sys/socket.h]) dnl XXX - This is UGLY. Need a better way to homogenize the bitsized types, @@ -141,6 +143,9 @@ AC_CHECK_DECLS([optind, optreset],,, [ #include stdio.h #include stdlib.h #include unistd.h +#ifdef HAVE_GETOPT_H +#include getopt.h +#endif ]) AC_CHECK_DECLS(sys_signame,,, [#include signal.h])
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: tteras Date: Fri Jul 19 10:54:52 UTC 2013 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: isakmp_xauth.c Log Message: From Rainer Weikusat rweiku...@mobileactivedefense.com: Export phase1 remote address as Radius Calling-Station-Id. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 \ src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.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/dist/ipsec-tools/src/racoon/isakmp_xauth.c diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.25 src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.26 --- src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.25 Tue Feb 5 06:22:29 2013 +++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Fri Jul 19 10:54:52 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: isakmp_xauth.c,v 1.25 2013/02/05 06:22:29 tteras Exp $ */ +/* $NetBSD: isakmp_xauth.c,v 1.26 2013/07/19 10:54:52 tteras Exp $ */ /* Id: isakmp_xauth.c,v 1.38 2006/08/22 18:17:17 manubsd Exp */ @@ -592,6 +592,10 @@ xauth_login_radius(iph1, usr, pwd) return -1; } + if (rad_put_string(radius_auth_state, RAD_CALLING_STATION_ID, + saddr2str(iph1-remote)) != 0) + return -1; + if (isakmp_cfg_radius_common(radius_auth_state, iph1-mode_cfg-port) != 0) return -1;
CVS commit: src/bin/hostname
Module Name:src
Committed By: wiz
Date: Fri Jul 19 11:19:23 UTC 2013
Modified Files:
src/bin/hostname: hostname.1 hostname.c
Log Message:
Sort.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/bin/hostname/hostname.1 \
src/bin/hostname/hostname.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/hostname/hostname.1
diff -u src/bin/hostname/hostname.1:1.18 src/bin/hostname/hostname.1:1.19
--- src/bin/hostname/hostname.1:1.18 Fri Jul 19 10:34:51 2013
+++ src/bin/hostname/hostname.1 Fri Jul 19 11:19:23 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: hostname.1,v 1.18 2013/07/19 10:34:51 roy Exp $
+.\ $NetBSD: hostname.1,v 1.19 2013/07/19 11:19:23 wiz Exp $
.\
.\ Copyright (c) 1983, 1988, 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -37,7 +37,7 @@
.Nd set or print name of current host system
.Sh SYNOPSIS
.Nm
-.Op Fl AadIifs
+.Op Fl AadfIis
.Op Ar name-of-host
.Sh DESCRIPTION
.Nm
@@ -74,11 +74,11 @@ the other options will retrieve their re
.Sh SEE ALSO
.Xr domainname 1 ,
.Xr getaddrinfo 3 ,
-.Xr gethostname 3 ,
-.Xr sethostname 3 ,
.Xr gethostbyname 3 ,
+.Xr gethostname 3 ,
.Xr getifaddrs 3 ,
.Xr getnameinfo 3 ,
+.Xr sethostname 3 ,
.Xr hosts 5
.Sh HISTORY
The
Index: src/bin/hostname/hostname.c
diff -u src/bin/hostname/hostname.c:1.18 src/bin/hostname/hostname.c:1.19
--- src/bin/hostname/hostname.c:1.18 Fri Jul 19 10:34:51 2013
+++ src/bin/hostname/hostname.c Fri Jul 19 11:19:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hostname.c,v 1.18 2013/07/19 10:34:51 roy Exp $ */
+/* $NetBSD: hostname.c,v 1.19 2013/07/19 11:19:23 wiz Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)hostname.c 8.2 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: hostname.c,v 1.18 2013/07/19 10:34:51 roy Exp $);
+__RCSID($NetBSD: hostname.c,v 1.19 2013/07/19 11:19:23 wiz Exp $);
#endif
#endif /* not lint */
@@ -199,7 +199,7 @@ main(int argc, char *argv[])
static void
usage(void)
{
- (void)fprintf(stderr, usage: %s [-AadIifs] [name-of-host]\n,
+ (void)fprintf(stderr, usage: %s [-AadfIis] [name-of-host]\n,
getprogname());
exit(1);
/* NOTREACHED */
CVS commit: src/share/mk
Module Name:src
Committed By: pooka
Date: Fri Jul 19 11:43:18 UTC 2013
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Enable opt-out from shlib mapfile creation. Not all linkers (namely
the solaris one) support such fancy features.
no default functional change
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 src/share/mk/bsd.lib.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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.336 src/share/mk/bsd.lib.mk:1.337
--- src/share/mk/bsd.lib.mk:1.336 Tue Jul 16 02:58:19 2013
+++ src/share/mk/bsd.lib.mk Fri Jul 19 11:43:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.336 2013/07/16 02:58:19 matt Exp $
+# $NetBSD: bsd.lib.mk,v 1.337 2013/07/19 11:43:18 pooka Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include bsd.init.mk
@@ -207,7 +207,9 @@ CFLAGS+= -g
SHLIB_SOVERSION= ${SHLIB_MAJOR}
SHLIB_SHFLAGS= -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}
SHLIB_SHFLAGS+= -Wl,--warn-shared-textrel
+.if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != no
SHLIB_SHFLAGS+= -Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map
+.endif
CLEANFILES+= ${_LIB}.so.${SHLIB_SOVERSION}.map
SHLIB_LDSTARTFILE?= ${_GCC_CRTI} ${_GCC_CRTBEGINS}
SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${_GCC_CRTN}
CVS commit: src/usr.sbin/ypserv/ypinit
Module Name:src
Committed By: hauke
Date: Fri Jul 19 11:44:51 UTC 2013
Modified Files:
src/usr.sbin/ypserv/ypinit: Makefile.yp
Log Message:
Commit the patches in Wolfgang Stukenbrock's PR bin/41896.
(1) Do not serve UIDs below MINUID in master.passwd.* maps,
just like in passwd.* maps.
(2) Since stdethers(8) and stdhosts(8) strip comments, we do
not have to do it here, much less inconsistently.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/ypserv/ypinit/Makefile.yp
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/ypinit/Makefile.yp
diff -u src/usr.sbin/ypserv/ypinit/Makefile.yp:1.21 src/usr.sbin/ypserv/ypinit/Makefile.yp:1.22
--- src/usr.sbin/ypserv/ypinit/Makefile.yp:1.21 Sat Oct 7 16:54:38 2006
+++ src/usr.sbin/ypserv/ypinit/Makefile.yp Fri Jul 19 11:44:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.yp,v 1.21 2006/10/07 16:54:38 elad Exp $
+# $NetBSD: Makefile.yp,v 1.22 2013/07/19 11:44:51 hauke Exp $
#
# This is the YP Makefile, used to create and push YP maps.
#
@@ -112,12 +112,14 @@ passwd.time: ${DIR}/master.passwd
${MAKEDBM} - passwd.byuid; \
fi; \
${CAT} ${.ALLSRC} | \
- ${AWK} 'BEGIN { FS=:; OFS=\t; } /^[a-zA-Z0-9_]/ \
- { print $$1, $$0 }' - | ${SORT} | \
+ ${AWK} -v minuid=${MINUID} \
+ 'BEGIN { FS=:; OFS=\t; } /^[a-zA-Z0-9_]/ \
+ { if (minuid = $$3) print $$1, $$0 }' - | ${SORT} | \
${MAKEDBM_S} - master.passwd.byname; \
${CAT} ${.ALLSRC} | \
- ${AWK} 'BEGIN { FS=:; OFS=\t; } /^[a-zA-Z0-9_]/ \
- { print $$3, $$0 }' - | ${SORT} | \
+ ${AWK} -v minuid=${MINUID} \
+ 'BEGIN { FS=:; OFS=\t; } /^[a-zA-Z0-9_]/ \
+ { if (minuid = $$3) print $$3, $$0 }' - | ${SORT} | \
${MAKEDBM_S} - master.passwd.byuid; \
${TOUCH} ${.TARGET}; \
${ECHO} updated passwd; \
@@ -198,7 +200,7 @@ ${MAP}.time: ${AMDDIR}/${MAP} __makedbme
ethers.time: ${DIR}/ethers
-@if [ -f ${.ALLSRC} ]; then \
- ${STDETHERS} ${.ALLSRC} | ${SED} -e s/#.*$$// | \
+ ${STDETHERS} ${.ALLSRC} | \
${AWK} 'BEGIN { FS=\t; OFS=\t; } { print $$1, $$0 }' | \
${SORT} | ${MAKEDBM} - ethers.byaddr; \
${STDETHERS} ${.ALLSRC} | \
@@ -257,7 +259,7 @@ group.time: ${DIR}/group
#
hosts.time: ${DIR}/hosts
-@if [ -f ${.ALLSRC} ]; then \
- ${STDHOSTS} ${.ALLSRC} | ${SED} -e s/#.*$$// | \
+ ${STDHOSTS} ${.ALLSRC} | \
${AWK} '{for (i = 2; i = NF; i++) print $$i, $$0 }' | \
${SORT} | ${MAKEDBM} - hosts.byname; \
${STDHOSTS} ${.ALLSRC} | \
@@ -279,7 +281,7 @@ hosts.time: ${DIR}/hosts
ipnodes.time: ${DIR}/hosts
-@if [ -f ${.ALLSRC} ]; then \
- ${STDHOSTS} -n ${.ALLSRC} | ${SED} -e s/#.*$$// | \
+ ${STDHOSTS} -n ${.ALLSRC} | \
${AWK} '{for (i = 2; i = NF; i++) print $$i, $$0 }' | \
${SORT} | ${MAKEDBM} - ipnodes.byname; \
${STDHOSTS} -n ${.ALLSRC} | \
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Jul 19 11:52:58 UTC 2013 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22216 Log Message: Import dhcpcd-6.0.3 with the following changes: * dhcpcd will now assign a short hostname by default To use a FQDN hostname, set this in dhcpcd.conf(5) env hostname_fqdn=YES * Only start DHCPv6 if the RA is new or has changed * Fixed dhcpcd owning RA addressing and routes if disabled in kernel Status: Vendor Tag: roy Release Tags: dhcpcd-6-0-3 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6rs.c U src/external/bsd/dhcpcd/dist/ipv6ns.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6ns.h U src/external/bsd/dhcpcd/dist/ipv6rs.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Jul 19 11:56:42 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import dhcpcd-6.0.3 To generate a diff of this commit: cvs rdiff -u -r1.1044 -r1.1045 src/doc/3RDPARTY cvs rdiff -u -r1.1833 -r1.1834 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1044 src/doc/3RDPARTY:1.1045 --- src/doc/3RDPARTY:1.1044 Wed Jul 17 21:58:14 2013 +++ src/doc/3RDPARTY Fri Jul 19 11:56:42 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1044 2013/07/17 21:58:14 adam Exp $ +# $NetBSD: 3RDPARTY,v 1.1045 2013/07/19 11:56:42 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -299,8 +299,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.0.0 -Current Vers: 6.0.0 +Version: 6.0.3 +Current Vers: 6.0.3 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1833 src/doc/CHANGES:1.1834 --- src/doc/CHANGES:1.1833 Wed Jul 17 21:58:14 2013 +++ src/doc/CHANGES Fri Jul 19 11:56:42 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1833 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1834 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -256,4 +256,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: openresolv(8): Import openresolv-3.5.6 [roy 20130712] libc: Update to tzcode2013d. [christo 20130717] wpa: Import wpa_supplicant and hostapd 1.1 [adam 20130717] - + dhcpcd(8): Import dhcpcd-6.0.3 [roy 20130719]
CVS commit: src/tools/compat
Module Name:src Committed By: christos Date: Fri Jul 19 12:00:30 UTC 2013 Modified Files: src/tools/compat: compat_defs.h Log Message: PR/48063: Justin Cormack: incorrect definition of socklen_t To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/tools/compat/compat_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/compat_defs.h diff -u src/tools/compat/compat_defs.h:1.88 src/tools/compat/compat_defs.h:1.89 --- src/tools/compat/compat_defs.h:1.88 Tue Mar 5 11:26:41 2013 +++ src/tools/compat/compat_defs.h Fri Jul 19 08:00:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_defs.h,v 1.88 2013/03/05 16:26:41 christos Exp $ */ +/* $NetBSD: compat_defs.h,v 1.89 2013/07/19 12:00:30 christos Exp $ */ #ifndef __NETBSD_COMPAT_DEFS_H__ #define __NETBSD_COMPAT_DEFS_H__ @@ -168,7 +168,7 @@ typedef unsigned int id_t; #endif #if !HAVE_SOCKLEN_T -typedef int socklen_t; +typedef unsigned int socklen_t; #endif #if !HAVE_U_LONG
CVS commit: src/external/gpl3/gdb/dist
Module Name:src
Committed By: matt
Date: Fri Jul 19 16:03:36 UTC 2013
Modified Files:
src/external/gpl3/gdb/dist/bfd: config.bfd
src/external/gpl3/gdb/dist/gdb: configure.tgt
Log Message:
Allow alias of m5407--netbsdelf for m68k--netbsdself
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/bfd/config.bfd
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/configure.tgt
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/gdb/dist/bfd/config.bfd
diff -u src/external/gpl3/gdb/dist/bfd/config.bfd:1.2 src/external/gpl3/gdb/dist/bfd/config.bfd:1.3
--- src/external/gpl3/gdb/dist/bfd/config.bfd:1.2 Wed Nov 23 19:41:50 2011
+++ src/external/gpl3/gdb/dist/bfd/config.bfd Fri Jul 19 16:03:35 2013
@@ -86,6 +86,7 @@ hppa*) targ_archs=bfd_hppa_arch ;;
i[3-7]86) targ_archs=bfd_i386_arch ;;
i370) targ_archs=bfd_i370_arch ;;
lm32) targ_archs=bfd_lm32_arch ;;
+m5200|m5407) targ_archs=bfd_m68k_arch ;;
m6811*|m68hc11*) targ_archs=bfd_m68hc11_arch bfd_m68hc12_arch ;;
m6812*|m68hc12*) targ_archs=bfd_m68hc12_arch bfd_m68hc11_arch ;;
m68*) targ_archs=bfd_m68k_arch ;;
@@ -837,7 +838,7 @@ case ${targ} in
targ_selvecs=m68knetbsd_vec hp300bsd_vec sunos_big_vec
targ_underscore=yes
;;
- m68*-*-netbsdelf*)
+ m68*-*-netbsdelf* | m5407-*-netbsdelf*)
targ_defvec=bfd_elf32_m68k_vec
targ_selvecs=m68knetbsd_vec m68k4knetbsd_vec hp300bsd_vec sunos_big_vec
;;
Index: src/external/gpl3/gdb/dist/gdb/configure.tgt
diff -u src/external/gpl3/gdb/dist/gdb/configure.tgt:1.2 src/external/gpl3/gdb/dist/gdb/configure.tgt:1.3
--- src/external/gpl3/gdb/dist/gdb/configure.tgt:1.2 Sat Oct 29 23:42:45 2011
+++ src/external/gpl3/gdb/dist/gdb/configure.tgt Fri Jul 19 16:03:36 2013
@@ -311,7 +311,7 @@ m68*-*-linux*)
linux-tdep.o glibc-tdep.o symfile-mem.o
build_gdbserver=yes
;;
-m68*-*-netbsd* | m68*-*-knetbsd*-gnu)
+m68*-*-netbsd* | m68*-*-knetbsd*-gnu | m5407-*-netbsdelf*)
# Target: NetBSD/m68k
gdb_target_obs=m68k-tdep.o m68kbsd-tdep.o \
corelow.o solib.o solib-svr4.o
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: matt
Date: Fri Jul 19 16:23:10 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc configure configure.ac
Log Message:
Configury changes to match tuple of m5407--netbsdelf as a variant of
m68k--netbself but with a coldfire cpu (m5475). Fix m68010 to actually
properly default to m68010.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/configure
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.17 src/external/gpl3/gcc/dist/gcc/config.gcc:1.18
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.17 Thu Apr 18 09:11:13 2013
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Fri Jul 19 16:23:10 2013
@@ -326,6 +326,10 @@ hppa*-*-*)
m32r*-*-*)
cpu_type=m32r
;;
+m5200-*-*|m5407-*-*)
+ cpu_type=m68k
+ extra_headers=math-68881.h
+ ;;
m680[012]0-*-*)
cpu_type=m68k
extra_headers=math-68881.h
@@ -1659,21 +1663,28 @@ m68k-*-elf* | fido-*-elf*)
esac
extra_parts=crtbegin.o crtend.o
;;
-m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
+m68010-*-netbsdelf* | m68k-*-netbsdelf* | m5407-*-netbsdelf*)
tm_file=${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h
tm_defines=${tm_defines} MOTOROLA=1 USE_GAS=1
default_cf_cpu=5475
+ default_m68k_cpu=68020
case ${target} in
+ m5407*)
+ with_arch=${with_arch:-cf}
+ target_cpu_default=mcf5475
+# target=`echo ${target} | sed 's/m68kcf/m68k/'`
+ ;;
m68010*)
- target_cpu_default=0
+ target_cpu_default=m68010
tmake_file=m68k/t-m68kelf m68k/t-m68010-netbsd
default_m68k_cpu=68010
+ tmake_file=${tmake_file} m68k/t-floatlib
;;
*)
- default_m68k_cpu=68020
+ with_arch=${with_arch:-m68k}
+ tmake_file=${tmake_file} m68k/t-floatlib
;;
esac
- tmake_file=${tmake_file} m68k/t-floatlib
;;
m68k*-*-openbsd*)
default_m68k_cpu=68020
@@ -2895,6 +2906,9 @@ if test x$with_cpu = x ; then
frv550-*-*linux*)
with_cpu=fr550
;;
+m5200-*-*|m5407-*-*)
+ with_cpu=${default_cf_cpu}
+ ;;
m68k*-*-*)
case $with_arch in
cf)
@@ -3150,7 +3164,7 @@ case ${target} in
esac
;;
- fido-*-* | m68k*-*-*)
+ fido-*-* | m68k*-*-* | m5200-*-* | m5407-*-*)
supported_defaults=arch cpu
case $with_arch in
| m68k| cf)
Index: src/external/gpl3/gcc/dist/gcc/configure
diff -u src/external/gpl3/gcc/dist/gcc/configure:1.4 src/external/gpl3/gcc/dist/gcc/configure:1.5
--- src/external/gpl3/gcc/dist/gcc/configure:1.4 Tue Sep 18 07:04:41 2012
+++ src/external/gpl3/gcc/dist/gcc/configure Fri Jul 19 16:23:10 2013
@@ -22188,7 +22188,7 @@ x:
tls_first_minor=16
tls_as_opt='-32 --fatal-warnings'
;;
- m68k-*-*)
+ m68k-*-*|m5407-*-*)
conftest_s='
.section .tdata,awT,@progbits
x:
@@ -24300,7 +24300,7 @@ case $target in
i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
| x86_64*-*-* | hppa*-*-* | arm*-*-* \
| xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
- | spu-*-* | fido*-*-* | m32c-*-*)
+ | spu-*-* | fido*-*-* | m32c-*-* | m5407-*-*)
insn=nop
;;
ia64*-*-* | s390*-*-*)
Index: src/external/gpl3/gcc/dist/gcc/configure.ac
diff -u src/external/gpl3/gcc/dist/gcc/configure.ac:1.3 src/external/gpl3/gcc/dist/gcc/configure.ac:1.4
--- src/external/gpl3/gcc/dist/gcc/configure.ac:1.3 Tue Jun 21 07:39:18 2011
+++ src/external/gpl3/gcc/dist/gcc/configure.ac Fri Jul 19 16:23:10 2013
@@ -2769,7 +2769,7 @@ x:
tls_first_minor=16
tls_as_opt='-32 --fatal-warnings'
;;
- m68k-*-*)
+ m68k-*-* | m5407-*-*)
conftest_s='
.section .tdata,awT,@progbits
x:
@@ -3689,7 +3689,7 @@ case $target in
i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
| x86_64*-*-* | hppa*-*-* | arm*-*-* \
| xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
- | spu-*-* | fido*-*-* | m32c-*-*)
+ | spu-*-* | fido*-*-* | m32c-*-* | m5407-*-*)
insn=nop
;;
ia64*-*-* | s390*-*-*)
CVS commit: src/external/gpl3/binutils/dist
Module Name:src
Committed By: matt
Date: Fri Jul 19 16:01:33 UTC 2013
Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd
src/external/gpl3/binutils/dist/gas: configure.tgt
src/external/gpl3/binutils/dist/ld: configure.tgt
Log Message:
Allow alias of m5407--netbsdelf for m68k--netbsdself
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/bfd/config.bfd
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gas/configure.tgt
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils/dist/ld/configure.tgt
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/binutils/dist/bfd/config.bfd
diff -u src/external/gpl3/binutils/dist/bfd/config.bfd:1.6 src/external/gpl3/binutils/dist/bfd/config.bfd:1.7
--- src/external/gpl3/binutils/dist/bfd/config.bfd:1.6 Sun Sep 25 04:32:34 2011
+++ src/external/gpl3/binutils/dist/bfd/config.bfd Fri Jul 19 16:01:33 2013
@@ -86,6 +86,7 @@ hppa*) targ_archs=bfd_hppa_arch ;;
i[3-7]86) targ_archs=bfd_i386_arch ;;
i370) targ_archs=bfd_i370_arch ;;
lm32) targ_archs=bfd_lm32_arch ;;
+m5200|m5407) targ_archs=bfd_m68k_arch ;;
m6811*|m68hc11*) targ_archs=bfd_m68hc11_arch bfd_m68hc12_arch ;;
m6812*|m68hc12*) targ_archs=bfd_m68hc12_arch bfd_m68hc11_arch ;;
m68*) targ_archs=bfd_m68k_arch ;;
@@ -837,7 +838,7 @@ case ${targ} in
targ_selvecs=m68knetbsd_vec hp300bsd_vec sunos_big_vec bfd_elf32_m68k_vec
targ_underscore=yes
;;
- m68*-*-netbsdelf*)
+ m68*-*-netbsdelf* | m5407-*-netbsdelf*)
targ_defvec=bfd_elf32_m68k_vec
targ_selvecs=m68knetbsd_vec m68k4knetbsd_vec hp300bsd_vec sunos_big_vec
;;
Index: src/external/gpl3/binutils/dist/gas/configure.tgt
diff -u src/external/gpl3/binutils/dist/gas/configure.tgt:1.3 src/external/gpl3/binutils/dist/gas/configure.tgt:1.4
--- src/external/gpl3/binutils/dist/gas/configure.tgt:1.3 Mon Feb 4 22:38:07 2013
+++ src/external/gpl3/binutils/dist/gas/configure.tgt Fri Jul 19 16:01:33 2013
@@ -48,7 +48,7 @@ case ${cpu} in
m32c) cpu_type=m32c endian=little ;;
m32r) cpu_type=m32r endian=big ;;
m32rle) cpu_type=m32r endian=little ;;
- m5200) cpu_type=m68k ;;
+ m5200|m5407) cpu_type=m68k ;;
m68008) cpu_type=m68k ;;
m680[012346]0) cpu_type=m68k ;;
m6811|m6812|m68hc12) cpu_type=m68hc11 ;;
Index: src/external/gpl3/binutils/dist/ld/configure.tgt
diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.8 src/external/gpl3/binutils/dist/ld/configure.tgt:1.9
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.8 Sun Aug 5 04:03:03 2012
+++ src/external/gpl3/binutils/dist/ld/configure.tgt Fri Jul 19 16:01:33 2013
@@ -354,7 +354,8 @@ m68k-*-uclinux*) targ_emul=m68kelf ;;
m68*-*-gnu*) targ_emul=m68kelf ;;
m68*-*-netbsd*4k*) targ_emul=m68k4knbsd
targ_extra_emuls=m68knbsd m68kelfnbsd ;;
-m68*-*-netbsdelf*) targ_emul=m68kelfnbsd
+m68*-*-netbsdelf* | m5407*-*-netbsdelf*)
+ targ_emul=m68kelfnbsd
targ_extra_emuls=m68knbsd m68k4knbsd ;;
m68*-*-netbsdaout* | m68*-*-netbsd*)
targ_emul=m68knbsd
CVS commit: src/external/gpl3
Module Name:src
Committed By: matt
Date: Fri Jul 19 15:55:57 UTC 2013
Modified Files:
src/external/gpl3/binutils/dist: config.guess
src/external/gpl3/gcc/dist: config.guess
src/external/gpl3/gdb/dist: config.guess
Log Message:
Make these consistent. Make sure all handle earm and coldfire.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/config.guess
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/config.guess
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/config.guess
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/binutils/dist/config.guess
diff -u src/external/gpl3/binutils/dist/config.guess:1.2 src/external/gpl3/binutils/dist/config.guess:1.3
--- src/external/gpl3/binutils/dist/config.guess:1.2 Thu Jul 19 19:34:26 2012
+++ src/external/gpl3/binutils/dist/config.guess Fri Jul 19 15:55:57 2013
@@ -160,14 +160,28 @@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:$
case ${UNAME_MACHINE_ARCH} in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
+ coldfire) machine=m5407-unknown ;;
+ earm*eb*) machine=armeb-unknown ;;
+ earm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
+ # to ELF recently, or will in the future and ABI.
case ${UNAME_MACHINE_ARCH} in
+ coldfire) os=netbsdelf ;;
+ earm*)
+ eval $set_cc_for_build
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ os=netbsdelf-eabi
+ else
+ os=netbsdelf-eabihf
+ fi
+ ;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2/dev/null \
Index: src/external/gpl3/gcc/dist/config.guess
diff -u src/external/gpl3/gcc/dist/config.guess:1.3 src/external/gpl3/gcc/dist/config.guess:1.4
--- src/external/gpl3/gcc/dist/config.guess:1.3 Mon Apr 22 08:52:33 2013
+++ src/external/gpl3/gcc/dist/config.guess Fri Jul 19 15:55:57 2013
@@ -158,10 +158,11 @@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:$
UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2/dev/null || \
/usr/sbin/$sysctl 2/dev/null || echo unknown)`
case ${UNAME_MACHINE_ARCH} in
- earm*eb*) machine=armeb-unknown ;;
- earm*) machine=arm-unknown ;;
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
+ coldfire) machine=m5407-unknown ;;
+ earm*eb*) machine=armeb-unknown ;;
+ earm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
@@ -170,6 +171,7 @@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:$
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future and ABI.
case ${UNAME_MACHINE_ARCH} in
+ coldfire) os=netbsdelf ;;
earm*)
eval $set_cc_for_build
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2/dev/null \
Index: src/external/gpl3/gdb/dist/config.guess
diff -u src/external/gpl3/gdb/dist/config.guess:1.1.1.1 src/external/gpl3/gdb/dist/config.guess:1.2
--- src/external/gpl3/gdb/dist/config.guess:1.1.1.1 Sat Sep 24 19:41:46 2011
+++ src/external/gpl3/gdb/dist/config.guess Fri Jul 19 15:55:57 2013
@@ -160,6 +160,9 @@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:$
case ${UNAME_MACHINE_ARCH} in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
+ coldfire) machine=m5407-unknown ;;
+ earm*eb) machine=armeb-unknown ;;
+ earm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
@@ -168,6 +171,17 @@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:$
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
case ${UNAME_MACHINE_ARCH} in
+ coldfire) os=netbsdelf ;;
+ earm*)
+ eval $set_cc_for_build
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ os=netbsdelf-eabi
+ else
+ os=netbsdelf-eabihf
+ fi
+ ;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2/dev/null \
CVS commit: src/bin/hostname
Module Name:src
Committed By: christos
Date: Fri Jul 19 15:53:00 UTC 2013
Modified Files:
src/bin/hostname: hostname.c
Log Message:
fix error handling.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/bin/hostname/hostname.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/hostname/hostname.c
diff -u src/bin/hostname/hostname.c:1.19 src/bin/hostname/hostname.c:1.20
--- src/bin/hostname/hostname.c:1.19 Fri Jul 19 07:19:23 2013
+++ src/bin/hostname/hostname.c Fri Jul 19 11:53:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hostname.c,v 1.19 2013/07/19 11:19:23 wiz Exp $ */
+/* $NetBSD: hostname.c,v 1.20 2013/07/19 15:53:00 christos Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)hostname.c 8.2 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: hostname.c,v 1.19 2013/07/19 11:19:23 wiz Exp $);
+__RCSID($NetBSD: hostname.c,v 1.20 2013/07/19 15:53:00 christos Exp $);
#endif
#endif /* not lint */
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
i = getnameinfo(ifp-ifa_addr, ifp-ifa_addr-sa_len,
buf, sizeof(buf), NULL, 0,
Iflag ? NI_NUMERICHOST: NI_NAMEREQD);
- if (i == -1) {
+ if (i) {
if (Iflag i != EAI_NONAME)
errx(1, getnameinfo: %s,
gai_strerror(i));
@@ -157,8 +157,9 @@ main(int argc, char *argv[])
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM;
hints.ai_flags = AI_CANONNAME;
- if (getaddrinfo(hostname, NULL, hints, ainfos) == -1)
-err(1, getaddrinfo);
+ i = getaddrinfo(hostname, NULL, hints, ainfos);
+ if (i)
+errx(1, getaddrinfo: %s, gai_strerror(i));
if (ainfos) {
if (dflag) {
if ((p = strchr(ainfos-ai_canonname,
@@ -171,7 +172,7 @@ main(int argc, char *argv[])
ai-ai_addrlen,
buf, sizeof(buf), NULL, 0,
NI_NUMERICHOST);
- if (i == -1)
+ if (i)
errx(1,
getnameinfo: %s,
gai_strerror(i));
CVS commit: src/sys/arch/luna68k/dev
Module Name:src
Committed By: tsutsui
Date: Fri Jul 19 16:35:57 UTC 2013
Modified Files:
src/sys/arch/luna68k/dev: lunafb.c
Log Message:
Properly initialize the palette for while on black even on 1bpp framebuffer.
Preparing for demonstration in Open Source Conference 2013 Kyoto.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/luna68k/dev/lunafb.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/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.26 src/sys/arch/luna68k/dev/lunafb.c:1.27
--- src/sys/arch/luna68k/dev/lunafb.c:1.26 Fri Jul 20 19:31:53 2012
+++ src/sys/arch/luna68k/dev/lunafb.c Fri Jul 19 16:35:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.26 2012/07/20 19:31:53 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.27 2013/07/19 16:35:57 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.26 2012/07/20 19:31:53 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.27 2013/07/19 16:35:57 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -379,9 +379,30 @@ omfb_getdevconfig(paddr_t paddr, struct
dc-dc_videobase = paddr;
/* WHITE on BLACK */
- if (hwplanemask == 0x0f) {
- /* XXX Need Bt454 more initialization */
+ if (hwplanemask == 0x01) {
+ struct bt454 *odac = (struct bt454 *)OMFB_RAMDAC;
+
+ /*
+ * On 1bpp framebuffer, only plane P0 has framebuffer memory
+ * and other planes seems pulled up, i.e. always 1.
+ * Set white only for a palette (P0,P1,P2,P3) = (1,1,1,1).
+ */
+ odac-bt_addr = 0;
+ for (i = 0; i 15; i++) {
+ odac-bt_cmap = 0;
+ odac-bt_cmap = 0;
+ odac-bt_cmap = 0;
+ }
+ /*
+ * The B/W video connector is connected to IOG of Bt454,
+ * and IOR and IOB are unused.
+ */
+ odac-bt_cmap = 0;
+ odac-bt_cmap = 255;
+ odac-bt_cmap = 0;
+ } else if (hwplanemask == 0x0f) {
struct bt454 *odac = (struct bt454 *)OMFB_RAMDAC;
+
odac-bt_addr = 0;
odac-bt_cmap = 0;
odac-bt_cmap = 0;
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: matt Date: Fri Jul 19 17:31:14 UTC 2013 Modified Files: src/external/lgpl3/gmp/dist: configure configure.in Log Message: Match m5407-*-* To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/lgpl3/gmp/dist/configure \ src/external/lgpl3/gmp/dist/configure.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/configure diff -u src/external/lgpl3/gmp/dist/configure:1.1.1.1 src/external/lgpl3/gmp/dist/configure:1.2 --- src/external/lgpl3/gmp/dist/configure:1.1.1.1 Mon Jun 20 05:54:37 2011 +++ src/external/lgpl3/gmp/dist/configure Fri Jul 19 17:31:14 2013 @@ -4475,6 +4475,16 @@ echo include_mpn(\`ia64/ia64-defs.m4') ;; + # Motorola Coldfire + # + m5407-*-*) + +gcc_cflags=$gcc_cflags $fomit_frame_pointer +gcc_cflags_optlist=arch +gcc_cflags_arch=-m5407 + ;; + + # Motorola 68k # m68k-*-* | m68[0-9][0-9][0-9]-*-*) Index: src/external/lgpl3/gmp/dist/configure.in diff -u src/external/lgpl3/gmp/dist/configure.in:1.1.1.1 src/external/lgpl3/gmp/dist/configure.in:1.2 --- src/external/lgpl3/gmp/dist/configure.in:1.1.1.1 Mon Jun 20 05:54:31 2011 +++ src/external/lgpl3/gmp/dist/configure.in Fri Jul 19 17:31:14 2013 @@ -25,7 +25,7 @@ along with the GNU MP Library. If not, AC_COPYRIGHT(GMP_COPYRIGHT) AH_TOP(/*GMP_COPYRIGHT*/) -AC_REVISION($Revision: 1.1.1.1 $) +AC_REVISION($Revision: 1.2 $) AC_PREREQ(2.59) AC_INIT(GNU MP, GMP_VERSION, gmp-b...@gmplib.org, gmp) AC_CONFIG_SRCDIR(gmp-impl.h) @@ -743,6 +743,12 @@ case $host in esac ;; + # Mototole Coldfire (isa_b) + M5407_PATTERN) +gcc_cflags=$gcc_cflags $fomit_frame_pointer +gcc_cflags_optlist=arch +gcc_cflags_arch=-m5407 +;; # Motorola 68k #
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: matt Date: Fri Jul 19 17:07:28 UTC 2013 Modified Files: src/external/lgpl3/gmp/dist: configfsf.sub Log Message: Add m5407--netbsdelf* support To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/gmp/dist/configfsf.sub Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/configfsf.sub diff -u src/external/lgpl3/gmp/dist/configfsf.sub:1.2 src/external/lgpl3/gmp/dist/configfsf.sub:1.3 --- src/external/lgpl3/gmp/dist/configfsf.sub:1.2 Mon Feb 4 02:45:28 2013 +++ src/external/lgpl3/gmp/dist/configfsf.sub Fri Jul 19 17:07:28 2013 @@ -320,7 +320,8 @@ case $basic_machine in basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | m5407 \ + | v70 | w65 | z8k) ;; ms1) basic_machine=mt-unknown @@ -369,6 +370,7 @@ case $basic_machine in | ip2k-* | iq2000-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ + | m5200-* | m5407-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: matt
Date: Fri Jul 19 15:57:18 UTC 2013
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-m68k.c
Log Message:
Allow stripping of the m before m5... so that it can match coldfire cpus.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gas/config/tc-m68k.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/gpl3/binutils/dist/gas/config/tc-m68k.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-m68k.c:1.3 src/external/gpl3/binutils/dist/gas/config/tc-m68k.c:1.4
--- src/external/gpl3/binutils/dist/gas/config/tc-m68k.c:1.3 Sun Sep 25 04:32:37 2011
+++ src/external/gpl3/binutils/dist/gas/config/tc-m68k.c Fri Jul 19 15:57:18 2013
@@ -7420,12 +7420,12 @@ m68k_lookup_cpu (const char *arg, const
}
}
- /* Remove 'm' or 'mc' prefix from 68k variants. */
+ /* Remove 'm' or 'mc' prefix from 68k or coldfire variants. */
if (allow_m)
{
if (arg[0] == 'm')
{
- if (arg[1] == '6')
+ if (arg[1] == '6' || arg[1] == '5')
arg += 1;
else if (arg[1] == 'c' arg[2] == '6')
arg += 2;
CVS commit: src/external/gpl3
Module Name:src Committed By: matt Date: Fri Jul 19 15:58:48 UTC 2013 Modified Files: src/external/gpl3/binutils/dist: config.sub src/external/gpl3/gcc/dist: config.sub src/external/gpl3/gdb/dist: config.sub Log Message: Fix broken matching for m5200 and m5407 as alias for coldfire cpus. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/config.sub cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/config.sub cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/config.sub 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/binutils/dist/config.sub diff -u src/external/gpl3/binutils/dist/config.sub:1.4 src/external/gpl3/binutils/dist/config.sub:1.5 --- src/external/gpl3/binutils/dist/config.sub:1.4 Sun Aug 5 04:03:03 2012 +++ src/external/gpl3/binutils/dist/config.sub Fri Jul 19 15:58:48 2013 @@ -309,7 +309,8 @@ case $basic_machine in basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | m5407 \ + | v70 | w65 | z8k) ;; ms1) basic_machine=mt-unknown @@ -346,6 +347,7 @@ case $basic_machine in | ip2k-* | iq2000-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ + | m5200-* | m5407-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ Index: src/external/gpl3/gcc/dist/config.sub diff -u src/external/gpl3/gcc/dist/config.sub:1.2 src/external/gpl3/gcc/dist/config.sub:1.3 --- src/external/gpl3/gcc/dist/config.sub:1.2 Sun Aug 5 04:10:18 2012 +++ src/external/gpl3/gcc/dist/config.sub Fri Jul 19 15:58:48 2013 @@ -318,7 +318,8 @@ case $basic_machine in basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | m5407 \ + | v70 | w65 | z8k) ;; ms1) basic_machine=mt-unknown @@ -355,6 +356,7 @@ case $basic_machine in | ip2k-* | iq2000-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ + | m5200-* | m5407-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ Index: src/external/gpl3/gdb/dist/config.sub diff -u src/external/gpl3/gdb/dist/config.sub:1.2 src/external/gpl3/gdb/dist/config.sub:1.3 --- src/external/gpl3/gdb/dist/config.sub:1.2 Sun Aug 5 16:51:46 2012 +++ src/external/gpl3/gdb/dist/config.sub Fri Jul 19 15:58:48 2013 @@ -319,7 +319,8 @@ case $basic_machine in basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | m5407 \ + | v70 | w65 | z8k) ;; ms1) basic_machine=mt-unknown @@ -368,6 +369,7 @@ case $basic_machine in | ip2k-* | iq2000-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ + | m5200-* | m5407-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Fri Jul 19 16:52:44 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Use m5407--netbsdelf for coldfire (Why not just use m5407--netbsd? Because
gas will think that's a.out since internally it expands it to m68--netbsd
and that matches a.out)
To generate a diff of this commit:
cvs rdiff -u -r1.738 -r1.739 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.738 src/share/mk/bsd.own.mk:1.739
--- src/share/mk/bsd.own.mk:1.738 Thu Jul 18 22:06:09 2013
+++ src/share/mk/bsd.own.mk Fri Jul 19 16:52:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.738 2013/07/18 22:06:09 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.739 2013/07/19 16:52:44 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -687,7 +687,7 @@ SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_ve
#
# GNU sources and packages sometimes see architecture names differently.
#
-GNU_ARCH.coldfire=m68k
+GNU_ARCH.coldfire=m5407
GNU_ARCH.earm=arm
GNU_ARCH.earmeb=armeb
GNU_ARCH.earmhf=arm
@@ -708,8 +708,6 @@ MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR
#
.if (!empty(MACHINE_ARCH:Mearm*))
MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-${MACHINE_ARCH:C/eb//:S/earm/eabi/}
-.elif ${MACHINE_ARCH} == coldfire
-MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-coldfire
.elif (${MACHINE_GNU_ARCH} == arm || \
${MACHINE_GNU_ARCH} == armeb || \
${MACHINE_ARCH} == i386 || \
CVS commit: src/sys/arch/luna68k/dev
Module Name:src
Committed By: tsutsui
Date: Fri Jul 19 16:42:30 UTC 2013
Modified Files:
src/sys/arch/luna68k/dev: timekeeper.c timekeeper.h
Log Message:
Add an initialization function of DS1287A RTC and call it during attach.
It looks the boot firmware doesn't initialize the control registers
of DS1287A (while it resets NVRAM settings) and RTC oscillator is not
started properly after replacement.
Now my LUNA-II can keep RTC properly even after reboot.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/dev/timekeeper.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/dev/timekeeper.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/luna68k/dev/timekeeper.c
diff -u src/sys/arch/luna68k/dev/timekeeper.c:1.12 src/sys/arch/luna68k/dev/timekeeper.c:1.13
--- src/sys/arch/luna68k/dev/timekeeper.c:1.12 Sat Jan 26 15:44:14 2013
+++ src/sys/arch/luna68k/dev/timekeeper.c Fri Jul 19 16:42:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: timekeeper.c,v 1.12 2013/01/26 15:44:14 tsutsui Exp $ */
+/* $NetBSD: timekeeper.c,v 1.13 2013/07/19 16:42:30 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: timekeeper.c,v 1.12 2013/01/26 15:44:14 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: timekeeper.c,v 1.13 2013/07/19 16:42:30 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -58,6 +58,7 @@ struct timekeeper_softc {
static int clock_match(device_t, cfdata_t, void *);
static void clock_attach(device_t, device_t, void *);
+static void dsclock_init(struct timekeeper_softc *);
CFATTACH_DECL_NEW(clock, sizeof (struct timekeeper_softc),
clock_match, clock_attach, NULL, NULL);
@@ -103,6 +104,7 @@ clock_attach(device_t parent, device_t s
sc-sc_todr.todr_gettime_ymdhms = dsclock_get;
sc-sc_todr.todr_settime_ymdhms = dsclock_set;
sc-sc_todr.cookie = sc;
+ dsclock_init(sc);
aprint_normal(: ds1287a\n);
break;
}
@@ -161,6 +163,28 @@ mkclock_set(todr_chip_handle_t tch, stru
return 0;
}
+static void
+dsclock_init(struct timekeeper_softc *sc)
+{
+ volatile uint8_t *chiptime = (void *)sc-sc_clock;
+
+ /*
+ * It looks the firmware ROM doesn't initialize DS1287 at all
+ * even after the chip is replaced, so explicitly initialize
+ * control registers here.
+ */
+ chiptime = (void *)sc-sc_clock;
+
+ /* No DSE, 24HR, BINARY */
+ chiptime[MC_REGB] =
+ (chiptime[MC_REGB] ~MC_REGB_DSE) |
+ (MC_REGB_24HR | MC_REGB_BINARY);
+
+ /* make sure to start integrated clock OSC */
+ chiptime[MC_REGA] =
+ (chiptime[MC_REGA] ~MC_REGA_DVMASK) | MC_BASE_32_KHz;
+}
+
/*
* Get the time of day, based on the clock's value and/or the base value.
*/
Index: src/sys/arch/luna68k/dev/timekeeper.h
diff -u src/sys/arch/luna68k/dev/timekeeper.h:1.2 src/sys/arch/luna68k/dev/timekeeper.h:1.3
--- src/sys/arch/luna68k/dev/timekeeper.h:1.2 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/luna68k/dev/timekeeper.h Fri Jul 19 16:42:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: timekeeper.h,v 1.2 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: timekeeper.h,v 1.3 2013/07/19 16:42:30 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,6 +62,7 @@
#define MC_REGA_RSMASK 0x0f/* Interrupt rate select mask (see below) */
#define MC_REGA_DVMASK 0x70/* Divisor select mask (see below) */
#define MC_REGA_UIP0x80/* Update in progress; read only. */
+#define MC_BASE_32_KHz 0x20/* 32 KHz crystal (enable OSC on DS1287) */
#define MC_REGB 0xb /* Control register B */
#define MC_REGB_DSE0x01/* Daylight Savings Enable */
CVS commit: src/common/lib/libc/arch/m68k/string
Module Name:src
Committed By: matt
Date: Fri Jul 19 16:42:12 UTC 2013
Modified Files:
src/common/lib/libc/arch/m68k/string: memset.S strcmp.S strncmp.S
Log Message:
With these changes, they now produce identical binary as before the coldfire
changes.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/m68k/string/memset.S \
src/common/lib/libc/arch/m68k/string/strcmp.S \
src/common/lib/libc/arch/m68k/string/strncmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/m68k/string/memset.S
diff -u src/common/lib/libc/arch/m68k/string/memset.S:1.5 src/common/lib/libc/arch/m68k/string/memset.S:1.6
--- src/common/lib/libc/arch/m68k/string/memset.S:1.5 Thu Jul 18 22:42:50 2013
+++ src/common/lib/libc/arch/m68k/string/memset.S Fri Jul 19 16:42:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: memset.S,v 1.5 2013/07/18 22:42:50 matt Exp $ */
+/* $NetBSD: memset.S,v 1.6 2013/07/19 16:42:12 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
RCSID(from: @(#)bzero.s 5.1 (Berkeley) 5/12/90)
#else
- RCSID($NetBSD: memset.S,v 1.5 2013/07/18 22:42:50 matt Exp $)
+ RCSID($NetBSD: memset.S,v 1.6 2013/07/19 16:42:12 matt Exp $)
#endif
#endif /* LIBC_SCCS and not lint */
@@ -76,11 +76,7 @@ ENTRY(memset)
movl %d2,-(%sp)
movl 8(%sp),%a0 | destination
movl 16(%sp),%d1 | count
-#ifdef __mcoldfire__
- mvzb 15(%sp),%d2 | zero extend fill character
-#else
movb 15(%sp),%d2 | get fill character
-#endif
/*
* It isn't worth the overhead of aligning to {long}word boundries
@@ -89,15 +85,15 @@ ENTRY(memset)
cmpl #15,%d1
jlt Lbzbyte
-#ifndef __mcoldfire__
- andb 0xff,%d2 | clear high bytes
-#endif
- movl %d2,%d0
- lsll #8,%d0 | shift to 8-15
- orl %d0,%d2 | merge so low word is done
- movl %d2,%d0 | copy word
- swap %d0 | swap it
- orl %d0,%d2 | put it upper half
+ clrl %d0
+ moveb %d2,%d0
+ movel %d0,%d2
+ lsll #8,%d0
+ orl %d0,%d2
+ lsll #8,%d0
+ orl %d0,%d2
+ lsll #8,%d0
+ orl %d0,%d2
/* word align */
movl %a0,%d0
Index: src/common/lib/libc/arch/m68k/string/strcmp.S
diff -u src/common/lib/libc/arch/m68k/string/strcmp.S:1.5 src/common/lib/libc/arch/m68k/string/strcmp.S:1.6
--- src/common/lib/libc/arch/m68k/string/strcmp.S:1.5 Thu Jul 18 22:42:50 2013
+++ src/common/lib/libc/arch/m68k/string/strcmp.S Fri Jul 19 16:42:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strcmp.S,v 1.5 2013/07/18 22:42:50 matt Exp $ */
+/* $NetBSD: strcmp.S,v 1.6 2013/07/19 16:42:12 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include machine/asm.h
#if defined(LIBC_SCCS) !defined(lint)
- RCSID($NetBSD: strcmp.S,v 1.5 2013/07/18 22:42:50 matt Exp $)
+ RCSID($NetBSD: strcmp.S,v 1.6 2013/07/19 16:42:12 matt Exp $)
#endif /* LIBC_SCCS and not lint */
#ifdef __mcoldfire__
@@ -69,10 +69,13 @@ L1:/* unrolled by 4 for 680[23]0's *
jeq L1
L3:
-#ifndef __mcoldfire__
- EXTBL(%d1)
-#endif
+#ifdef __mcoldfire__
movl %d1,%d0
+#else
+ scs %d0
+ EXTBL(%d0)
+ movb %d1,%d0
+#endif
rts
L2: movq #0,%d0
Index: src/common/lib/libc/arch/m68k/string/strncmp.S
diff -u src/common/lib/libc/arch/m68k/string/strncmp.S:1.5 src/common/lib/libc/arch/m68k/string/strncmp.S:1.6
--- src/common/lib/libc/arch/m68k/string/strncmp.S:1.5 Thu Jul 18 22:42:50 2013
+++ src/common/lib/libc/arch/m68k/string/strncmp.S Fri Jul 19 16:42:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strncmp.S,v 1.5 2013/07/18 22:42:50 matt Exp $ */
+/* $NetBSD: strncmp.S,v 1.6 2013/07/19 16:42:12 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include machine/asm.h
#if defined(LIBC_SCCS) !defined(lint)
- RCSID($NetBSD: strncmp.S,v 1.5 2013/07/18 22:42:50 matt Exp $)
+ RCSID($NetBSD: strncmp.S,v 1.6 2013/07/19 16:42:12 matt Exp $)
#endif /* LIBC_SCCS and not lint */
@@ -50,7 +50,9 @@ ENTRY(strncmp)
jeq L4
movl 4(%sp),%a0
movl 8(%sp),%a1
+#ifdef __coldfire__
movl %d2,-(%sp) | save temp
+#endif
L1:/* unroll by 4 for m680[23]0's */
GETC((%a0)+,%d1)
jeq L2
@@ -88,9 +90,11 @@ L2: SUBC((%a1),%d1)
L3:
#ifdef __mcoldfire__
movl (%sp)+,%d2 | restore temp
+ movl %d1,%d0
#else
- EXTBL(%d1)
+ scs %d0
+ EXTBL(%d0)
+ moveb %d1,%d0
#endif
- movl %d1,%d0
rts
END(strncmp)
CVS commit: src/tools
Module Name:src
Committed By: matt
Date: Fri Jul 19 20:58:58 UTC 2013
Modified Files:
src/tools: Makefile
Log Message:
Even if we aren't making a crossgdb still make the object dir for it.
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/tools/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/Makefile
diff -u src/tools/Makefile:1.168 src/tools/Makefile:1.169
--- src/tools/Makefile:1.168 Wed Feb 27 21:25:11 2013
+++ src/tools/Makefile Fri Jul 19 20:58:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.168 2013/02/27 21:25:11 joerg Exp $
+# $NetBSD: Makefile,v 1.169 2013/07/19 20:58:58 matt Exp $
.include bsd.own.mk
.include bsd.endian.mk
@@ -45,7 +45,7 @@ TOOLCHAIN_BITS+= binutils .WAIT
.if defined(HAVE_GCC)
.if ${TOOLCHAIN_MISSING} == no
TOOLCHAIN_BITS+= gcc
-. if ${MKCROSSGDB:Uno} != no
+. if ${MKCROSSGDB:Uno} != no || make(obj)
TOOLCHAIN_BITS+= gdb
. endif
TOOLCHAIN_BITS+= .WAIT
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: matt Date: Fri Jul 19 17:31:49 UTC 2013 Modified Files: src/external/lgpl3/gmp/dist: acinclude.m4 Log Message: Add a M5407_PATTERN To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/lgpl3/gmp/dist/acinclude.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/acinclude.m4 diff -u src/external/lgpl3/gmp/dist/acinclude.m4:1.1.1.1 src/external/lgpl3/gmp/dist/acinclude.m4:1.2 --- src/external/lgpl3/gmp/dist/acinclude.m4:1.1.1.1 Mon Jun 20 05:54:29 2011 +++ src/external/lgpl3/gmp/dist/acinclude.m4 Fri Jul 19 17:31:49 2013 @@ -33,6 +33,9 @@ dnlconftest.exe - various DOS compil define(IA64_PATTERN, [[ia64*-*-* | itanium-*-* | itanium2-*-*]]) +define(M5407_PATTERN, +[[m5407-*-*]]) + dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all dnl of which config.sub accepts. (Though none of which are likely to work dnl with GMP.)
CVS commit: src/external
Module Name:src Committed By: matt Date: Fri Jul 19 22:14:24 UTC 2013 Added Files: src/external/gpl3/binutils/lib/libbfd/arch/coldfire: bfd.h bfd_stdint.h bfdver.h config.h defs.mk src/external/gpl3/binutils/lib/libiberty/arch/coldfire: config.h defs.mk src/external/gpl3/binutils/lib/libopcodes/arch/coldfire: config.h defs.mk src/external/gpl3/binutils/usr.bin/common/arch/coldfire: config.h defs.mk src/external/gpl3/binutils/usr.bin/gas/arch/coldfire: config.h defs.mk itbl-cpu.h obj-format.h targ-cpu.h targ-env.h src/external/gpl3/binutils/usr.bin/gprof/arch/coldfire: defs.mk gconfig.h src/external/gpl3/binutils/usr.bin/ld/arch/coldfire: config.h defs.mk ldemul-list.h src/external/gpl3/gcc/lib/crtstuff/arch: coldfire.mk src/external/gpl3/gcc/lib/libgcc/arch: coldfire.mk src/external/gpl3/gcc/lib/libgcc/libgcov/arch/coldfire: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgomp/arch/coldfire: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libiberty/arch/coldfire: config.h src/external/gpl3/gcc/lib/libobjc/arch/coldfire: config.h defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire: c++allocator.h c++config.h config.h cxxabi_tweaks.h defs.mk gstdint.h gthr-default.h gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list multilib.h plugin-version.h tm.h src/external/gpl3/gcc/usr.bin/libcpp/arch/coldfire: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/coldfire: config.h src/external/gpl3/gdb/lib/libbfd/arch/coldfire: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/coldfire: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/coldfire: config.h defs.mk init.c observer.h observer.inc version.c xml-builtin.c src/external/gpl3/gdb/lib/libiberty/arch/coldfire: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/coldfire: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/coldfire: config.h defs.mk src/external/lgpl3/gmp/lib/libgmp/arch/coldfire: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h mp.h Log Message: gmp, binutils, gcc, gdb configury for coldfire To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/lib/libbfd/arch/coldfire/bfd.h \ src/external/gpl3/binutils/lib/libbfd/arch/coldfire/bfd_stdint.h \ src/external/gpl3/binutils/lib/libbfd/arch/coldfire/bfdver.h \ src/external/gpl3/binutils/lib/libbfd/arch/coldfire/config.h \ src/external/gpl3/binutils/lib/libbfd/arch/coldfire/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/lib/libiberty/arch/coldfire/config.h \ src/external/gpl3/binutils/lib/libiberty/arch/coldfire/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/lib/libopcodes/arch/coldfire/config.h \ src/external/gpl3/binutils/lib/libopcodes/arch/coldfire/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/usr.bin/common/arch/coldfire/config.h \ src/external/gpl3/binutils/usr.bin/common/arch/coldfire/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/usr.bin/gas/arch/coldfire/config.h \ src/external/gpl3/binutils/usr.bin/gas/arch/coldfire/defs.mk \ src/external/gpl3/binutils/usr.bin/gas/arch/coldfire/itbl-cpu.h \ src/external/gpl3/binutils/usr.bin/gas/arch/coldfire/obj-format.h \ src/external/gpl3/binutils/usr.bin/gas/arch/coldfire/targ-cpu.h \ src/external/gpl3/binutils/usr.bin/gas/arch/coldfire/targ-env.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/usr.bin/gprof/arch/coldfire/defs.mk \ src/external/gpl3/binutils/usr.bin/gprof/arch/coldfire/gconfig.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/usr.bin/ld/arch/coldfire/config.h \ src/external/gpl3/binutils/usr.bin/ld/arch/coldfire/defs.mk \ src/external/gpl3/binutils/usr.bin/ld/arch/coldfire/ldemul-list.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/crtstuff/arch/coldfire.mk cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgcc/arch/coldfire.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/coldfire/defs.mk \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/coldfire/gcov-iov.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gcc/lib/libgomp/arch/coldfire/config.h \ src/external/gpl3/gcc/lib/libgomp/arch/coldfire/libgomp.spec \ src/external/gpl3/gcc/lib/libgomp/arch/coldfire/libgomp_f.h \ src/external/gpl3/gcc/lib/libgomp/arch/coldfire/omp.h cvs rdiff -u -r0
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: matt Date: Fri Jul 19 21:48:38 UTC 2013 Modified Files: src/external/gpl3/gdb/dist/gdb: configure.host Log Message: Match m5407--netbsdelf* To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/configure.host 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/gdb/dist/gdb/configure.host diff -u src/external/gpl3/gdb/dist/gdb/configure.host:1.2 src/external/gpl3/gdb/dist/gdb/configure.host:1.3 --- src/external/gpl3/gdb/dist/gdb/configure.host:1.2 Sun Sep 25 16:30:24 2011 +++ src/external/gpl3/gdb/dist/gdb/configure.host Fri Jul 19 21:48:38 2013 @@ -43,7 +43,7 @@ alpha*) gdb_host_cpu=alpha ;; arm*) gdb_host_cpu=arm ;; hppa*) gdb_host_cpu=pa ;; i[34567]86*) gdb_host_cpu=i386 ;; -m68*) gdb_host_cpu=m68k ;; +m68*|m5407*) gdb_host_cpu=m68k ;; m88*) gdb_host_cpu=m88k ;; mips*) gdb_host_cpu=mips ;; powerpc* | rs6000) gdb_host_cpu=powerpc ;; @@ -109,7 +109,7 @@ ia64-*-hpux*) gdb_host=hpux ;; ia64-*-linux*) gdb_host=linux ;; m68*-*-linux*) gdb_host=linux ;; -m68*-*-netbsdelf* | m68*-*-knetbsd*-gnu) +m68*-*-netbsdelf* | m68*-*-knetbsd*-gnu | m5407-*-netbsdelf*) gdb_host=nbsdelf ;; m68*-*-netbsd*) gdb_host=nbsdaout ;; m68*-*-openbsd*) gdb_host=obsd ;;
CVS commit: src/lib/libc/arch/m68k/hardfloat
Module Name:src Committed By: matt Date: Fri Jul 19 22:32:04 UTC 2013 Modified Files: src/lib/libc/arch/m68k/hardfloat: floatunsisf.S Log Message: Don't use the fs* variants, just use the f* ones. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/m68k/hardfloat/floatunsisf.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/libc/arch/m68k/hardfloat/floatunsisf.S diff -u src/lib/libc/arch/m68k/hardfloat/floatunsisf.S:1.1 src/lib/libc/arch/m68k/hardfloat/floatunsisf.S:1.2 --- src/lib/libc/arch/m68k/hardfloat/floatunsisf.S:1.1 Thu Jul 18 21:25:11 2013 +++ src/lib/libc/arch/m68k/hardfloat/floatunsisf.S Fri Jul 19 22:32:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: floatunsisf.S,v 1.1 2013/07/18 21:25:11 matt Exp $ */ +/* $NetBSD: floatunsisf.S,v 1.2 2013/07/19 22:32:04 matt Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include machine/asm.h #if defined(LIBC_SCCS) !defined(lint) -RCSID($NetBSD: floatunsisf.S,v 1.1 2013/07/18 21:25:11 matt Exp $) +RCSID($NetBSD: floatunsisf.S,v 1.2 2013/07/19 22:32:04 matt Exp $) #endif /* LIBC_SCCS and not lint */ #ifdef __mcoldfire__ @@ -45,19 +45,19 @@ L2G: .double 0r2147483648.0 ENTRY(__floatunsisf) movl 4(%sp),%d0 jpl 1f - fsmovel %d0,%fp0 + fmovel %d0,%fp0 #ifndef __SVR4_ABI__ fmoves %fp0,%d0 #endif rts 1: bclr #31,%d0 - fsmovel %d0,%fp0 + fmovel %d0,%fp0 #ifdef __mcoldfire__ LEA_LCL(L2G,%a0) - fsaddd (%a0),%fp0 + faddd (%a0),%fp0 #else - fsaddd #0r2147483648.0,%fp0 + faddd #0r2147483648.0,%fp0 #endif #ifndef __SVR4_ABI__ fmoves %fp0,%d0
CVS commit: src/doc
Module Name:src Committed By: matt Date: Sat Jul 20 04:46:58 UTC 2013 Modified Files: src/doc: CHANGES Log Message: Note addition of non-kernel coldfire support. To generate a diff of this commit: cvs rdiff -u -r1.1834 -r1.1835 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.1834 src/doc/CHANGES:1.1835 --- src/doc/CHANGES:1.1834 Fri Jul 19 11:56:42 2013 +++ src/doc/CHANGES Sat Jul 20 04:46:58 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1834 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1835 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -257,3 +257,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0: libc: Update to tzcode2013d. [christo 20130717] wpa: Import wpa_supplicant and hostapd 1.1 [adam 20130717] dhcpcd(8): Import dhcpcd-6.0.3 [roy 20130719] + coldfire: add userland and toolchain support for FreeScale Coldfire + CPUs (which implement a subset of m68k instructions and + addressing modes). [matt 20130719]
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: kefren
Date: Sat Jul 20 05:16:08 UTC 2013
Modified Files:
src/usr.sbin/ldpd: fsm.c ldp_peer.c ldp_peer.h mpls_routes.c
socketops.c tlv_stack.c
Log Message:
don't connect on first hello, there are chances that ours is not seen yet
setproctitle with ldp id - useful for rump kernels testing
fix a memory leak in ldp_peer_new
don't holddown if already holded down
peer sockets are now non-blocking
connected routes deletes are now processed
check if peer is connected before attempting to sending label mappings
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/ldpd/fsm.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/ldpd/ldp_peer.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/ldpd/ldp_peer.h
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/ldpd/mpls_routes.c
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/ldpd/socketops.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/ldpd/tlv_stack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ldpd/fsm.c
diff -u src/usr.sbin/ldpd/fsm.c:1.13 src/usr.sbin/ldpd/fsm.c:1.14
--- src/usr.sbin/ldpd/fsm.c:1.13 Fri Jul 12 08:55:52 2013
+++ src/usr.sbin/ldpd/fsm.c Sat Jul 20 05:16:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fsm.c,v 1.13 2013/07/12 08:55:52 kefren Exp $ */
+/* $NetBSD: fsm.c,v 1.14 2013/07/20 05:16:08 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -112,6 +112,7 @@ run_ldp_hello(const struct ldp_pdu * pdu
hi-ldp_id.s_addr = pduid-ldp_id.s_addr;
memcpy(hi-transport_address, traddr, traddr.sa.sa_len);
SLIST_INSERT_HEAD(hello_info_head, hi, infos);
+ may_connect = false;
}
/* Update expire timer */
@@ -236,5 +237,6 @@ set_my_ldp_id()
freeifaddrs(ifa);
debugp(LDP ID: %s\n, inet_ntoa(a));
strlcpy(my_ldp_id, inet_ntoa(a), INET_ADDRSTRLEN);
+ setproctitle(LDP ID: %s, my_ldp_id);
return LDP_E_OK;
}
Index: src/usr.sbin/ldpd/ldp_peer.c
diff -u src/usr.sbin/ldpd/ldp_peer.c:1.14 src/usr.sbin/ldpd/ldp_peer.c:1.15
--- src/usr.sbin/ldpd/ldp_peer.c:1.14 Thu Jul 18 06:07:45 2013
+++ src/usr.sbin/ldpd/ldp_peer.c Sat Jul 20 05:16:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.c,v 1.14 2013/07/18 06:07:45 kefren Exp $ */
+/* $NetBSD: ldp_peer.c,v 1.15 2013/07/20 05:16:08 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
#include assert.h
#include errno.h
+#include fcntl.h
#include stdlib.h
#include strings.h
#include stdio.h
@@ -77,12 +78,11 @@ ldp_peer_new(const struct in_addr * ldp_
const struct sockaddr * tradd, uint16_t holdtime, int soc)
{
struct ldp_peer *p;
- int s = soc;
- struct sockaddr *connecting_sa = NULL;
+ int s = soc, sopts;
+ union sockunion connecting_su;
struct conf_neighbour *cn;
- if (tradd != NULL)
- assert(tradd-sa_family == padd-sa_family);
+ assert(tradd == NULL || tradd-sa_family == padd-sa_family);
if (soc 1) {
s = socket(PF_INET, SOCK_STREAM, 0);
@@ -91,22 +91,20 @@ ldp_peer_new(const struct in_addr * ldp_
return NULL;
}
if (tradd != NULL) {
- connecting_sa = malloc(tradd-sa_len);
- memcpy(connecting_sa, tradd, tradd-sa_len);
+ assert(tradd-sa_len = sizeof(connecting_su));
+ memcpy(connecting_su, tradd, tradd-sa_len);
} else {
- connecting_sa = malloc(padd-sa_len);
- memcpy(connecting_sa, padd, padd-sa_len);
+ assert(padd-sa_len = sizeof(connecting_su));
+ memcpy(connecting_su, padd, padd-sa_len);
}
- assert(connecting_sa-sa_family == AF_INET ||
- connecting_sa-sa_family == AF_INET6);
+ assert(connecting_su.sa.sa_family == AF_INET ||
+ connecting_su.sa.sa_family == AF_INET6);
- if (connecting_sa-sa_family == AF_INET)
- ((struct sockaddr_in*)connecting_sa)-sin_port =
- htons(LDP_PORT);
+ if (connecting_su.sa.sa_family == AF_INET)
+ connecting_su.sin.sin_port = htons(LDP_PORT);
else
- ((struct sockaddr_in6*)connecting_sa)-sin6_port =
- htons(LDP_PORT);
+ connecting_su.sin6.sin6_port = htons(LDP_PORT);
set_ttl(s);
}
@@ -155,20 +153,23 @@ ldp_peer_new(const struct in_addr * ldp_
SLIST_INIT(p-label_mapping_head);
p-timeout = p-holdtime;
+ sopts = fcntl(p-socket, F_GETFL);
+ if (sopts = 0) {
+ sopts |= O_NONBLOCK;
+ fcntl(p-socket, F_SETFL, sopts);
+ }
+
/* And connect to peer */
- if (soc 1)
- if (connect(s, connecting_sa, connecting_sa-sa_len) == -1) {
- if (errno == EINTR) {
-free(connecting_sa);
-return p; /* We take care of this in
- * big_loop */
- }
- warnp(connect to %s failed: %s\n,
- satos(connecting_sa), strerror(errno));
- free(connecting_sa);
- ldp_peer_holddown(p);
- return NULL;
- }
+ if (soc 1
+ connect(s, connecting_su.sa, connecting_su.sa.sa_len) == -1) {
+ if (errno == EINTR || errno == EINPROGRESS)
+ /* We take care of this in big_loop */
+ return p;
+ warnp(connect to %s failed: %s\n,
+ satos(connecting_su.sa), strerror(errno));
+
