From owner-svn-src-stable-9@FreeBSD.ORG  Sat Nov 17 22:50:51 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 53AF26A;
 Sat, 17 Nov 2012 22:50:51 +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 382558FC15;
 Sat, 17 Nov 2012 22:50:51 +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 qAHMopp3000122;
 Sat, 17 Nov 2012 22:50:51 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHMoppF000120;
 Sat, 17 Nov 2012 22:50:51 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211172250.qAHMoppF000120@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 17 Nov 2012 22:50:51 +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: r243191 - stable/9/contrib/llvm/lib/Target/X86
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 22:50:51 -0000

Author: dim
Date: Sat Nov 17 22:50:50 2012
New Revision: 243191
URL: http://svnweb.freebsd.org/changeset/base/243191

Log:
  MFC r242835:
  
  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.

Modified:
  stable/9/contrib/llvm/lib/Target/X86/X86Subtarget.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)

Modified: stable/9/contrib/llvm/lib/Target/X86/X86Subtarget.cpp
==============================================================================
--- stable/9/contrib/llvm/lib/Target/X86/X86Subtarget.cpp	Sat Nov 17 22:40:18 2012	(r243190)
+++ stable/9/contrib/llvm/lib/Target/X86/X86Subtarget.cpp	Sat Nov 17 22:50:50 2012	(r243191)
@@ -411,12 +411,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;
 }