Author: emaste
Date: Thu Oct 11 00:26:15 2018
New Revision: 339300
URL: https://svnweb.freebsd.org/changeset/base/339300
Log:
MFC r339181: crt: switch to standard note type definitions from elf_common.h
This makes it easier to grep the source tree for these notes, and
ensures that they will remain in sync.
Sponsored by: The FreeBSD Foundation
Modified:
stable/11/lib/csu/arm/crt1.c
stable/11/lib/csu/common/crtbrand.c
stable/11/lib/csu/common/ignore_init.c
stable/11/lib/csu/common/notes.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/csu/arm/crt1.c
==============================================================================
--- stable/11/lib/csu/arm/crt1.c Wed Oct 10 22:59:15 2018
(r339299)
+++ stable/11/lib/csu/arm/crt1.c Thu Oct 11 00:26:15 2018
(r339300)
@@ -42,6 +42,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/param.h>
+#include <sys/elf_common.h>
#include <stdlib.h>
#include "libc_private.h"
@@ -118,7 +120,7 @@ static const struct {
} archtag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = {
.namesz = sizeof(NOTE_FREEBSD_VENDOR),
.descsz = sizeof(MACHINE_ARCH),
- .type = ARCH_NOTETYPE,
+ .type = NT_FREEBSD_ARCH_TAG,
.name = NOTE_FREEBSD_VENDOR,
.desc = MACHINE_ARCH
};
Modified: stable/11/lib/csu/common/crtbrand.c
==============================================================================
--- stable/11/lib/csu/common/crtbrand.c Wed Oct 10 22:59:15 2018
(r339299)
+++ stable/11/lib/csu/common/crtbrand.c Thu Oct 11 00:26:15 2018
(r339300)
@@ -27,6 +27,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/elf_common.h>
#include "notes.h"
/*
@@ -60,7 +61,7 @@ static const struct {
} abitag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = {
.namesz = sizeof(NOTE_FREEBSD_VENDOR),
.descsz = sizeof(int32_t),
- .type = ABI_NOTETYPE,
+ .type = NT_FREEBSD_ABI_TAG,
.name = NOTE_FREEBSD_VENDOR,
.desc = __FreeBSD_version
};
Modified: stable/11/lib/csu/common/ignore_init.c
==============================================================================
--- stable/11/lib/csu/common/ignore_init.c Wed Oct 10 22:59:15 2018
(r339299)
+++ stable/11/lib/csu/common/ignore_init.c Thu Oct 11 00:26:15 2018
(r339300)
@@ -26,6 +26,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/param.h>
+#include <sys/elf_common.h>
#include "notes.h"
extern int main(int, char **, char **);
@@ -112,7 +114,7 @@ static const struct {
aligned(4))) __used = {
.namesz = sizeof(NOTE_FREEBSD_VENDOR),
.descsz = sizeof(uint32_t),
- .type = CRT_NOINIT_NOTETYPE,
+ .type = NT_FREEBSD_NOINIT_TAG,
.name = NOTE_FREEBSD_VENDOR,
.desc = 0
};
Modified: stable/11/lib/csu/common/notes.h
==============================================================================
--- stable/11/lib/csu/common/notes.h Wed Oct 10 22:59:15 2018
(r339299)
+++ stable/11/lib/csu/common/notes.h Thu Oct 11 00:26:15 2018
(r339300)
@@ -32,8 +32,4 @@
#define NOTE_SECTION ".note.tag"
-#define ABI_NOTETYPE 1
-#define CRT_NOINIT_NOTETYPE 2
-#define ARCH_NOTETYPE 3
-
#endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
