oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce sysident patches

Browse Source 
Change-Id: I4499a294e74ed69648afc33bff5f750f3d1aa019
This commit is contained in:
Lionel Sambuc 2016-01-03 11:44:52 +01:00
parent d578d57bfe
commit ace2de0ad1
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/csu/common/sysident.S
View File

@ -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) */

4
lib/csu/common/sysident_assym.cf
View File

@ -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

11
sys/sys/exec_elf.h
View File

@ -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.