Module Name: src
Committed By: martin
Date: Sat Jan 4 08:58:51 UTC 2014
Modified Files:
src/usr.bin/crunch/crunchgen: crunchgen.c
Log Message:
Remove .note.netbsd.mcmodel and .note.netbsd.pax from the chrunched binaries.
We don't know wether the former would make sense (as currently used, it never
makes sense for static binaries) and we can not conclude safe PAX flags from
combined binaries.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/crunch/crunchgen/crunchgen.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/crunch/crunchgen/crunchgen.c
diff -u src/usr.bin/crunch/crunchgen/crunchgen.c:1.81 src/usr.bin/crunch/crunchgen/crunchgen.c:1.82
--- src/usr.bin/crunch/crunchgen/crunchgen.c:1.81 Mon Jun 10 18:27:30 2013
+++ src/usr.bin/crunch/crunchgen/crunchgen.c Sat Jan 4 08:58:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: crunchgen.c,v 1.81 2013/06/10 18:27:30 joerg Exp $ */
+/* $NetBSD: crunchgen.c,v 1.82 2014/01/04 08:58:51 martin 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.81 2013/06/10 18:27:30 joerg Exp $");
+__RCSID("$NetBSD: crunchgen.c,v 1.82 2014/01/04 08:58:51 martin Exp $");
#endif
#include <stdlib.h>
@@ -957,7 +957,7 @@ top_makefile_rules(FILE *outmk)
fprintf(outmk, "\t@[ -f ${PROG}.unstripped -a ! ${PROG} -nt ${PROG}.unstripped ] || { \\\n");
fprintf(outmk, "\t\t${_MKSHMSG:Uecho} \" strip \" ${PROG}; \\\n");
fprintf(outmk, "\t\tcp ${PROG} ${PROG}.unstripped && \\\n");
- fprintf(outmk, "\t\t${OBJCOPY} -S -R .eh_frame -R .eh_frame_hdr -R .note -R .ident -R .comment -R .copyright ${PROG} && \\\n");
+ fprintf(outmk, "\t\t${OBJCOPY} -S -R .eh_frame -R .eh_frame_hdr -R .note -R .note.netbsd.mcmodel -R .note.netbsd.pax -R .ident -R .comment -R .copyright ${PROG} && \\\n");
fprintf(outmk, "\t\ttouch ${PROG}.unstripped; \\\n");
fprintf(outmk, "\t}\n");
fprintf(outmk, "objs: $(SUBMAKE_TARGETS)\n");
