Revert "Recommit r324107."

This reverts commit r324500.

The bots found two failures:

    ThreadSanitizer-x86_64 :: Linux/pie_no_aslr.cc
    ThreadSanitizer-x86_64 :: pie_test.cc

when using gold. The issue is a limitation in gold when building pie
binaries. I will investigate how to work around it.

llvm-svn: 324505

16 files changed, 113 insertions, 234 deletions

diff --git a/clang/test/CodeGen/dso-local-executable.c b/clang/test/CodeGen/dso-local-executable.c
deleted file mode 100644
index 2fbdb0773d0..00000000000
--- a/clang/test/CodeGen/dso-local-executable.c
+++ /dev/null
@@ -1,59 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-pc-linux -emit-llvm -mrelocation-model static %s -o - | FileCheck --check-prefix=STATIC %s
-// STATIC-DAG: @bar = external dso_local global i32
-// STATIC-DAG: @weak_bar = extern_weak dso_local global i32
-// STATIC-DAG: declare dso_local void @foo()
-// STATIC-DAG: @baz = dso_local global i32 42
-// STATIC-DAG: define dso_local i32* @zed()
-
-// RUN: %clang_cc1 -triple x86_64-pc-linux -emit-llvm -pic-is-pie -mpie-copy-relocations %s -o - | FileCheck --check-prefix=PIE-COPY %s
-// PIE-COPY-DAG: @bar = external dso_local global i32
-// PIE-COPY-DAG: @weak_bar = extern_weak global i32
-// PIE-COPY-DAG: declare dso_local void @foo()
-// PIE-COPY-DAG: @baz = dso_local global i32 42
-// PIE-COPY-DAG: define dso_local i32* @zed()
-
-// RUN: %clang_cc1 -triple x86_64-pc-linux -emit-llvm -pic-is-pie %s -o - | FileCheck --check-prefix=PIE %s
-// PIE-DAG: @bar = external global i32
-// PIE-DAG: @weak_bar = extern_weak global i32
-// PIE-DAG: declare dso_local void @foo()
-// PIE-DAG: @baz = dso_local global i32 42
-// PIE-DAG: define dso_local i32* @zed()
-
-// RUN: %clang_cc1 -triple x86_64-pc-linux -emit-llvm -mrelocation-model static -fno-plt %s -o - | FileCheck --check-prefix=NOPLT %s
-// NOPLT-DAG: @bar = external dso_local global i32
-// NOPLT-DAG: @weak_bar = extern_weak dso_local global i32
-// NOPLT-DAG: declare void @foo()
-// NOPLT-DAG: @baz = dso_local global i32 42
-// NOPLT-DAG: define dso_local i32* @zed()
-
-// RUN: %clang_cc1 -triple x86_64-pc-linux -emit-llvm -fno-plt -pic-is-pie -mpie-copy-relocations %s -o - | FileCheck --check-prefix=PIE-COPY-NOPLT %s
-// PIE-COPY-NOPLT-DAG: @bar = external dso_local global i32
-// PIE-COPY-NOPLT-DAG: @weak_bar = extern_weak global i32
-// PIE-COPY-NOPLT-DAG: declare void @foo()
-// PIE-COPY-NOPLT-DAG: @baz = dso_local global i32 42
-// PIE-COPY-NOPLT-DAG: define dso_local i32* @zed()
-
-// RUN: %clang_cc1 -triple x86_64-pc-linux -emit-llvm -pic-is-pie -fno-plt %s -o - | FileCheck --check-prefix=PIE-NO-PLT %s
-// RUN: %clang_cc1 -triple powerpc64le-pc-linux -emit-llvm -mrelocation-model static %s -o - | FileCheck --check-prefix=PIE-NO-PLT %s
-// PIE-NO-PLT-DAG: @bar = external global i32
-// PIE-NO-PLT-DAG: @weak_bar = extern_weak global i32
-// PIE-NO-PLT-DAG: declare void @foo()
-// PIE-NO-PLT-DAG: @baz = dso_local global i32 42
-// PIE-NO-PLT-DAG: define dso_local i32* @zed()
-
-// RUN: %clang_cc1 -triple x86_64-pc-linux -emit-llvm %s -o - | FileCheck --check-prefix=SHARED %s
-// SHARED-DAG: @bar = external global i32
-// SHARED-DAG: @weak_bar = extern_weak global i32
-// SHARED-DAG: declare void @foo()
-// SHARED-DAG: @baz = global i32 42
-// SHARED-DAG: define i32* @zed()
-
-extern int bar;
-__attribute__((weak)) extern int weak_bar;
-void foo(void);
-
-int baz = 42;
-int *zed() {
-  foo();
-  return baz ? &weak_bar : &bar;
-}
diff --git a/clang/test/CodeGen/mbackchain-2.c b/clang/test/CodeGen/mbackchain-2.c
index bea46d24826..e76afaf7687 100644
--- a/clang/test/CodeGen/mbackchain-2.c
+++ b/clang/test/CodeGen/mbackchain-2.c
@@ -1,6 +1,6 @@
 // RUN: %clang -mbackchain --target=s390x-linux -S -emit-llvm -o - %s | FileCheck %s
 
