Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/crunch/crunchgen while we're still figuring out the ...



details:   https://anonhg.NetBSD.org/src/rev/3776a5743f48
branches:  trunk
changeset: 839317:3776a5743f48
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Feb 13 20:48:56 2019 +0000

description:
while we're still figuring out the gcc7 vs .eh_frame issue, apply
the don't remove eh_frame hack to mips as well.  hpcmips testbed
is also failing currently:

[   3.1238738] panic: init died (signal 6, exit 12)

diffstat:

 usr.bin/crunch/crunchgen/crunchgen.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 2985dbed582d -r 3776a5743f48 usr.bin/crunch/crunchgen/crunchgen.c
--- a/usr.bin/crunch/crunchgen/crunchgen.c      Wed Feb 13 18:31:11 2019 +0000
+++ b/usr.bin/crunch/crunchgen/crunchgen.c      Wed Feb 13 20:48:56 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: crunchgen.c,v 1.90 2019/02/12 10:16:58 mrg Exp $       */
+/*     $NetBSD: crunchgen.c,v 1.91 2019/02/13 20:48:56 mrg Exp $       */
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: crunchgen.c,v 1.90 2019/02/12 10:16:58 mrg Exp $");
+__RCSID("$NetBSD: crunchgen.c,v 1.91 2019/02/13 20:48:56 mrg Exp $");
 #endif
 
 #include <stdlib.h>
@@ -964,7 +964,9 @@
 
     fprintf(outmk, "OBJCOPY_REMOVE_FLAGS=-R .eh_frame_hdr -R .note -R .note.netbsd.pax -R .ident -R .comment -R .copyright\n\n");
 
-    fprintf(outmk, ".if ${MACHINE} != \"sparc\" && ${MACHINE} != \"sparc64\"\n");
+    fprintf(outmk, ".if !(${MACHINE} == \"sparc\" || \\\n");
+    fprintf(outmk, "      ${MACHINE} == \"sparc64\" || \\\n");
+    fprintf(outmk, "      ${MACHINE_ARCH:C/mips(e|64e)[bl]/mips/} == \"mips\")\n");
     fprintf(outmk, "OBJCOPY_REMOVE_FLAGS+=-R .eh_frame\n");
     fprintf(outmk, ".endif\n");
     fprintf(outmk, ".if ${MACHINE} != \"sparc64\"\n");



Home | Main Index | Thread Index | Old Index