svn commit: r265578 - head/libexec/rtld-elf

[Mark Johnston]

Author: markj
Date: Wed May  7 17:21:22 2014
New Revision: 265578
URL: http://svnweb.freebsd.org/changeset/base/265578

Log:
  - Export the function added in r265456 rather than the non-existent
    _rtld_debug_postinit(). [1]
  - Use __compiler_membar() instead of inline asm in _r_debug_state() and
    _r_debug_postinit(). [2]
  
  Pointy hat to:	markj [1]
  Reported by:	attilio [2]
  Discussed with:	kib
  X-MFC-With:	r265456

Modified:
  head/libexec/rtld-elf/Symbol.map
  head/libexec/rtld-elf/rtld.c

Modified: head/libexec/rtld-elf/Symbol.map
==============================================================================
--- head/libexec/rtld-elf/Symbol.map	Wed May  7 17:20:15 2014	(r265577)
+++ head/libexec/rtld-elf/Symbol.map	Wed May  7 17:21:22 2014	(r265578)
@@ -30,5 +30,5 @@ FBSDprivate_1.0 {
     _rtld_atfork_post;
     _rtld_addr_phdr;
     _rtld_get_stack_prot;
-    _rtld_debug_postinit;
+    _r_debug_postinit;
 };

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Wed May  7 17:20:15 2014	(r265577)
+++ head/libexec/rtld-elf/rtld.c	Wed May  7 17:21:22 2014	(r265578)
@@ -3551,7 +3551,7 @@ r_debug_state(struct r_debug* rd, struct
      * even when marked __noinline.  However, gdb depends on those
      * calls being made.
      */
-    __asm __volatile("" : : : "memory");
+    __compiler_membar();
 }
 
 /*
@@ -3564,7 +3564,7 @@ _r_debug_postinit(struct link_map *m)
 {
 
 	/* See r_debug_state(). */
-	__asm __volatile("" : : : "memory");
+	__compiler_membar();
 }
 
 /*