diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index ccf5d71538e9fe..236d4f98bb6a75 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -1020,6 +1020,16 @@ LinkageComputer::getLVForClassMember(const NamedDecl *D,
       explicitSpecSuppressor = MD;
     }
 
+    // OpenMP target declare device functions are not callable from the host so
+    // they should not be exported from the device image. This applies to all
+    // functions as the host-callable kernel functions are emitted at codegen.
+    ASTContext &Context = D->getASTContext();
+    if (Context.getLangOpts().OpenMP && Context.getLangOpts().OpenMPIsDevice &&
+        ((Context.getTargetInfo().getTriple().isAMDGPU() ||
+          Context.getTargetInfo().getTriple().isNVPTX()) ||
+         OMPDeclareTargetDeclAttr::isDeclareTargetDeclaration(MD)))
+      LV.mergeVisibility(HiddenVisibility, /*newExplicit=*/false);
+
   } else if (const auto *RD = dyn_cast<CXXRecordDecl>(D)) {
     if (const auto *spec = dyn_cast<ClassTemplateSpecializationDecl>(RD)) {
       mergeTemplateLV(LV, spec, computation);
diff --git a/clang/test/OpenMP/target_visibility.cpp b/clang/test/OpenMP/target_visibility.cpp
new file mode 100644
index 00000000000000..af1a1bb243cc43
--- /dev/null
+++ b/clang/test/OpenMP/target_visibility.cpp
@@ -0,0 +1,27 @@
+// RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple nvptx64-unknown-unknown -fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -fopenmp-is-device -o - | FileCheck %s
+// RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple nvptx-unknown-unknown -fopenmp-targets=nvptx-nvidia-cuda -emit-llvm %s -fopenmp-is-device -o - | FileCheck %s
+// expected-no-diagnostics
+
+
+#pragma omp declare target
+
+struct A {
+void foo() {}
+static void sfoo() {}
+};
+
+#pragma omp end declare target
+
+struct B {
+void bar();
+static void sbar();
+};
+
+void B::bar() { A a; a.foo(); }
+void B::sbar() { A::sfoo(); }
+#pragma omp declare target to(B::bar, B::sbar)
+
+// CHECK-DAG: define hidden void @_ZN1B4sbarEv()
+// CHECK-DAG: define linkonce_odr hidden void @_ZN1A4sfooEv()
+// CHECK-DAG: define hidden void @_ZN1B3barEv(
+// CHECK-DAG: define linkonce_odr hidden void @_ZN1A3fooEv(