8 files changed, 6 insertions, 16 deletions
diff --git a/clang/include/clang/Basic/LangOptions.h b/clang/include/clang/Basic/LangOptions.h
index 1dab6154292..d4d3fe50eba 100644
--- a/clang/include/clang/Basic/LangOptions.h
+++ b/clang/include/clang/Basic/LangOptions.h
@@ -88,7 +88,6 @@ public:
 
   unsigned ElideConstructors : 1; // Whether C++ copy constructors should be
                                   // elided if possible.
-  unsigned ObjCNewGCAPI : 1;      // Generate objective-c's new GC API
 private:
   unsigned GC : 2;                // Objective-C Garbage Collection modes.  We
                                   // declare this enum as unsigned because MSVC
@@ -147,7 +146,6 @@ public:
 
     OverflowChecking = 0;
     ObjCGCBitmapPrint = 0;
-    ObjCNewGCAPI = 1;
 
     InstantiationDepth = 99;
 
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 157369d7545..2539387e967 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -691,8 +691,7 @@ void CodeGenFunction::EmitStoreThroughExtVectorComponentLValue(RValue Src,
 // or neither.
 static
 void setObjCGCLValueClass(const ASTContext &Ctx, const Expr *E, LValue &LV) {
-  if (Ctx.getLangOptions().getGCMode() == LangOptions::NonGC ||
-      !Ctx.getLangOptions().ObjCNewGCAPI)
+  if (Ctx.getLangOptions().getGCMode() == LangOptions::NonGC)
     return;
   
   if (isa<ObjCIvarRefExpr>(E)) {
diff --git a/clang/test/CodeGenObjC/objc-assign-ivar.m b/clang/test/CodeGenObjC/objc-assign-ivar.m
index 0e8478b4457..f79faaf2382 100644
--- a/clang/test/CodeGenObjC/objc-assign-ivar.m
+++ b/clang/test/CodeGenObjC/objc-assign-ivar.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fobjc-gc -fobjc-newgc-api -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o %t %s &&
 // RUN: grep -F '@objc_assign_ivar' %t  | count 14 &&
 // RUN: true
 
diff --git a/clang/test/CodeGenObjC/objc2-assign-global.m b/clang/test/CodeGenObjC/objc2-assign-global.m
index 2d863817e8e..9b6b4151f6a 100644
--- a/clang/test/CodeGenObjC/objc2-assign-global.m
+++ b/clang/test/CodeGenObjC/objc2-assign-global.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -fobjc-newgc-api -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -emit-llvm -o %t %s &&
 // RUN: grep -F '@objc_assign_global' %t  | count 26 &&
 // RUN: true
 
diff --git a/clang/test/CodeGenObjC/objc2-new-gc-api-strongcast.m b/clang/test/CodeGenObjC/objc2-new-gc-api-strongcast.m
index eb74317d8fa..6a1aea6a734 100644
--- a/clang/test/CodeGenObjC/objc2-new-gc-api-strongcast.m
+++ b/clang/test/CodeGenObjC/objc2-new-gc-api-strongcast.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fblocks -fnext-runtime -fobjc-gc -fobjc-newgc-api -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fblocks -fnext-runtime -fobjc-gc -emit-llvm -o %t %s &&
 // RUN: grep -F '@objc_assign_strongCast' %t  | count 4 &&
 // RUN: true
 
diff --git a/clang/test/CodeGenObjC/objc2-write-barrier-2.m b/clang/test/CodeGenObjC/objc2-write-barrier-2.m
index 7c9334e5865..c47224f1c51 100644
--- a/clang/test/CodeGenObjC/objc2-write-barrier-2.m
+++ b/clang/test/CodeGenObjC/objc2-write-barrier-2.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -fobjc-newgc-api -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -emit-llvm -o %t %s &&
 // RUN: grep -F '@objc_assign_global' %t  | count 7 &&
 // RUN: grep -F '@objc_assign_ivar' %t  | count 5 &&
 // RUN: grep -F '@objc_assign_strongCast' %t  | count 8 &&
diff --git a/clang/test/CodeGenObjC/objc2-write-barrier.m b/clang/test/CodeGenObjC/objc2-write-barrier.m
index 3e0971640c8..53fa10a7a75 100644
--- a/clang/test/CodeGenObjC/objc2-write-barrier.m
+++ b/clang/test/CodeGenObjC/objc2-write-barrier.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -fobjc-newgc-api -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -emit-llvm -o %t %s &&
 // RUN: grep -F '@objc_assign_global' %t  | count 21 &&
 // RUN: grep -F '@objc_assign_ivar' %t  | count 11 &&
 // RUN: true
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index 3e7c0262709..8639eb56e0a 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -381,10 +381,6 @@ ObjCEnableGC("fobjc-gc",
              llvm::cl::desc("Enable Objective-C garbage collection"));
 
 static llvm::cl::opt<bool>
-ObjCEnableNewGCAPI("fobjc-newgc-api",
-             llvm::cl::desc("Enable Objective-C garbage collection's new API"));
-
-static llvm::cl::opt<bool>
 ObjCEnableGCBitmapPrint("print-ivar-layout",
              llvm::cl::desc("Enable Objective-C Ivar layout bitmap print trace"));
 
@@ -502,9 +498,6 @@ static void InitializeLangOptions(LangOptions &Options, LangKind LK){
   else if (ObjCEnableGC)
     Options.setGCMode(LangOptions::HybridGC);
 
-  if (ObjCEnableNewGCAPI)
-    Options.ObjCNewGCAPI = 1;
-
   if (ObjCEnableGCBitmapPrint)
     Options.ObjCGCBitmapPrint = 1;