From owner-svn-src-head@FreeBSD.ORG  Wed May  7 17:21:23 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6A79E8FF;
 Wed,  7 May 2014 17:21:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 582D939E;
 Wed,  7 May 2014 17:21:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47HLN3D088034;
 Wed, 7 May 2014 17:21:23 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47HLNQi088032;
 Wed, 7 May 2014 17:21:23 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201405071721.s47HLNQi088032@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 7 May 2014 17:21:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265578 - head/libexec/rtld-elf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 May 2014 17:21:23 -0000

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();
 }
 
 /*