-// CHECK: define dso_local void @foo() [[NUW:#[0-9]+]]
+// CHECK: define void @foo() [[NUW:#[0-9]+]]
 void foo(void) {
 }
 
diff --git a/clang/test/CodeGen/mbackchain-3.c b/clang/test/CodeGen/mbackchain-3.c
index 5ff0e167610..b115861f5e0 100644
--- a/clang/test/CodeGen/mbackchain-3.c
+++ b/clang/test/CodeGen/mbackchain-3.c
@@ -1,6 +1,6 @@
 // RUN: %clang -mno-backchain --target=s390x-linux -S -emit-llvm -o - %s | FileCheck %s
 
-// CHECK: define dso_local void @foo() [[NUW:#[0-9]+]]
+// CHECK: define void @foo() [[NUW:#[0-9]+]]
 void foo(void) {
 }
 
diff --git a/clang/test/CodeGen/mips-vector-return.c b/clang/test/CodeGen/mips-vector-return.c
index dd3c400c019..8af4998cdf7 100644
--- a/clang/test/CodeGen/mips-vector-return.c
+++ b/clang/test/CodeGen/mips-vector-return.c
@@ -8,13 +8,13 @@ typedef float  v4sf __attribute__ ((__vector_size__ (16)));
 typedef double v4df __attribute__ ((__vector_size__ (32)));
 typedef int v4i32 __attribute__ ((__vector_size__ (16)));
 
-// O32-LABEL: define dso_local void @test_v4sf(<4 x float>* noalias nocapture sret
+// O32-LABEL: define void @test_v4sf(<4 x float>* noalias nocapture sret
 // N64: define inreg { i64, i64 } @test_v4sf
 v4sf test_v4sf(float a) {
   return (v4sf){0.0f, a, 0.0f, 0.0f};
 }
 
