[llvm-commits] [llvm] r126163 - in /llvm/trunk: lib/CodeGen/TargetLoweringObjectFileImpl.cpp test/CodeGen/X86/non-globl-eh-frame.ll

[Eric Christopher]

Author: echristo
Date: Mon Feb 21 17:52:19 2011
New Revision: 126163

URL: http://llvm.org/viewvc/llvm-project?rev=126163&view=rev
Log:
Revert r125960, it's breaking darwin10 bootstrap.

Removed:
    llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll
Modified:
    llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

Modified: llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp?rev=126163&r1=126162&r2=126163&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp (original)
+++ llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp Mon Feb 21 17:52:19 2011
@@ -441,11 +441,15 @@
 
   Triple T(((LLVMTargetMachine&)TM).getTargetTriple());
   if (T.getOS() == Triple::Darwin) {
-    unsigned MajNum = T.getDarwinMajorNumber();
-    if (MajNum == 7 || MajNum == 8) // 10.3 Panther, 10.4 Tiger
+    switch (T.getDarwinMajorNumber()) {
+    case 7:  // 10.3 Panther.
+    case 8:  // 10.4 Tiger.
       CommDirectiveSupportsAlignment = false;
-    if (MajNum > 9)                 // 10.6 SnowLeopard
-      IsFunctionEHSymbolGlobal = false;
+      break;
+    case 9:   // 10.5 Leopard.
+    case 10:  // 10.6 SnowLeopard.
+      break;
+    }
   }
 
   TargetLoweringObjectFile::Initialize(Ctx, TM);

Removed: llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll?rev=126162&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll (original)
+++ llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll (removed)
@@ -1,24 +0,0 @@
-; RUN: llc < %s -mtriple x86_64-apple-darwin10 -march x86 | not grep {{.globl\[\[:space:\]\]*__Z4funcv.eh}}
-; RUN: llc < %s -mtriple x86_64-apple-darwin9  -march x86 | FileCheck %s -check-prefix=DARWIN9
-
-%struct.__pointer_type_info_pseudo = type { %struct.__type_info_pseudo, i32, %"struct.std::type_info"* }
-%struct.__type_info_pseudo = type { i8*, i8* }
-%"struct.std::type_info" = type opaque
-
- at .str = private constant [12 x i8] c"hello world\00", align 1
- at _ZTIPc = external constant %struct.__pointer_type_info_pseudo
-
-define void @_Z4funcv() noreturn optsize ssp {
-entry:
-  %0 = tail call i8* @__cxa_allocate_exception(i64 8) nounwind
-  %1 = bitcast i8* %0 to i8**
-  store i8* getelementptr inbounds ([12 x i8]* @.str, i64 0, i64 0), i8** %1, align 8
-  tail call void @__cxa_throw(i8* %0, i8* bitcast (%struct.__pointer_type_info_pseudo* @_ZTIPc to i8*), void (i8*)* null) noreturn
-  unreachable
-}
-
-; DARWIN9: .globl __Z4funcv.eh
-
-declare i8* @__cxa_allocate_exception(i64) nounwind
-
-declare void @__cxa_throw(i8*, i8*, void (i8*)*) noreturn