[src/trunk]: src/sys Ignore the ancient 01.01 tag that gnuc used to put in ol...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd2e63684c8d
branches:  trunk
changeset: 341353:fd2e63684c8d
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 01 17:44:41 2015 +0000

description:
Ignore the ancient 01.01 tag that gnuc used to put in old NetBSD binaries.

diffstat:

 sys/kern/exec_elf.c |  15 +++++++++++----
 sys/sys/exec_elf.h  |   7 ++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 22397985a157 -r fd2e63684c8d sys/kern/exec_elf.c
--- a/sys/kern/exec_elf.c       Sun Nov 01 17:23:36 2015 +0000
+++ b/sys/kern/exec_elf.c       Sun Nov 01 17:44:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_elf.c,v 1.79 2015/11/01 15:21:42 christos Exp $   */
+/*     $NetBSD: exec_elf.c,v 1.80 2015/11/01 17:44:41 christos Exp $   */
 
 /*-
  * Copyright (c) 1994, 2000, 2005, 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.79 2015/11/01 15:21:42 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.80 2015/11/01 17:44:41 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pax.h"
@@ -927,13 +927,20 @@
                        }
 
                        /*
-                        * Ignore SuSE tags; SuSE's n_type is the same as NetBSD's
-                        * one.
+                        * Ignore SuSE tags; SuSE's n_type is the same the
+                        * NetBSD one.
                         */
                        if (np->n_namesz == ELF_NOTE_SUSE_NAMESZ &&
                            memcmp(ndata, ELF_NOTE_SUSE_NAME,
                            ELF_NOTE_SUSE_NAMESZ) == 0)
                                break;
+                       /*
+                        * Ignore old GCC
+                        */
+                       if (np->n_namesz == ELF_NOTE_OGCC_NAMESZ &&
+                           memcmp(ndata, ELF_NOTE_OGCC_NAME,
+                           ELF_NOTE_OGCC_NAMESZ) == 0)
+                               break;
                        BADNOTE("NetBSD tag");
                        goto bad;
 
diff -r 22397985a157 -r fd2e63684c8d sys/sys/exec_elf.h
--- a/sys/sys/exec_elf.h        Sun Nov 01 17:23:36 2015 +0000
+++ b/sys/sys/exec_elf.h        Sun Nov 01 17:44:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_elf.h,v 1.150 2015/11/01 15:21:42 christos Exp $  */
+/*     $NetBSD: exec_elf.h,v 1.151 2015/11/01 17:44:42 christos Exp $  */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -836,6 +836,11 @@
 #define ELF_NOTE_ABI_OS_KFREEBSD       3
 #define ELF_NOTE_ABI_OS_KNETBSD                4
 
+/* Old gcc style, under the ABI tag */
+#define ELF_NOTE_OGCC_NAMESZ           8
+#define ELF_NOTE_OGCC_NAME             "01.01\0\0\0\0"
+#define ELF_NOTE_OGCC_DESCSZ           0
+
 /*
  * GNU-specific note type: Hardware capabilities
  * name: GNU\0