From 9b48fef478a916c5ff1f6ed3751f36fa3050c194 Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@apple.com>
Date: Mon, 21 Feb 2011 23:52:19 +0000
Subject: [PATCH] Revert r125960, it's breaking darwin10 bootstrap.

llvm-svn: 126163
---
 .../CodeGen/TargetLoweringObjectFileImpl.cpp  | 12 ++++++----
 llvm/test/CodeGen/X86/non-globl-eh-frame.ll   | 24 -------------------
 2 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 llvm/test/CodeGen/X86/non-globl-eh-frame.ll

diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index 3b01bfdd6944..e4d9ee02e7ca 100644
--- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -441,11 +441,15 @@ void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx,
 
   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);
diff --git a/llvm/test/CodeGen/X86/non-globl-eh-frame.ll b/llvm/test/CodeGen/X86/non-globl-eh-frame.ll
deleted file mode 100644
index 71349ecafeb6..000000000000
--- a/llvm/test/CodeGen/X86/non-globl-eh-frame.ll
+++ /dev/null
@@ -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
-
-@.str = private constant [12 x i8] c"hello world\00", align 1
-@_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
-- 
GitLab