From owner-svn-src-head@FreeBSD.ORG  Sun May 22 16:32:45 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 44F29106566C;
	Sun, 22 May 2011 16:32:45 +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 36CCF8FC12;
	Sun, 22 May 2011 16:32:45 +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 p4MGWj9k081827;
	Sun, 22 May 2011 16:32:45 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4MGWjUb081825;
	Sun, 22 May 2011 16:32:45 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201105221632.p4MGWjUb081825@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 22 May 2011 16:32:45 +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: r222183 - head/lib/clang
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: Sun, 22 May 2011 16:32:45 -0000

Author: dim
Date: Sun May 22 16:32:44 2011
New Revision: 222183
URL: http://svn.freebsd.org/changeset/base/222183

Log:
  On amd64, change clang's default triple to 'x86_64-unknown-freebsd9.0',
  similar to what we do for binutils.  When clang's default triple starts
  with 'amd64-', it does not pass a proper -target-cpu option to its
  first stage.
  
  This can lead to problems, for example when structs are memcpy'd, and
  clang erroneously assumes they are 16-byte aligned.  It will then use
  the 'movaps' SSE instruction to implement the copy, which results in a
  bus error if the struct is really 8-byte aligned.
  
  I encountered this issue when gcc's /usr/libexec/cc1 started crashing
  with SIGBUS, after rebuilding world with clang ToT, but it also affects
  the version of clang that we have in the tree.  We were just lucky until
  now, apparently. :)

Modified:
  head/lib/clang/clang.build.mk

Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk	Sun May 22 15:24:56 2011	(r222182)
+++ head/lib/clang/clang.build.mk	Sun May 22 16:32:44 2011	(r222183)
@@ -15,7 +15,7 @@ CFLAGS+= -O1
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 # XXX: 8.0, to keep __FreeBSD_cc_version happy
-CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\"
+CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH:C/amd64/x86_64/}-unknown-freebsd9.0\"
 
 .ifndef LLVM_REQUIRES_EH
 CXXFLAGS+=-fno-exceptions