diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-11-14 16:47:45 -0800 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-11-15 10:12:39 -0800 |
| commit | 923f52fb3f6670e843ffe0b8da2f2bad898d752c (patch) | |
| tree | a279587ac525162817217dbbe0f01a91893a9d0b /lib/Target/X86/X86Subtarget.cpp | |
| parent | f4099a3c92570a80cd9a3850cda598c5ea446b96 (diff) | |
| parent | 08e9cb46feb0c8e08e3d309a0f9fd75a04ca54fb (diff) | |
Merge commit '08e9cb46feb0c8e08e3d309a0f9fd75a04ca54fb'
(svn r167699, also the 3.2 branch point)
Conflicts:
lib/Target/X86/X86Subtarget.cpp
Diffstat (limited to 'lib/Target/X86/X86Subtarget.cpp')
| -rw-r--r-- | lib/Target/X86/X86Subtarget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp index 31be6b7a7b..0132f81410 100644 --- a/lib/Target/X86/X86Subtarget.cpp +++ b/lib/Target/X86/X86Subtarget.cpp @@ -423,12 +423,11 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU, 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, Solaris (both + // Stack alignment is 16 bytes on Darwin, Linux and Solaris (both // 32 and 64 bit), NaCl and for all 64-bit targets. if (StackAlignOverride) stackAlignment = StackAlignOverride; - else if (isTargetDarwin() || isTargetFreeBSD() || isTargetLinux() || - isTargetSolaris() || + else if (isTargetDarwin() || isTargetLinux() || isTargetSolaris() || isTargetNaCl() || // @LOCALMOD In64BitMode) stackAlignment = 16; |