From 83015ce9f4e56faa772bfab4f9717365af353ced Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 28 Apr 2020 10:05:25 -0700 Subject: [PATCH] rtld: Get architecture specific initializer in rtld_global Include to get architecture specific initializer in rtld_global. --- elf/rtld.c | 2 ++ sysdeps/x86/dl-procruntime.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/elf/rtld.c b/elf/rtld.c index 5ccc3c2dbb..882b070cc0 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -315,6 +315,8 @@ rtld_hidden_def (_dl_starting_up) (except those which cannot be added for some reason). */ struct rtld_global _rtld_global = { + /* Get architecture specific initializer. */ +#include /* Generally the default presumption without further information is an * executable stack but this is not true for all platforms. */ ._dl_stack_flags = DEFAULT_STACK_PERMS, diff --git a/sysdeps/x86/dl-procruntime.c b/sysdeps/x86/dl-procruntime.c index 5e39a38133..88a7cac646 100644 --- a/sysdeps/x86/dl-procruntime.c +++ b/sysdeps/x86/dl-procruntime.c @@ -49,6 +49,11 @@ # else PROCINFO_CLASS unsigned int _dl_x86_feature_1[2] # endif +# ifndef PROCINFO_DECL += { + 0, + } +# endif # if !defined SHARED || defined PROCINFO_DECL ; # else -- 2.26.2