This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/cet/property updated. glibc-2.25-618-g71b2893
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Jun 2017 13:57:14 -0000
- Subject: GNU C Library master sources branch hjl/cet/property updated. glibc-2.25-618-g71b2893
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, hjl/cet/property has been updated
via 71b289337b59b4399abb5f883e36918ad9688fad (commit)
from 121ff354c6ff4e6e22a0b6d348f100498a8d4110 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=71b289337b59b4399abb5f883e36918ad9688fad
commit 71b289337b59b4399abb5f883e36918ad9688fad
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Jun 28 06:57:03 2017 -0700
Add DL_INIT
diff --git a/sysdeps/unix/sysv/linux/x86/dl-cet.h b/sysdeps/unix/sysv/linux/x86/dl-cet.h
index 27a7298..3d4eb9b 100644
--- a/sysdeps/unix/sysv/linux/x86/dl-cet.h
+++ b/sysdeps/unix/sysv/linux/x86/dl-cet.h
@@ -16,6 +16,8 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#define DL_INIT "_dl_cet_init"
+
#define ROUND_PROPERTY_NOTE(len) \
(((len) + sizeof (ElfW(Addr)) - 1) & -sizeof (ElfW(Addr)))
diff --git a/sysdeps/unix/sysv/linux/x86/dl-machine.h b/sysdeps/unix/sysv/linux/x86/dl-machine.h
index 4edc10a..48e2cd4 100644
--- a/sysdeps/unix/sysv/linux/x86/dl-machine.h
+++ b/sysdeps/unix/sysv/linux/x86/dl-machine.h
@@ -17,5 +17,5 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <sysdeps/x86_64/dl-machine.h>
#include "dl-cet.h"
+#include <sysdeps/x86_64/dl-machine.h>
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index ba41cfc..45f6630 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -153,9 +153,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
return lazy;
}
-#ifdef DL_PROCESS_PT_NOTE
-# define DL_INIT "_dl_cet_init"
-#else
+#ifndef
# define DL_INIT "_dl_init"
#endif
-----------------------------------------------------------------------
Summary of changes:
sysdeps/unix/sysv/linux/x86/dl-cet.h | 2 ++
sysdeps/unix/sysv/linux/x86/dl-machine.h | 2 +-
sysdeps/x86_64/dl-machine.h | 4 +---
3 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources