Thu Jun 8 18:24:39 2017 UTC ()

Call _rtld_debug_state before running the global initialisers, so give
gdb a chance to set break points etc.


(joerg)

diff -r1.183 -r1.184 src/libexec/ld.elf_so/rtld.c

--- src/libexec/ld.elf_so/rtld.c 2017/02/27 20:25:26	1.183
+++ src/libexec/ld.elf_so/rtld.c 2017/06/08 18:24:39	1.184

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.c,v 1.183 2017/02/27 20:25:26 chs Exp $	 */
+/*	$NetBSD: rtld.c,v 1.184 2017/06/08 18:24:39 joerg Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.183 2017/02/27 20:25:26 chs Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.184 2017/06/08 18:24:39 joerg Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/mman.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <lwp.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -723,43 +723,43 @@ _rtld(Elf_Addr *sp, Elf_Addr relocbase)
 			(*real___progname) = NULL;
+		}
+	}
 	real_environ = _rtld_objmain_sym("environ");
 	if (real_environ)
 		*real_environ = environ;
 	/*
 	 * Set __mainprog_obj for old binaries.
 	 */
 	real___mainprog_obj = _rtld_objmain_sym("__mainprog_obj");
 	if (real___mainprog_obj)
 		*real___mainprog_obj = _rtld_objmain;
 	_rtld_debug_state();	/* say hello to gdb! */
 	_rtld_exclusive_enter(&mask);
 	dbg(("calling _init functions"));
 	_rtld_call_init_functions(&mask);
 	dbg(("control at program entry point = %p, obj = %p, exit = %p",
 	     _rtld_objmain->entry, _rtld_objmain, _rtld_exit));
 	_rtld_exclusive_exit(&mask);
 	/*
 	 * Return with the entry point and the exit procedure in at the top
 	 * of stack.
 	 */
 	_rtld_debug_state();	/* say hello to gdb! */
 	((void **) osp)[0] = _rtld_exit;
 	((void **) osp)[1] = _rtld_objmain;
 	return (Elf_Addr) _rtld_objmain->entry;
+}
 void
 _rtld_die(void)
+{
 	const char *msg = dlerror();
 	if (msg == NULL)
 		msg = "Fatal error";
 	xerrx(1, "%s", msg);