Module Name: src
Committed By: joerg
Date: Thu Jul 12 21:35:12 UTC 2018
Modified Files:
src/lib/csu/common: crt0-common.c
Log Message:
_DYNAMIC is present for static PIE as well, so loosen rtld check.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/csu/common/crt0-common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/common/crt0-common.c
diff -u src/lib/csu/common/crt0-common.c:1.16 src/lib/csu/common/crt0-common.c:1.17
--- src/lib/csu/common/crt0-common.c:1.16 Thu Mar 29 13:23:39 2018
+++ src/lib/csu/common/crt0-common.c Thu Jul 12 21:35:12 2018
@@ -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), /* fro
__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)
