From owner-svn-src-all@FreeBSD.ORG  Sun Nov  4 11:46:17 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id ECDB5189;
 Sun,  4 Nov 2012 11:46:17 +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 D304F8FC08;
 Sun,  4 Nov 2012 11:46:17 +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 qA4BkHeJ076715;
 Sun, 4 Nov 2012 11:46:17 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4BkHjL076713;
 Sun, 4 Nov 2012 11:46:17 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211041146.qA4BkHjL076713@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 4 Nov 2012 11:46:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r242552 - stable/9/contrib/llvm/tools/clang/lib/Driver
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 11:46:18 -0000

Author: dim
Date: Sun Nov  4 11:46:17 2012
New Revision: 242552
URL: http://svn.freebsd.org/changeset/base/242552

Log:
  MFC r236258:
  
    For clang, similar to r236137, enable gnu hash generation for dynamic
    ELF binaries on x86.
  
  MFC r238863:
  
    Similar to r238472, let clang pass --enable-new-dtags to the linker
    invocation by default.  Also make sure --hash-style=both is passed for
    the same arches as gcc, e.g. arm, sparc and x86.

Modified:
  stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)

Modified: stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sun Nov  4 09:27:01 2012	(r242551)
+++ stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sun Nov  4 11:46:17 2012	(r242552)
@@ -4760,6 +4760,11 @@ 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::arm || Arch == llvm::Triple::sparc ||
+        Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64)
+      CmdArgs.push_back("--hash-style=both");
+    CmdArgs.push_back("--enable-new-dtags");
   }
 
   // When building 32-bit code on FreeBSD/amd64, we have to explicitly