diff --git a/clang/test/OpenMP/target_debug_codegen.cpp b/clang/test/OpenMP/target_debug_codegen.cpp --- a/clang/test/OpenMP/target_debug_codegen.cpp +++ b/clang/test/OpenMP/target_debug_codegen.cpp @@ -1,4 +1,4 @@ -// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --check-globals --global-value-regex "(__omp_rtl_debug_kind|llvm\.used)" +// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --check-globals --global-value-regex "__omp_rtl_debug_kind" // Test target codegen - host bc file has to be created first. // RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm-bc %s -o %t-ppc-host.bc // RUN: %clang_cc1 -verify -fopenmp -x c++ -triple nvptx64-unknown-unknown -fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -fopenmp-target-new-runtime -fopenmp-target-debug -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix=CHECK @@ -10,14 +10,11 @@ #define HEADER //. -// CHECK: @__omp_rtl_debug_kind = private constant i32 1 -// CHECK: @llvm.used = appending global [1 x i8*] [i8* bitcast (i32* @__omp_rtl_debug_kind to i8*)], section "llvm.metadata" +// CHECK: @__omp_rtl_debug_kind = weak_odr constant i32 1 //. -// CHECK-EQ: @__omp_rtl_debug_kind = private constant i32 111 -// CHECK-EQ: @llvm.used = appending global [1 x i8*] [i8* bitcast (i32* @__omp_rtl_debug_kind to i8*)], section "llvm.metadata" +// CHECK-EQ: @__omp_rtl_debug_kind = weak_odr constant i32 111 //. -// CHECK-DEFAULT: @__omp_rtl_debug_kind = private constant i32 0 -// CHECK-DEFAULT: @llvm.used = appending global [1 x i8*] [i8* bitcast (i32* @__omp_rtl_debug_kind to i8*)], section "llvm.metadata" +// CHECK-DEFAULT: @__omp_rtl_debug_kind = weak_odr constant i32 0 //. void foo() { #pragma omp target diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp --- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp +++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp @@ -249,11 +249,9 @@ IntegerType *I32Ty = Type::getInt32Ty(M.getContext()); auto *GV = new GlobalVariable( M, I32Ty, - /* isConstant = */ true, GlobalValue::PrivateLinkage, + /* isConstant = */ true, GlobalValue::WeakODRLinkage, ConstantInt::get(I32Ty, DebugKind), "__omp_rtl_debug_kind"); - llvm::appendToUsed(M, {GV}); - return GV; }