Reduce sysident patches

Change-Id: I4499a294e74ed69648afc33bff5f750f3d1aa019

diff --git a/lib/csu/common/sysident.S b/lib/csu/common/sysident.S
index 5e5674e55e7762850441ebbd22844692663cfa7c..fa261acace64648b17911a38266fb4ac1c420a4c 100644 (file)
--- a/lib/csu/common/sysident.S
+++ b/lib/csu/common/sysident.S
@@ -58,21 +58,16 @@
 
 #include "sysident_assym.h"
 
-#if defined(__minix)
-       .section ".note.minix.ident", "a"
-       .p2align 2
-       .long   ELF_NOTE_MINIX_NAMESZ
-       .long   ELF_NOTE_MINIX_DESCSZ
-       .long   ELF_NOTE_TYPE_MINIX_TAG
-       .ascii  "Minix\0\0\0"   /* ELF_NOTE_NETBSD_NAME */
-       .long   300300000 /* Minix version as in "%d%03d%03d", MAJ-MIN-TEENY */
-#else
        .section ".note.netbsd.ident", "a"
        .p2align 2
 
        .long   ELF_NOTE_NETBSD_NAMESZ
        .long   ELF_NOTE_NETBSD_DESCSZ
        .long   ELF_NOTE_TYPE_NETBSD_TAG
+#if defined(__minix)
+       .ascii  "Minix\0\0\0"   /* ELF_NOTE_NETBSD_NAME */
+       .long   300400000 /* Minix version as in "%d%03d%03d", MAJ-MIN-TEENY */
+#else
        .ascii  "NetBSD\0\0"    /* ELF_NOTE_NETBSD_NAME */
        .long   __NetBSD_Version__
 #endif /* defined(__minix) */

diff --git a/lib/csu/common/sysident_assym.cf b/lib/csu/common/sysident_assym.cf
index 3dc1cec9170478d6aed5b63dad376b8ef15b96a0..2d4717def9ed2aab354d3c67c9e144ac20e9c13f 100644 (file)
--- a/lib/csu/common/sysident_assym.cf
+++ b/lib/csu/common/sysident_assym.cf
@@ -21,7 +21,3 @@ endif
 
 define ELF_NOTE_MCMODEL_NAMESZ         ELF_NOTE_MCMODEL_NAMESZ
 define ELF_NOTE_TYPE_MCMODEL_TAG       ELF_NOTE_TYPE_MCMODEL_TAG
-
-define ELF_NOTE_MINIX_NAMESZ           ELF_NOTE_MINIX_NAMESZ
-define ELF_NOTE_MINIX_DESCSZ           ELF_NOTE_MINIX_DESCSZ
-define ELF_NOTE_TYPE_MINIX_TAG         ELF_NOTE_TYPE_MINIX_TAG

diff --git a/sys/sys/exec_elf.h b/sys/sys/exec_elf.h
index 8a7ec7e191ad1cd31dc97ab40184315b73fece4b..e340b61056d3a1e177a7b2c0f944906db5bd86c3 100644 (file)
--- a/sys/sys/exec_elf.h
+++ b/sys/sys/exec_elf.h
@@ -908,18 +908,17 @@ typedef struct {
  * descsz: 4
  */
 #define ELF_NOTE_TYPE_NETBSD_TAG       1
+#if defined(__minix)
 /* NetBSD-specific note name and description sizes */
 #define ELF_NOTE_NETBSD_NAMESZ         7
 #define ELF_NOTE_NETBSD_DESCSZ         4
 /* NetBSD-specific note name */
 #define ELF_NOTE_NETBSD_NAME           "NetBSD\0\0"
-
-#if defined(__minix)
-#define ELF_NOTE_TYPE_MINIX_TAG                1
+#else
 /* MINIX3-specific note name and description sizes */
-#define ELF_NOTE_MINIX_NAMESZ          6
-#define ELF_NOTE_MINIX_DESCSZ          4
-#define ELF_NOTE_MINIX_NAME            "Minix\0\0\0"
+#define ELF_NOTE_NETBSD_NAMESZ         6
+#define ELF_NOTE_NETBSD_DESCSZ         4
+#define ELF_NOTE_NETBSD_NAME           "Minix\0\0\0"
 #endif /* defined(__minix) */
 
 /* NetBSD-specific note type: Checksum.