6 files changed, 10 insertions, 135 deletions
diff --git a/clang/test/CodeGenCXX/float128-declarations.cpp b/clang/test/CodeGenCXX/float128-declarations.cpp
deleted file mode 100644
index 638f56fd0d6..00000000000
--- a/clang/test/CodeGenCXX/float128-declarations.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// RUN: %clang_cc1 -emit-llvm -triple powerpc64-unknown-unknown \
-// RUN:   -target-feature +float128 -std=c++11 %s -o - | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -triple powerpc64le-unknown-unknown \
-// RUN:   -target-feature +float128 -std=c++11 %s -o - | FileCheck %s
-//
-/*  Various contexts where type __float128 can appear. */
-
-/*  Namespace */
-namespace {
-  __float128 f1n;
-  __float128 f2n = 33.q;
-  __float128 arr1n[10];
-  __float128 arr2n[] = { 1.2q, 3.0q, 3.e11q };
-  const volatile __float128 func1n(const __float128 &arg) {
-    return arg + f2n + arr1n[4] - arr2n[1];
-  }
-}
-
-/* File */
-__float128 f1f;
-__float128 f2f = 32.4q;
-static __float128 f3f = f2f;
-__float128 arr1f[10];
-__float128 arr2f[] = { -1.2q, -3.0q, -3.e11q };
-__float128 func1f(__float128 arg);
-
-/* Class */
-class C1 {
-  __float128 f1c;
-  static const __float128 f2c;
-  volatile __float128 f3c;
-public:
-  C1(__float128 arg) : f1c(arg), f3c(arg) { }
-  __float128 func1c(__float128 arg ) {
-    return f1c + arg;
-  }
-  static __float128 func2c(__float128 arg) {
-    return arg * C1::f2c;
-  }
-};
-
-/*  Template */
-template <class C> C func1t(C arg) { return arg * 2.q; }
-template <class C> struct S1 {
-  C mem1;
-};
-template <> struct S1<__float128> {
-  __float128 mem2;
-};
-
-/* Local */
-int main(void) {
-  __float128 f1l = 123e220q;
-  __float128 f2l = -0.q;
-  __float128 f3l = 1.189731495357231765085759326628007e4932q;
-  C1 c1(f1l);
-  S1<__float128> s1 = { 132.q };
-  __float128 f4l = func1n(f1l) + func1f(f2l) + c1.func1c(f3l) + c1.func2c(f1l) +
-    func1t(f1l) + s1.mem2 - f1n + f2n;
-#if (__cplusplus >= 201103L)
-  auto f5l = -1.q, *f6l = &f2l, f7l = func1t(f3l);
-#endif
-  __float128 f8l = f4l++;
-  __float128 arr1l[] = { -1.q, -0.q, -11.q };
-}
-// CHECK-DAG: @_ZN12_GLOBAL__N_13f1nE = internal global fp128 0xL00000000000000000000000000000000
-// CHECK-DAG: @_ZN12_GLOBAL__N_13f2nE = internal global fp128 0xL00000000000000004004080000000000
-// CHECK-DAG: @_ZN12_GLOBAL__N_15arr1nE = internal global [10 x fp128]
-// CHECK-DAG: @_ZN12_GLOBAL__N_15arr2nE = internal global [3 x fp128] [fp128 0xL33333333333333333FFF333333333333, fp128 0xL00000000000000004000800000000000, fp128 0xL00000000000000004025176592E00000]
-// CHECK-DAG: define internal fp128 @_ZN12_GLOBAL__N_16func1nERKU10__float128(fp128*
-// CHECK-DAG: @f1f = global fp128 0xL00000000000000000000000000000000
-// CHECK-DAG: @f2f = global fp128 0xL33333333333333334004033333333333
-// CHECK-DAG: @arr1f = global [10 x fp128]
-// CHECK-DAG: @arr2f = global [3 x fp128] [fp128 0xL3333333333333333BFFF333333333333, fp128 0xL0000000000000000C000800000000000, fp128 0xL0000000000000000C025176592E00000]
-// CHECK-DAG: declare fp128 @_Z6func1fU10__float128(fp128)
-// CHECK-DAG: define linkonce_odr void @_ZN2C1C2EU10__float128(%class.C1* %this, fp128 %arg)
-// CHECK-DAG: define linkonce_odr fp128 @_ZN2C16func2cEU10__float128(fp128 %arg)
-// CHECK-DAG: define linkonce_odr fp128 @_Z6func1tIU10__float128ET_S0_(fp128 %arg)
-// CHECK-DAG: @_ZZ4mainE2s1 = private unnamed_addr constant %struct.S1 { fp128 0xL00000000000000004006080000000000 }
-// CHECK-DAG: store fp128 0xLF0AFD0EBFF292DCE42E0B38CDD83F26F, fp128* %f1l, align 16
-// CHECK-DAG: store fp128 0xL00000000000000008000000000000000, fp128* %f2l, align 16
-// CHECK-DAG: store fp128 0xLFFFFFFFFFFFFFFFF7FFEFFFFFFFFFFFF, fp128* %f3l, align 16
-// CHECK-DAG: store fp128 0xL0000000000000000BFFF000000000000, fp128* %f5l, align 16
-// CHECK-DAG: [[F4L:%[a-z0-9]+]] = load fp128, fp128* %f4l
-// CHECK-DAG: [[INC:%[a-z0-9]+]] = fadd fp128 [[F4L]], 0xL00000000000000003FFF000000000000
-// CHECK-DAG: store fp128 [[INC]], fp128* %f4l
diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c
index cc6eecc734e..dbd4de605e5 100644
--- a/clang/test/Preprocessor/init.c
+++ b/clang/test/Preprocessor/init.c
@@ -5819,9 +5819,6 @@
 // PPCPOWER8:#define _ARCH_PWR7 1
 // PPCPOWER8:#define _ARCH_PWR8 1
 //
-// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-none-none -target-feature +float128 -target-cpu power8 -fno-signed-char < /dev/null | FileCheck -check-prefix PPC-FLOAT128 %s
-// PPC-FLOAT128:#define __FLOAT128__ 1
-//
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-unknown-linux-gnu -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-LINUX %s
 //
 // PPC64-LINUX:#define _ARCH_PPC 1
diff --git a/clang/test/Sema/128bitfloat.cpp b/clang/test/Sema/128bitfloat.cpp
index 779c59dfd4a..cb76dac9600 100644
--- a/clang/test/Sema/128bitfloat.cpp
+++ b/clang/test/Sema/128bitfloat.cpp
@@ -2,23 +2,23 @@
 // RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
 
 #if !defined(__STRICT_ANSI__)
-__float128 f;  // expected-error {{__float128 is not supported on this target}}
+__float128 f;  // expected-error {{support for type '__float128' is not yet implemented}}
 // But this should work:
 template<typename> struct __is_floating_point_helper {};
-template<> struct __is_floating_point_helper<__float128> {};  // expected-error {{__float128 is not supported on this target}}
+template<> struct __is_floating_point_helper<__float128> {};
 
 // FIXME: This could have a better diag.
-int g(int x, __float128 *y) {  // expected-error {{__float128 is not supported on this target}}
-  return x + *y;
+void g(int x, __float128 *y) {
+  x + *y;  // expected-error {{invalid operands to binary expression ('int' and '__float128')}}
 }
 
 #else
-__float128 f;  // expected-error {{__float128 is not supported on this target}}
+__float128 f;  // expected-error {{unknown type name '__float128'}}
 template<typename> struct __is_floating_point_helper {};
-template<> struct __is_floating_point_helper<__float128> {};  // expected-error {{__float128 is not supported on this target}}
+template<> struct __is_floating_point_helper<__float128> {};  // expected-error {{use of undeclared identifier '__float128'}}
 
-int g(int x, __float128 *y) {  // expected-error {{__float128 is not supported on this target}}
-  return x + *y;
+void g(int x, __float128 *y) {  // expected-error {{unknown type name '__float128'}}
+  x + *y;
 }
 
 #endif
diff --git a/clang/test/Sema/float128-ld-incompatibility.cpp b/clang/test/Sema/float128-ld-incompatibility.cpp
deleted file mode 100644
index d993ed7b081..00000000000
--- a/clang/test/Sema/float128-ld-incompatibility.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 \
-// RUN: -triple powerpc64le-unknown-linux-gnu -target-cpu pwr8 \
-// RUN: -target-feature +float128 %s
-
-__float128 qf();
-long double ldf();
-
-// FIXME: once operations between long double and __float128 are implemented for
-//        targets where the types are different, these next two will change
-long double ld{qf()}; // expected-error {{cannot initialize a variable of type 'long double' with an rvalue of type '__float128'}}
-__float128 q{ldf()};  // expected-error {{cannot initialize a variable of type '__float128' with an rvalue of type 'long double'}}
-
-auto test1(__float128 q, long double ld) -> decltype(q + ld) { // expected-error {{invalid operands to binary expression ('__float128' and 'long double')}}
-  return q + ld;      // expected-error {{invalid operands to binary expression ('__float128' and 'long double')}}
-}
-
-auto test2(long double a, __float128 b) -> decltype(a + b) { // expected-error {{invalid operands to binary expression ('long double' and '__float128')}}
-  return a + b;      // expected-error {{invalid operands to binary expression ('long double' and '__float128')}}
-}
-
-void test3(bool b) {
-  long double ld;
-  __float128 q;
-
-  ld + q; // expected-error {{invalid operands to binary expression ('long double' and '__float128')}}
-  q + ld; // expected-error {{invalid operands to binary expression ('__float128' and 'long double')}}
-  ld - q; // expected-error {{invalid operands to binary expression ('long double' and '__float128')}}
-  q - ld; // expected-error {{invalid operands to binary expression ('__float128' and 'long double')}}
-  ld * q; // expected-error {{invalid operands to binary expression ('long double' and '__float128')}}
-  q * ld; // expected-error {{invalid operands to binary expression ('__float128' and 'long double')}}
-  ld / q; // expected-error {{invalid operands to binary expression ('long double' and '__float128')}}
-  q / ld; // expected-error {{invalid operands to binary expression ('__float128' and 'long double')}}
-  ld = q; // expected-error {{assigning to 'long double' from incompatible type '__float128'}}
-  q = ld; // expected-error {{assigning to '__float128' from incompatible type 'long double'}}
-  q + b ? q : ld; // expected-error {{incompatible operand types ('__float128' and 'long double')}}
-}
diff --git a/clang/test/SemaCXX/deleted-operator.cpp b/clang/test/SemaCXX/deleted-operator.cpp
index f71e83aa258..df67978a36d 100644
--- a/clang/test/SemaCXX/deleted-operator.cpp
+++ b/clang/test/SemaCXX/deleted-operator.cpp
@@ -9,7 +9,7 @@ int PR10757f() {
   PR10757 a1;
   // FIXME: We get a ridiculous number of "built-in candidate" notes here...
   if(~a1) {} // expected-error {{overload resolution selected deleted operator}} expected-note 8 {{built-in candidate}}
-  if(a1==a1) {} // expected-error {{overload resolution selected deleted operator}} expected-note 144 {{built-in candidate}}
+  if(a1==a1) {} // expected-error {{overload resolution selected deleted operator}} expected-note 121 {{built-in candidate}}
 }
 
 struct DelOpDel {
diff --git a/clang/test/SemaCXX/overloaded-builtin-operators.cpp b/clang/test/SemaCXX/overloaded-builtin-operators.cpp
index 7a99a898e20..4c2953b0b3f 100644
--- a/clang/test/SemaCXX/overloaded-builtin-operators.cpp
+++ b/clang/test/SemaCXX/overloaded-builtin-operators.cpp
@@ -183,7 +183,7 @@ void test_dr425(A a) {
   // FIXME: lots of candidates here!
   (void)(1.0f * a); // expected-error{{ambiguous}} \
                     // expected-note 4{{candidate}} \
-                    // expected-note {{remaining 140 candidates omitted; pass -fshow-overloads=all to show them}}
+                    // expected-note {{remaining 117 candidates omitted; pass -fshow-overloads=all to show them}}
 }
 
 // pr5432