From owner-svn-src-head@FreeBSD.ORG  Tue May 29 20:21:24 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B02ED1065675;
	Tue, 29 May 2012 20:21:24 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B43F8FC16;
	Tue, 29 May 2012 20:21:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4TKLOGB000889;
	Tue, 29 May 2012 20:21:24 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4TKLOrq000887;
	Tue, 29 May 2012 20:21:24 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201205292021.q4TKLOrq000887@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 29 May 2012 20:21:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236258 - head/contrib/llvm/tools/clang/lib/Driver
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 29 May 2012 20:21:24 -0000

Author: dim
Date: Tue May 29 20:21:24 2012
New Revision: 236258
URL: http://svn.freebsd.org/changeset/base/236258

Log:
  For clang, similar to r236137, enable gnu hash generation for dynamic
  ELF binaries on x86.

Modified:
  head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp

Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Tue May 29 20:16:26 2012	(r236257)
+++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Tue May 29 20:21:24 2012	(r236258)
@@ -4760,6 +4760,9 @@ void freebsd::Link::ConstructJob(Compila
       CmdArgs.push_back("-dynamic-linker");
       CmdArgs.push_back("/libexec/ld-elf.so.1");
     }
+    llvm::Triple::ArchType Arch = getToolChain().getArch();
+    if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64)
+      CmdArgs.push_back("--hash-style=both");
   }
 
   // When building 32-bit code on FreeBSD/amd64, we have to explicitly