-// O32-LABEL: define dso_local void @test_v4df(<4 x double>* noalias nocapture sret
+// O32-LABEL: define void @test_v4df(<4 x double>* noalias nocapture sret
 // N64-LABEL: define void @test_v4df(<4 x double>* noalias nocapture sret
 v4df test_v4df(double a) {
   return (v4df){0.0, a, 0.0, 0.0};
@@ -23,7 +23,7 @@ v4df test_v4df(double a) {
 // O32 returns integer vectors whose size is equal to or smaller than 16-bytes
 // in integer registers.
 //
-// O32: define dso_local inreg { i32, i32, i32, i32 } @test_v4i32
+// O32: define inreg { i32, i32, i32, i32 } @test_v4i32
 // N64: define inreg { i64, i64 } @test_v4i32
 v4i32 test_v4i32(int a) {
   return (v4i32){0, a, 0, 0};
diff --git a/clang/test/CodeGen/split-stacks.c b/clang/test/CodeGen/split-stacks.c
index d9ff1f955d2..bf4cf0f026a 100644
--- a/clang/test/CodeGen/split-stacks.c
+++ b/clang/test/CodeGen/split-stacks.c
@@ -14,13 +14,13 @@ int main() {
   return foo();
 }
 
-// CHECK-SEGSTK: define dso_local i32 @foo() [[SS:#[0-9]+]] {
-// CHECK-SEGSTK: define dso_local i32 @nosplit() [[NSS:#[0-9]+]] {
-// CHECK-SEGSTK: define dso_local i32 @main() [[SS]] {
+// CHECK-SEGSTK: define i32 @foo() [[SS:#[0-9]+]] {
+// CHECK-SEGSTK: define i32 @nosplit() [[NSS:#[0-9]+]] {
+// CHECK-SEGSTK: define i32 @main() [[SS]] {
 // CHECK-SEGSTK-NOT: [[NSS]] = { {{.*}} "split-stack" {{.*}} }
 // CHECK-SEGSTK: [[SS]] = { {{.*}} "split-stack" {{.*}} }
 // CHECK-SEGSTK-NOT: [[NSS]] = { {{.*}} "split-stack" {{.*}} }
 
-// CHECK-NOSEGSTK: define dso_local i32 @foo() #0 {
-// CHECK-NOSEGSTK: define dso_local i32 @main() #0 {
+// CHECK-NOSEGSTK: define i32 @foo() #0 {
+// CHECK-NOSEGSTK: define i32 @main() #0 {
 // CHECK-NOSEGSTK-NOT: #0 = { {{.*}} "split-stack" {{.*}} }
diff --git a/clang/test/CodeGenCXX/debug-info-static-member.cpp b/clang/test/CodeGenCXX/debug-info-static-member.cpp
index 702d1f87e75..3537754ced7 100644
--- a/clang/test/CodeGenCXX/debug-info-static-member.cpp
+++ b/clang/test/CodeGenCXX/debug-info-static-member.cpp
@@ -3,9 +3,9 @@
 // RUN: %clangxx -target x86_64-unknown-unknown -g -std=c++11 %s -emit-llvm -S -o - | FileCheck %s
 // PR14471
 
-// CHECK: @_ZN1C1aE = dso_local global i32 4, align 4, !dbg [[A:![0-9]+]]
-// CHECK: @_ZN1C1bE = dso_local global i32 2, align 4, !dbg [[B:![0-9]+]]
-// CHECK: @_ZN1C1cE = dso_local global i32 1, align 4, !dbg [[C:![0-9]+]]
+// CHECK: @_ZN1C1aE = global i32 4, align 4, !dbg [[A:![0-9]+]]
+// CHECK: @_ZN1C1bE = global i32 2, align 4, !dbg [[B:![0-9]+]]
+// CHECK: @_ZN1C1cE = global i32 1, align 4, !dbg [[C:![0-9]+]]
 
 enum X {
   Y
diff --git a/clang/test/CodeGenCXX/debug-info-template.cpp b/clang/test/CodeGenCXX/debug-info-template.cpp
index 4b330a0b0a1..0c341451621 100644
--- a/clang/test/CodeGenCXX/debug-info-template.cpp
+++ b/clang/test/CodeGenCXX/debug-info-template.cpp
@@ -1,8 +1,8 @@
 // RUN: %clang -S -emit-llvm -target x86_64-unknown_unknown -g %s -o - -std=c++11 | FileCheck %s
 
-// CHECK: @tci = dso_local global %"struct.TC<unsigned int, 2, &glb, &foo::e, &foo::f, &foo::g, 1, 2, 3>::nested" zeroinitializer, align 1, !dbg [[TCI:![0-9]+]]
-// CHECK: @tcn = dso_local global %struct.TC zeroinitializer, align 1, !dbg [[TCN:![0-9]+]]
-// CHECK: @nn = dso_local global %struct.NN zeroinitializer, align 1, !dbg [[NN:![0-9]+]]
+// CHECK: @tci = global %"struct.TC<unsigned int, 2, &glb, &foo::e, &foo::f, &foo::g, 1, 2, 3>::nested" zeroinitializer, align 1, !dbg [[TCI:![0-9]+]]
+// CHECK: @tcn = global %struct.TC zeroinitializer, align 1, !dbg [[TCN:![0-9]+]]
+// CHECK: @nn = global %struct.NN zeroinitializer, align 1, !dbg [[NN:![0-9]+]]
 
 // CHECK: !DICompileUnit(
 // CHECK: [[EMPTY:![0-9]*]] = !{}
diff --git a/clang/test/CodeGenCXX/dso-local-executable.cpp b/clang/test/CodeGenCXX/dso-local-executable.cpp
deleted file mode 100644
index cc8d50f09c9..00000000000
--- a/clang/test/CodeGenCXX/dso-local-executable.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-pc-linux -mrelocation-model static -O1 -emit-llvm %s -o - | FileCheck --check-prefix=STATIC %s
-// RUN: %clang_cc1 -triple x86_64-pc-linux -mrelocation-model static -fno-plt -O1 -emit-llvm %s -o - | FileCheck --check-prefix=NOPLT %s
-
-// STATIC-DAG: @_ZTV1C = linkonce_odr dso_local unnamed_addr constant
-// STATIC-DAG: @_ZTS1C = linkonce_odr dso_local constant
-// STATIC-DAG: @_ZTI1C = linkonce_odr dso_local constant
-// STATIC-DAG: @_ZZ14useStaticLocalvE3obj = linkonce_odr dso_local global
-// STATIC-DAG: @_ZGVZN5guard1gEvE1a = linkonce_odr dso_local global
-// STATIC-DAG: define dso_local void @_ZN1CC2Ev(
-// STATIC-DAG: define dso_local void @_ZN1CC1Ev(
-// STATIC-DAG: define linkonce_odr dso_local void @_ZN1C3fooEv(
-
-// NOPLT-DAG: @_ZTV1C = linkonce_odr dso_local unnamed_addr constant
-// NOPLT-DAG: @_ZTS1C = linkonce_odr dso_local constant
-// NOPLT-DAG: @_ZTI1C = linkonce_odr dso_local constant
-// NOPLT-DAG: @_ZZ14useStaticLocalvE3obj = linkonce_odr dso_local global
-// NOPLT-DAG: @_ZGVZN5guard1gEvE1a = linkonce_odr dso_local global
-// NOPLT-DAG: define dso_local void @_ZN1CC2Ev(
-// NOPLT-DAG: define dso_local void @_ZN1CC1Ev(
-// NOPLT-DAG: define linkonce_odr dso_local void @_ZN1C3fooEv(
-
-struct C {
-  C();
-  virtual void foo() {}
-};
-C::C() {}
-
-struct HasVTable {
-  virtual void f();
-};
-inline HasVTable &useStaticLocal() {
-  static HasVTable obj;
-  return obj;
-}
-void useit() {
-  useStaticLocal();
-}
-
-namespace guard {
-int f();
-inline int g() {
-  static int a = f();
-  return a;
-}
-int h() {
-  return g();
-}
-} // namespace guard
-
-
-// STATIC-DAG: define available_externally dso_local void @_ZN5test23barIcEC1Ev(
-// NOPLT-DAG: define available_externally void @_ZN5test23barIcEC1Ev(
-namespace test2 {
-void foo();
-template <typename T>
-struct bar {
-  virtual void zed();
-  bar() { foo(); }
-};
-extern template class bar<char>;
-bar<char> abc;
-} // namespace test2
diff --git a/clang/test/CodeGenCXX/float16-declarations.cpp b/clang/test/CodeGenCXX/float16-declarations.cpp
index e82c05ec8c8..e0d62b71c4c 100644
--- a/clang/test/CodeGenCXX/float16-declarations.cpp
+++ b/clang/test/CodeGenCXX/float16-declarations.cpp
@@ -29,18 +29,18 @@ namespace {
 /* File */
 
 _Float16 f1f;
-// CHECK-AARCH64-DAG: @f1f = dso_local global half 0xH0000, align 2
-// CHECK-X86-DAG: @f1f = dso_local global half 0xH0000, align 2
+// CHECK-AARCH64-DAG: @f1f = global half 0xH0000, align 2
+// CHECK-X86-DAG: @f1f = global half 0xH0000, align 2
 
 _Float16 f2f = 32.4;
-// CHECK-DAG: @f2f = dso_local global half 0xH500D, align 2
+// CHECK-DAG: @f2f = global half 0xH500D, align 2
 
 _Float16 arr1f[10];
-// CHECK-AARCH64-DAG: @arr1f = dso_local global [10 x half] zeroinitializer, align 2
-// CHECK-X86-DAG: @arr1f = dso_local global [10 x half] zeroinitializer, align 16
+// CHECK-AARCH64-DAG: @arr1f = global [10 x half] zeroinitializer, align 2
+// CHECK-X86-DAG: @arr1f = global [10 x half] zeroinitializer, align 16
 
 _Float16 arr2f[] = { -1.2, -3.0, -3.e4 };
-// CHECK-DAG: @arr2f = dso_local global [3 x half] [half 0xHBCCD, half 0xHC200, half 0xHF753], align 2
+// CHECK-DAG: @arr2f = global [3 x half] [half 0xHBCCD, half 0xHC200, half 0xHF753], align 2
 
 _Float16 func1f(_Float16 arg);
 
@@ -51,24 +51,24 @@ class C1 {
   _Float16 f1c;
 
   static const _Float16 f2c;
-// CHECK-DAG: @_ZN2C13f2cE = external dso_local constant half, align 2
+// CHECK-DAG: @_ZN2C13f2cE = external constant half, align 2
 
   volatile _Float16 f3c;
 
 public:
   C1(_Float16 arg) : f1c(arg), f3c(arg) { }
 // Check that we mangle _Float16 to DF16_
-// CHECK-DAG: define linkonce_odr dso_local void @_ZN2C1C2EDF16_(%class.C1*{{.*}}, half{{.*}})
+// CHECK-DAG: define linkonce_odr void @_ZN2C1C2EDF16_(%class.C1*{{.*}}, half{{.*}})
 
   _Float16 func1c(_Float16 arg ) {
     return f1c + arg;
   }
-// CHECK-DAG: define linkonce_odr dso_local half @_ZN2C16func1cEDF16_(%class.C1*{{.*}}, half{{.*}})
+// CHECK-DAG: define linkonce_odr half @_ZN2C16func1cEDF16_(%class.C1*{{.*}}, half{{.*}})
 
   static _Float16 func2c(_Float16 arg) {
     return arg * C1::f2c;
   }
-// CHECK-DAG: define linkonce_odr dso_local half @_ZN2C16func2cEDF16_(half{{.*}})
+// CHECK-DAG: define linkonce_odr half @_ZN2C16func2cEDF16_(half{{.*}})
 };
 
 /*  Template */
@@ -76,7 +76,7 @@ public:
 template <class C> C func1t(C arg) {
   return arg * 2.f16;
 }
-// CHECK-DAG: define linkonce_odr dso_local half @_Z6func1tIDF16_ET_S0_(half{{.*}})
+// CHECK-DAG: define linkonce_odr half @_Z6func1tIDF16_ET_S0_(half{{.*}})
 
 template <class C> struct S1 {
   C mem1;
diff --git a/clang/test/CodeGenCXX/split-stacks.cpp b/clang/test/CodeGenCXX/split-stacks.cpp
index 2373bcc982f..76e1b79b8f1 100644
--- a/clang/test/CodeGenCXX/split-stacks.cpp
+++ b/clang/test/CodeGenCXX/split-stacks.cpp
@@ -16,18 +16,18 @@ int nosplit() {
   return tnosplit<int>();
 }
 
-// CHECK-SEGSTK: define dso_local i32 @_Z3foov() [[SS:#[0-9]+]] {
-// CHECK-SEGSTK: define dso_local i32 @_Z7nosplitv() [[NSS1:#[0-9]+]] {
-// CHECK-SEGSTK: define linkonce_odr dso_local i32 @_Z8tnosplitIiEiv() [[NSS2:#[0-9]+]] comdat {
+// CHECK-SEGSTK: define i32 @_Z3foov() [[SS:#[0-9]+]] {
+// CHECK-SEGSTK: define i32 @_Z7nosplitv() [[NSS1:#[0-9]+]] {
+// CHECK-SEGSTK: define linkonce_odr i32 @_Z8tnosplitIiEiv() [[NSS2:#[0-9]+]] comdat {
 // CHECK-SEGSTK-NOT: [[NSS1]] = { {{.*}} "split-stack" {{.*}} }
 // CHECK-SEGSTK-NOT: [[NSS2]] = { {{.*}} "split-stack" {{.*}} }
 // CHECK-SEGSTK: [[SS]] = { {{.*}} "split-stack" {{.*}} }
 // CHECK-SEGSTK-NOT: [[NSS1]] = { {{.*}} "split-stack" {{.*}} }
 // CHECK-SEGSTK-NOT: [[NSS2]] = { {{.*}} "split-stack" {{.*}} }
 
-// CHECK-NOSEGSTK: define dso_local i32 @_Z3foov() [[NSS0:#[0-9]+]] {
-// CHECK-NOSEGSTK: define dso_local i32 @_Z7nosplitv() [[NSS1:#[0-9]+]] {
-// CHECK-NOSEGSTK: define linkonce_odr dso_local i32 @_Z8tnosplitIiEiv() [[NSS2:#[0-9]+]] comdat {
+// CHECK-NOSEGSTK: define i32 @_Z3foov() [[NSS0:#[0-9]+]] {
+// CHECK-NOSEGSTK: define i32 @_Z7nosplitv() [[NSS1:#[0-9]+]] {
+// CHECK-NOSEGSTK: define linkonce_odr i32 @_Z8tnosplitIiEiv() [[NSS2:#[0-9]+]] comdat {
 // CHECK-NOSEGSTK-NOT: [[NSS1]] = { {{.*}} "split-stack" {{.*}} }
 // CHECK-NOSEGSTK-NOT: [[NSS2]] = { {{.*}} "split-stack" {{.*}} }
 // CHECK-NOSEGSTK-NOT: [[NSS3]] = { {{.*}} "split-stack" {{.*}} }
diff --git a/clang/test/Driver/lanai-unknown-unknown.cpp b/clang/test/Driver/lanai-unknown-unknown.cpp
index 220a84f9eb2..5ce0adf9f3a 100644
--- a/clang/test/Driver/lanai-unknown-unknown.cpp
+++ b/clang/test/Driver/lanai-unknown-unknown.cpp
@@ -11,25 +11,25 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
 
 extern "C" {
 
-// CHECK: @align_c = dso_local global i32 1
+// CHECK: @align_c = global i32 1
 int align_c = __alignof(char);
 
-// CHECK: @align_s = dso_local global i32 2
+// CHECK: @align_s = global i32 2
 int align_s = __alignof(short);
 
-// CHECK: @align_i = dso_local global i32 4
+// CHECK: @align_i = global i32 4
 int align_i = __alignof(int);
 
-// CHECK: @align_l = dso_local global i32 4
+// CHECK: @align_l = global i32 4
 int align_l = __alignof(long);
 
-// CHECK: @align_ll = dso_local global i32 8
+// CHECK: @align_ll = global i32 8
 int align_ll = __alignof(long long);
 
-// CHECK: @align_p = dso_local global i32 4
+// CHECK: @align_p = global i32 4
 int align_p = __alignof(void*);
 
-// CHECK: @align_vl = dso_local global i32 4
+// CHECK: @align_vl = global i32 4
 int align_vl = __alignof(va_list);
 
 // Check types
diff --git a/clang/test/Driver/le32-unknown-nacl.cpp b/clang/test/Driver/le32-unknown-nacl.cpp
index 9bbcdec037b..379ddb6c63d 100644
--- a/clang/test/Driver/le32-unknown-nacl.cpp
+++ b/clang/test/Driver/le32-unknown-nacl.cpp
@@ -10,34 +10,34 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
 
 extern "C" {
 
-// CHECK: @align_c = dso_local global i32 1
+// CHECK: @align_c = global i32 1
 int align_c = __alignof(char);
 
-// CHECK: @align_s = dso_local global i32 2
+// CHECK: @align_s = global i32 2
 int align_s = __alignof(short);
 
-// CHECK: @align_i = dso_local global i32 4
+// CHECK: @align_i = global i32 4
 int align_i = __alignof(int);
 
-// CHECK: @align_l = dso_local global i32 4
+// CHECK: @align_l = global i32 4
 int align_l = __alignof(long);
 
-// CHECK: @align_ll = dso_local global i32 8
+// CHECK: @align_ll = global i32 8
 int align_ll = __alignof(long long);
 
-// CHECK: @align_p = dso_local global i32 4
+// CHECK: @align_p = global i32 4
 int align_p = __alignof(void*);
 
-// CHECK: @align_f = dso_local global i32 4
+// CHECK: @align_f = global i32 4
 int align_f = __alignof(float);
 
-// CHECK: @align_d = dso_local global i32 8
+// CHECK: @align_d = global i32 8
 int align_d = __alignof(double);
 
-// CHECK: @align_ld = dso_local global i32 8
+// CHECK: @align_ld = global i32 8
 int align_ld = __alignof(long double);
 
-// CHECK: @align_vl = dso_local global i32 4
+// CHECK: @align_vl = global i32 4
 int align_vl = __alignof(va_list);
 
 // CHECK: __LITTLE_ENDIAN__defined
diff --git a/clang/test/Driver/le64-unknown-unknown.cpp b/clang/test/Driver/le64-unknown-unknown.cpp
index 8cee9dc375c..d0a58598ffe 100644
--- a/clang/test/Driver/le64-unknown-unknown.cpp
+++ b/clang/test/Driver/le64-unknown-unknown.cpp
@@ -9,34 +9,34 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
 
 extern "C" {
 
-// CHECK: @align_c = dso_local global i32 1
+// CHECK: @align_c = global i32 1
 int align_c = __alignof(char);
 
-// CHECK: @align_s = dso_local global i32 2
+// CHECK: @align_s = global i32 2
 int align_s = __alignof(short);
 
-// CHECK: @align_i = dso_local global i32 4
+// CHECK: @align_i = global i32 4
 int align_i = __alignof(int);
 
-// CHECK: @align_l = dso_local global i32 8
+// CHECK: @align_l = global i32 8
 int align_l = __alignof(long);
 
-// CHECK: @align_ll = dso_local global i32 8
+// CHECK: @align_ll = global i32 8
 int align_ll = __alignof(long long);
 
-// CHECK: @align_p = dso_local global i32 8
+// CHECK: @align_p = global i32 8
 int align_p = __alignof(void*);
 
-// CHECK: @align_f = dso_local global i32 4
+// CHECK: @align_f = global i32 4
 int align_f = __alignof(float);
 
-// CHECK: @align_d = dso_local global i32 8
+// CHECK: @align_d = global i32 8
 int align_d = __alignof(double);
 
-// CHECK: @align_ld = dso_local global i32 8
+// CHECK: @align_ld = global i32 8
 int align_ld = __alignof(long double);
 
-// CHECK: @align_vl = dso_local global i32 4
+// CHECK: @align_vl = global i32 4
 int align_vl = __alignof(va_list);
 
 // CHECK: __LITTLE_ENDIAN__defined
diff --git a/clang/test/Driver/riscv32-toolchain.c b/clang/test/Driver/riscv32-toolchain.c
index 36ba4b6df3e..3839f8e59c9 100644
--- a/clang/test/Driver/riscv32-toolchain.c
+++ b/clang/test/Driver/riscv32-toolchain.c
@@ -41,37 +41,37 @@ typedef __SIZE_TYPE__ size_t;
 typedef __PTRDIFF_TYPE__ ptrdiff_t;
 typedef __WCHAR_TYPE__ wchar_t;
 
-// CHECK: @align_c = dso_local global i32 1
+// CHECK: @align_c = global i32 1
 int align_c = __alignof(char);
 
-// CHECK: @align_s = dso_local global i32 2
+// CHECK: @align_s = global i32 2
 int align_s = __alignof(short);
 
-// CHECK: @align_i = dso_local global i32 4
+// CHECK: @align_i = global i32 4
 int align_i = __alignof(int);
 
-// CHECK: @align_wc = dso_local global i32 4
+// CHECK: @align_wc = global i32 4
 int align_wc = __alignof(wchar_t);
 
-// CHECK: @align_l = dso_local global i32 4
+// CHECK: @align_l = global i32 4
 int align_l = __alignof(long);
 
-// CHECK: @align_ll = dso_local global i32 8
+// CHECK: @align_ll = global i32 8
 int align_ll = __alignof(long long);
 
-// CHECK: @align_p = dso_local global i32 4
+// CHECK: @align_p = global i32 4
 int align_p = __alignof(void*);
 
-// CHECK: @align_f = dso_local global i32 4
+// CHECK: @align_f = global i32 4
 int align_f = __alignof(float);
 
-// CHECK: @align_d = dso_local global i32 8
+// CHECK: @align_d = global i32 8
 int align_d = __alignof(double);
 
-// CHECK: @align_ld = dso_local global i32 16
+// CHECK: @align_ld = global i32 16
 int align_ld = __alignof(long double);
 
-// CHECK: @align_vl = dso_local global i32 4
+// CHECK: @align_vl = global i32 4
 int align_vl = __alignof(va_list);
 
 // Check types
@@ -79,44 +79,44 @@ int align_vl = __alignof(va_list);
 // CHECK: zeroext i8 @check_char()
 char check_char() { return 0; }
 
-// CHECK: define dso_local signext i16 @check_short()
+// CHECK: define signext i16 @check_short()
 short check_short() { return 0; }
 
-// CHECK: define dso_local i32 @check_int()
+// CHECK: define i32 @check_int()
 int check_int() { return 0; }
 
-// CHECK: define dso_local i32 @check_wchar_t()
+// CHECK: define i32 @check_wchar_t()
 int check_wchar_t() { return 0; }
 
-// CHECK: define dso_local i32 @check_long()
+// CHECK: define i32 @check_long()
 long check_long() { return 0; }
 
-// CHECK: define dso_local i64 @check_longlong()
+// CHECK: define i64 @check_longlong()
 long long check_longlong() { return 0; }
 
-// CHECK: define dso_local zeroext i8 @check_uchar()
+// CHECK: define zeroext i8 @check_uchar()
 unsigned char check_uchar() { return 0; }
 
-// CHECK: define dso_local zeroext i16 @check_ushort()
+// CHECK: define zeroext i16 @check_ushort()
 unsigned short check_ushort() { return 0; }
 
-// CHECK: define dso_local i32 @check_uint()
+// CHECK: define i32 @check_uint()
 unsigned int check_uint() { return 0; }
 
-// CHECK: define dso_local i32 @check_ulong()
+// CHECK: define i32 @check_ulong()
 unsigned long check_ulong() { return 0; }
 
-// CHECK: define dso_local i64 @check_ulonglong()
+// CHECK: define i64 @check_ulonglong()
 unsigned long long check_ulonglong() { return 0; }
 
-// CHECK: define dso_local i32 @check_size_t()
+// CHECK: define i32 @check_size_t()
 size_t check_size_t() { return 0; }
 
-// CHECK: define dso_local float @check_float()
+// CHECK: define float @check_float()
 float check_float() { return 0; }
 
-// CHECK: define dso_local double @check_double()
+// CHECK: define double @check_double()
 double check_double() { return 0; }
 
-// CHECK: define dso_local fp128 @check_longdouble()
+// CHECK: define fp128 @check_longdouble()
 long double check_longdouble() { return 0; }
diff --git a/clang/test/Driver/riscv64-toolchain.c b/clang/test/Driver/riscv64-toolchain.c
index 44dcc937df2..8a3f3228ed0 100644
--- a/clang/test/Driver/riscv64-toolchain.c
+++ b/clang/test/Driver/riscv64-toolchain.c
@@ -10,82 +10,82 @@ typedef __SIZE_TYPE__ size_t;
 typedef __PTRDIFF_TYPE__ ptrdiff_t;
 typedef __WCHAR_TYPE__ wchar_t;
 
-// CHECK: @align_c = dso_local global i32 1
+// CHECK: @align_c = global i32 1
 int align_c = __alignof(char);
 
-// CHECK: @align_s = dso_local global i32 2
+// CHECK: @align_s = global i32 2
 int align_s = __alignof(short);
 
-// CHECK: @align_i = dso_local global i32 4
+// CHECK: @align_i = global i32 4
 int align_i = __alignof(int);
 
-// CHECK: @align_wc = dso_local global i32 4
+// CHECK: @align_wc = global i32 4
 int align_wc = __alignof(wchar_t);
 
-// CHECK: @align_l = dso_local global i32 8
+// CHECK: @align_l = global i32 8
 int align_l = __alignof(long);
 
-// CHECK: @align_ll = dso_local global i32 8
+// CHECK: @align_ll = global i32 8
 int align_ll = __alignof(long long);
 
-// CHECK: @align_p = dso_local global i32 8
+// CHECK: @align_p = global i32 8
 int align_p = __alignof(void*);
 
-// CHECK: @align_f = dso_local global i32 4
+// CHECK: @align_f = global i32 4
 int align_f = __alignof(float);
 
-// CHECK: @align_d = dso_local global i32 8
+// CHECK: @align_d = global i32 8
 int align_d = __alignof(double);
 
-// CHECK: @align_ld = dso_local global i32 16
+// CHECK: @align_ld = global i32 16
 int align_ld = __alignof(long double);
 
-// CHECK: @align_vl = dso_local global i32 8
+// CHECK: @align_vl = global i32 8
 int align_vl = __alignof(va_list);
 
 // Check types
 
-// CHECK: define dso_local zeroext i8 @check_char()
+// CHECK: define zeroext i8 @check_char()
 char check_char() { return 0; }
 
-// CHECK: define dso_local signext i16 @check_short()
+// CHECK: define signext i16 @check_short()
 short check_short() { return 0; }
 
-// CHECK: define dso_local signext i32 @check_int()
+// CHECK: define signext i32 @check_int()
 int check_int() { return 0; }
 
-// CHECK: define dso_local signext i32 @check_wchar_t()
+// CHECK: define signext i32 @check_wchar_t()
 int check_wchar_t() { return 0; }
 
-// CHECK: define dso_local i64 @check_long()
+// CHECK: define i64 @check_long()
 long check_long() { return 0; }
 
-// CHECK: define dso_local i64 @check_longlong()
+// CHECK: define i64 @check_longlong()
 long long check_longlong() { return 0; }
 
-// CHECK: define dso_local zeroext i8 @check_uchar()
+// CHECK: define zeroext i8 @check_uchar()
 unsigned char check_uchar() { return 0; }
 
-// CHECK: define dso_local zeroext i16 @check_ushort()
+// CHECK: define zeroext i16 @check_ushort()
 unsigned short check_ushort() { return 0; }
 
-// CHECK: define dso_local signext i32 @check_uint()
+// CHECK: define signext i32 @check_uint()
 unsigned int check_uint() { return 0; }
 
-// CHECK: define dso_local i64 @check_ulong()
+// CHECK: define i64 @check_ulong()
 unsigned long check_ulong() { return 0; }
 
-// CHECK: define dso_local i64 @check_ulonglong()
+// CHECK: define i64 @check_ulonglong()
 unsigned long long check_ulonglong() { return 0; }
 
-// CHECK: define dso_local i64 @check_size_t()
+// CHECK: define i64 @check_size_t()
 size_t check_size_t() { return 0; }
 
-// CHECK: define dso_local float @check_float()
+// CHECK: define float @check_float()
 float check_float() { return 0; }
 
-// CHECK: define dso_local double @check_double()
+// CHECK: define double @check_double()
 double check_double() { return 0; }
 
-// CHECK: define dso_local fp128 @check_longdouble()
+// CHECK: define fp128 @check_longdouble()
 long double check_longdouble() { return 0; }
diff --git a/clang/test/Frontend/ast-codegen.c b/clang/test/Frontend/ast-codegen.c
index e1140fdd8b2..4a3f8a3b79f 100644
--- a/clang/test/Frontend/ast-codegen.c
+++ b/clang/test/Frontend/ast-codegen.c
@@ -5,9 +5,9 @@
 // CHECK: module asm "foo"
 __asm__("foo");
 
-// CHECK: @g0 = common dso_local global i32 0, align 4
+// CHECK: @g0 = common global i32 0, align 4
 int g0;
 
-// CHECK: define dso_local i32 @f0()
+// CHECK: define i32 @f0()
 int f0() {
 }