Module Name: src
Committed By: snj
Date: Mon Mar 9 07:56:43 UTC 2015
Modified Files:
src/libexec/ld.elf_so [netbsd-7]: rtld.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #569):
libexec/ld.elf_so/rtld.c: revision 1.175
HPPA hack for a problem where gdb doesn't see _rtld_debug_state when
it's a single bv,n %r0(%rp) instruction.
The nullify confuses something.
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.173.4.1 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.173 src/libexec/ld.elf_so/rtld.c:1.173.4.1
--- src/libexec/ld.elf_so/rtld.c:1.173 Tue Mar 18 16:05:34 2014
+++ src/libexec/ld.elf_so/rtld.c Mon Mar 9 07:56:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.173 2014/03/18 16:05:34 joerg Exp $ */
+/* $NetBSD: rtld.c,v 1.173.4.1 2015/03/09 07:56:43 snj Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.173 2014/03/18 16:05:34 joerg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.173.4.1 2015/03/09 07:56:43 snj Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1420,6 +1420,9 @@ _rtld_error(const char *fmt,...)
void
_rtld_debug_state(void)
{
+#if defined(__hppa__)
+ __asm volatile("nop" ::: "memory");
+#endif
/* Prevent optimizer from removing calls to this function */
__insn_barrier();
