From owner-svn-src-all@FreeBSD.ORG  Fri Nov  9 18:56:28 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 265E1668;
 Fri,  9 Nov 2012 18:56:28 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0CBC88FC0A;
 Fri,  9 Nov 2012 18:56:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9IuRqL035170;
 Fri, 9 Nov 2012 18:56:27 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9IuRxX035169;
 Fri, 9 Nov 2012 18:56:27 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211091856.qA9IuRxX035169@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 9 Nov 2012 18:56:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242835 - head/contrib/llvm/lib/Target/X86
X-SVN-Group: head
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: Fri, 09 Nov 2012 18:56:28 -0000

Author: dim
Date: Fri Nov  9 18:56:27 2012
New Revision: 242835
URL: http://svnweb.freebsd.org/changeset/base/242835

Log:
  Reduce LLVM's default stack alignment for i386 from 16 to 4 bytes, as
  the FreeBSD ABI requires.  This is essentially a revert of upstream llvm
  commit r126226, and it will be reverted by upstream too.
  
  MFC after:	1 week

Modified:
  head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp

Modified: head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp	Fri Nov  9 18:23:38 2012	(r242834)
+++ head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp	Fri Nov  9 18:56:27 2012	(r242835)
@@ -416,12 +416,12 @@ X86Subtarget::X86Subtarget(const std::st
   assert((!In64BitMode || HasX86_64) &&
          "64-bit code requested on a subtarget that doesn't support it!");
 
-  // Stack alignment is 16 bytes on Darwin, FreeBSD, Linux and Solaris (both
-  // 32 and 64 bit) and for all 64-bit targets.
+  // Stack alignment is 16 bytes on Darwin, Linux and Solaris (both 32 and 64
+  // bit) and for all 64-bit targets.
   if (StackAlignOverride)
     stackAlignment = StackAlignOverride;
-  else if (isTargetDarwin() || isTargetFreeBSD() || isTargetLinux() ||
-           isTargetSolaris() || In64BitMode)
+  else if (isTargetDarwin() || isTargetLinux() || isTargetSolaris() ||
+           In64BitMode)
     stackAlignment = 16;
 }