summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2018-07-12 21:35:12 +0000
committerjoerg <joerg@NetBSD.org>2018-07-12 21:35:12 +0000
commit4cd9ec190b91fd12cbdd8caae2b6dedd53dcf93e (patch)
tree679a9fd8e3cd1c39e0d53289c880b9d90893edfb
parentbe970dd3e9a379caf85ad270259e7754245dbf76 (diff)
_DYNAMIC is present for static PIE as well, so loosen rtld check.
-rw-r--r--lib/csu/common/crt0-common.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/csu/common/crt0-common.c b/lib/csu/common/crt0-common.c
index df6816be8a7..7c4a45c1223 100644
--- a/lib/csu/common/crt0-common.c
+++ b/lib/csu/common/crt0-common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0-common.c,v 1.16 2018/03/29 13:23:39 joerg Exp $ */
+/* $NetBSD: crt0-common.c,v 1.17 2018/07/12 21:35:12 joerg Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: crt0-common.c,v 1.16 2018/03/29 13:23:39 joerg Exp $");
+__RCSID("$NetBSD: crt0-common.c,v 1.17 2018/07/12 21:35:12 joerg Exp $");
#include <sys/types.h>
#include <sys/exec.h>
@@ -215,9 +215,7 @@ ___start(void (*cleanup)(void), /* from shared loader */
__progname = empty_string;
}
- if (&rtld_DYNAMIC != NULL) {
- if (obj == NULL)
- _FATAL("NULL Obj_Entry pointer in GOT\n");
+ if (&rtld_DYNAMIC != NULL && obj != NULL) {
if (obj->magic != RTLD_MAGIC)
_FATAL("Corrupt Obj_Entry pointer in GOT\n");
if (obj->version != RTLD_VERSION)