Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src Pull up following revision(s) (requested by mrg in ticket...
details: https://anonhg.NetBSD.org/src/rev/7c08a338e32e
branches: netbsd-8
changeset: 434174:7c08a338e32e
user: snj <snj%NetBSD.org@localhost>
date: Tue Aug 01 23:36:08 2017 +0000
description:
Pull up following revision(s) (requested by mrg in ticket #174):
external/gpl3/binutils/usr.sbin/mdsetimage/bin_bfd.c: revision 1.2
sys/arch/evbmips/conf/CI20: revision 1.23
initialise some stack variables to zero so that later checking ensures
they are considered "unfound" instead of some random value.
part 1 in fixing the CI20 kernel build. this one actually will cause
the build to fail, but it's outputting broken objects right now anyway.
part 2 coming up in the CI20 configuration itself.
--
don't set NEED_MDSETIMAGE when we don't enable the md_root. move the
option in with the commented md_root options.
part 2 of the CI20 kernel build fix. now evbmips builds completes
sanely for me.
diffstat:
external/gpl3/binutils/usr.sbin/mdsetimage/bin_bfd.c | 6 ++++--
sys/arch/evbmips/conf/CI20 | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diffs (60 lines):
diff -r 4fce667e114b -r 7c08a338e32e external/gpl3/binutils/usr.sbin/mdsetimage/bin_bfd.c
--- a/external/gpl3/binutils/usr.sbin/mdsetimage/bin_bfd.c Tue Aug 01 23:33:18 2017 +0000
+++ b/external/gpl3/binutils/usr.sbin/mdsetimage/bin_bfd.c Tue Aug 01 23:36:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bin_bfd.c,v 1.1 2016/09/21 21:52:26 christos Exp $ */
+/* $NetBSD: bin_bfd.c,v 1.1.8.1 2017/08/01 23:36:08 snj Exp $ */
/*
* Copyright (c) 1996, 2002 Christopher G. Demetriou
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: bin_bfd.c,v 1.1 2016/09/21 21:52:26 christos Exp $");
+__RCSID("$NetBSD: bin_bfd.c,v 1.1.8.1 2017/08/01 23:36:08 snj Exp $");
#include <stdio.h>
#include <string.h>
@@ -75,6 +75,8 @@
size_t offset;
} *s, symbols[3];
+ symbols[0].offset = 0;
+ symbols[1].offset = 0;
symbols[0].name = root_name;
symbols[1].name = size_name;
symbols[2].name = NULL;
diff -r 4fce667e114b -r 7c08a338e32e sys/arch/evbmips/conf/CI20
--- a/sys/arch/evbmips/conf/CI20 Tue Aug 01 23:33:18 2017 +0000
+++ b/sys/arch/evbmips/conf/CI20 Tue Aug 01 23:36:08 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CI20,v 1.22 2017/02/19 07:47:00 rin Exp $
+# $NetBSD: CI20,v 1.22.6.1 2017/08/01 23:36:08 snj Exp $
#
# MIPS Creator CI20
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "CI20-$Revision: 1.22 $"
+#ident "CI20-$Revision: 1.22.6.1 $"
maxusers 32
@@ -15,13 +15,13 @@
options MIPS32R2
makeoptions CPUFLAGS+="-mips32r2"
-makeoptions NEED_MDSETIMAGE="yes"
makeoptions NEED_BINARY="yes"
makeoptions NEED_UBOOTIMAGE="gz"
options COM_TOLERANCE=50 # +/- 5%
options CONSPEED=115200 # u-boot default
# Options for necessary to use MD
+#makeoptions NEED_MDSETIMAGE="yes"
#options MEMORY_DISK_HOOKS
#options MEMORY_DISK_IS_ROOT # force root on memory disk
#options MEMORY_DISK_SERVER=0 # no userspace memory disk support
Home |
Main Index |
Thread Index |
Old Index