Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so Re-arrange/correct some asserts.



details:   https://anonhg.NetBSD.org/src/rev/fc6f95300310
branches:  trunk
changeset: 566680:fc6f95300310
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon May 17 10:23:58 2004 +0000

description:
Re-arrange/correct some asserts.

diffstat:

 libexec/ld.elf_so/rtld.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 9b8a898f4c34 -r fc6f95300310 libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Mon May 17 07:00:16 2004 +0000
+++ b/libexec/ld.elf_so/rtld.c  Mon May 17 10:23:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.102 2004/05/12 20:23:29 skrll Exp $  */
+/*     $NetBSD: rtld.c,v 1.103 2004/05/17 10:23:58 skrll Exp $  */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -147,11 +147,14 @@
        _rtld_objself.dynamic = (Elf_Dyn *) &_DYNAMIC;
 
        _rtld_digest_dynamic(&_rtld_objself);
-       assert(!_rtld_objself.needed && !_rtld_objself.pltrel &&
-           !_rtld_objself.pltrela);
+       assert(!_rtld_objself.needed)
+       assert(!_rtld_objself.pltrel && !_rtld_objself.pltrela);
+#if !defined(__mips__)
+       assert(!_rtld_objself.pltgot)
+#endif
 #if !defined(__arm__) && !defined(__mips__) && !defined(__sh__)
        /* ARM, MIPS and SH{3,5} have a bogus DT_TEXTREL. */
-       assert(!_rtld_objself.pltgot && !_rtld_objself.textrel);
+       assert(!_rtld_objself.textrel);
 #endif
 
        _rtld_add_paths(&_rtld_default_paths, RTLD_DEFAULT_LIBRARY_PATH);



Home | Main Index | Thread Index | Old Index