diff --git a/libcxx/include/__pstl/internal/algorithm_fwd.h b/libcxx/include/__pstl/internal/algorithm_fwd.h
--- a/libcxx/include/__pstl/internal/algorithm_fwd.h
+++ b/libcxx/include/__pstl/internal/algorithm_fwd.h
@@ -16,8 +16,6 @@
 
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl {
 namespace __internal {
 
@@ -1768,6 +1766,4 @@
 } // namespace __internal
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_ALGORITHM_FWD_H */
diff --git a/libcxx/include/__pstl/internal/algorithm_impl.h b/libcxx/include/__pstl/internal/algorithm_impl.h
--- a/libcxx/include/__pstl/internal/algorithm_impl.h
+++ b/libcxx/include/__pstl/internal/algorithm_impl.h
@@ -24,8 +24,6 @@
 #include "pstl_config.h"
 #include "unseq_backend_simd.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl {
 namespace __internal {
 
@@ -4339,6 +4337,4 @@
 } // namespace __internal
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_ALGORITHM_IMPL_H */
diff --git a/libcxx/include/__pstl/internal/execution_defs.h b/libcxx/include/__pstl/internal/execution_defs.h
--- a/libcxx/include/__pstl/internal/execution_defs.h
+++ b/libcxx/include/__pstl/internal/execution_defs.h
@@ -14,8 +14,6 @@
 
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl {
 namespace execution {
 inline namespace v1 {
@@ -73,6 +71,4 @@
 
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_EXECUTION_POLICY_DEFS_H */
diff --git a/libcxx/include/__pstl/internal/execution_impl.h b/libcxx/include/__pstl/internal/execution_impl.h
--- a/libcxx/include/__pstl/internal/execution_impl.h
+++ b/libcxx/include/__pstl/internal/execution_impl.h
@@ -16,8 +16,6 @@
 #include "execution_defs.h"
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl {
 namespace __internal {
 
@@ -88,6 +86,4 @@
 } // namespace __internal
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_EXECUTION_IMPL_H */
diff --git a/libcxx/include/__pstl/internal/glue_algorithm_defs.h b/libcxx/include/__pstl/internal/glue_algorithm_defs.h
--- a/libcxx/include/__pstl/internal/glue_algorithm_defs.h
+++ b/libcxx/include/__pstl/internal/glue_algorithm_defs.h
@@ -16,8 +16,6 @@
 #include "execution_defs.h"
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace std {
 
 // [alg.find.end]
@@ -695,6 +693,4 @@
 
 } // namespace std
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_GLUE_ALGORITHM_DEFS_H */
diff --git a/libcxx/include/__pstl/internal/glue_algorithm_impl.h b/libcxx/include/__pstl/internal/glue_algorithm_impl.h
--- a/libcxx/include/__pstl/internal/glue_algorithm_impl.h
+++ b/libcxx/include/__pstl/internal/glue_algorithm_impl.h
@@ -21,8 +21,6 @@
 
 #include "execution_impl.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace std {
 
 // [alg.find.end]
@@ -1191,6 +1189,4 @@
 
 } // namespace std
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_GLUE_ALGORITHM_IMPL_H */
diff --git a/libcxx/include/__pstl/internal/glue_memory_defs.h b/libcxx/include/__pstl/internal/glue_memory_defs.h
--- a/libcxx/include/__pstl/internal/glue_memory_defs.h
+++ b/libcxx/include/__pstl/internal/glue_memory_defs.h
@@ -13,8 +13,6 @@
 #include "execution_defs.h"
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace std {
 
 // [uninitialized.copy]
@@ -79,6 +77,4 @@
 
 } //  namespace std
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_GLUE_MEMORY_DEFS_H */
diff --git a/libcxx/include/__pstl/internal/glue_memory_impl.h b/libcxx/include/__pstl/internal/glue_memory_impl.h
--- a/libcxx/include/__pstl/internal/glue_memory_impl.h
+++ b/libcxx/include/__pstl/internal/glue_memory_impl.h
@@ -18,8 +18,6 @@
 
 #include "execution_impl.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace std {
 
 // [uninitialized.copy]
@@ -378,6 +376,4 @@
 
 } // namespace std
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_GLUE_MEMORY_IMPL_H */
diff --git a/libcxx/include/__pstl/internal/glue_numeric_defs.h b/libcxx/include/__pstl/internal/glue_numeric_defs.h
--- a/libcxx/include/__pstl/internal/glue_numeric_defs.h
+++ b/libcxx/include/__pstl/internal/glue_numeric_defs.h
@@ -15,8 +15,6 @@
 #include "execution_defs.h"
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace std {
 // [reduce]
 
@@ -174,6 +172,4 @@
 
 } // namespace std
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_GLUE_NUMERIC_DEFS_H */
diff --git a/libcxx/include/__pstl/internal/glue_numeric_impl.h b/libcxx/include/__pstl/internal/glue_numeric_impl.h
--- a/libcxx/include/__pstl/internal/glue_numeric_impl.h
+++ b/libcxx/include/__pstl/internal/glue_numeric_impl.h
@@ -18,8 +18,6 @@
 #include "numeric_fwd.h"
 #include "utils.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace std {
 
 // [reduce]
@@ -319,6 +317,4 @@
 
 } // namespace std
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_GLUE_NUMERIC_IMPL_H_ */
diff --git a/libcxx/include/__pstl/internal/memory_impl.h b/libcxx/include/__pstl/internal/memory_impl.h
--- a/libcxx/include/__pstl/internal/memory_impl.h
+++ b/libcxx/include/__pstl/internal/memory_impl.h
@@ -15,8 +15,6 @@
 #include "pstl_config.h"
 #include "unseq_backend_simd.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl {
 namespace __internal {
 
@@ -105,6 +103,4 @@
 } // namespace __internal
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_MEMORY_IMPL_H */
diff --git a/libcxx/include/__pstl/internal/numeric_fwd.h b/libcxx/include/__pstl/internal/numeric_fwd.h
--- a/libcxx/include/__pstl/internal/numeric_fwd.h
+++ b/libcxx/include/__pstl/internal/numeric_fwd.h
@@ -15,8 +15,6 @@
 
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl {
 namespace __internal {
 
@@ -251,6 +249,4 @@
 } // namespace __internal
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_NUMERIC_FWD_H */
diff --git a/libcxx/include/__pstl/internal/numeric_impl.h b/libcxx/include/__pstl/internal/numeric_impl.h
--- a/libcxx/include/__pstl/internal/numeric_impl.h
+++ b/libcxx/include/__pstl/internal/numeric_impl.h
@@ -20,8 +20,6 @@
 #include "unseq_backend_simd.h"
 #include "algorithm_fwd.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl {
 namespace __internal {
 
@@ -537,6 +535,4 @@
 } // namespace __internal
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_NUMERIC_IMPL_H */
diff --git a/libcxx/include/__pstl/internal/omp/util.h b/libcxx/include/__pstl/internal/omp/util.h
--- a/libcxx/include/__pstl/internal/omp/util.h
+++ b/libcxx/include/__pstl/internal/omp/util.h
@@ -31,8 +31,6 @@
 #    define _PSTL_PRAGMA(x) _Pragma(#    x)
 #endif
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl
 {
 namespace __omp_backend
diff --git a/libcxx/include/__pstl/internal/parallel_backend_serial.h b/libcxx/include/__pstl/internal/parallel_backend_serial.h
--- a/libcxx/include/__pstl/internal/parallel_backend_serial.h
+++ b/libcxx/include/__pstl/internal/parallel_backend_serial.h
@@ -16,8 +16,6 @@
 
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl
 {
 namespace __serial_backend
@@ -130,6 +128,4 @@
 } // namespace __serial_backend
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_PARALLEL_BACKEND_SERIAL_H */
diff --git a/libcxx/include/__pstl/internal/parallel_backend_tbb.h b/libcxx/include/__pstl/internal/parallel_backend_tbb.h
--- a/libcxx/include/__pstl/internal/parallel_backend_tbb.h
+++ b/libcxx/include/__pstl/internal/parallel_backend_tbb.h
@@ -30,8 +30,6 @@
 #    error Intel(R) Threading Building Blocks 2018 is required; older versions are not supported.
 #endif
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl
 {
 namespace __tbb_backend
@@ -1291,6 +1289,4 @@
 } // namespace __tbb_backend
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_PARALLEL_BACKEND_TBB_H */
diff --git a/libcxx/include/__pstl/internal/parallel_backend_utils.h b/libcxx/include/__pstl/internal/parallel_backend_utils.h
--- a/libcxx/include/__pstl/internal/parallel_backend_utils.h
+++ b/libcxx/include/__pstl/internal/parallel_backend_utils.h
@@ -16,8 +16,6 @@
 
 #include "pstl_config.h"
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl
 {
 
@@ -258,6 +256,4 @@
 } // namespace __utils
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_PARALLEL_BACKEND_UTILS_H */
diff --git a/libcxx/include/__pstl/internal/parallel_impl.h b/libcxx/include/__pstl/internal/parallel_impl.h
--- a/libcxx/include/__pstl/internal/parallel_impl.h
+++ b/libcxx/include/__pstl/internal/parallel_impl.h
@@ -17,8 +17,6 @@
 // This header defines the minimum set of parallel routines required to support Parallel STL,
 // implemented on top of Intel(R) Threading Building Blocks (Intel(R) TBB) library
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl
 {
 namespace __internal
@@ -84,6 +82,4 @@
 } // namespace __internal
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_PARALLEL_IMPL_H */
diff --git a/libcxx/include/__pstl/internal/pstl_config.h b/libcxx/include/__pstl/internal/pstl_config.h
--- a/libcxx/include/__pstl/internal/pstl_config.h
+++ b/libcxx/include/__pstl/internal/pstl_config.h
@@ -49,15 +49,6 @@
 #define _PSTL_STRING(x) _PSTL_STRING_AUX(x)
 #define _PSTL_STRING_CONCAT(x, y) x #y
 
-#ifdef _PSTL_HIDE_FROM_ABI_PER_TU
-#    define _PSTL_HIDE_FROM_ABI_PUSH                                                                                   \
-        _Pragma("clang attribute push(__attribute__((internal_linkage)), apply_to=any(function,record))")
-#    define _PSTL_HIDE_FROM_ABI_POP _Pragma("clang attribute pop")
-#else
-#    define _PSTL_HIDE_FROM_ABI_PUSH /* nothing */
-#    define _PSTL_HIDE_FROM_ABI_POP  /* nothing */
-#endif
-
 // note that when ICC or Clang is in use, _PSTL_GCC_VERSION might not fully match
 // the actual GCC version on the system.
 #define _PSTL_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
diff --git a/libcxx/include/__pstl/internal/unseq_backend_simd.h b/libcxx/include/__pstl/internal/unseq_backend_simd.h
--- a/libcxx/include/__pstl/internal/unseq_backend_simd.h
+++ b/libcxx/include/__pstl/internal/unseq_backend_simd.h
@@ -19,8 +19,6 @@
 // This header defines the minimum set of vector routines required
 // to support parallel STL.
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl
 {
 namespace __unseq_backend
@@ -858,6 +856,4 @@
 } // namespace __unseq_backend
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_UNSEQ_BACKEND_SIMD_H */
diff --git a/libcxx/include/__pstl/internal/utils.h b/libcxx/include/__pstl/internal/utils.h
--- a/libcxx/include/__pstl/internal/utils.h
+++ b/libcxx/include/__pstl/internal/utils.h
@@ -15,8 +15,6 @@
 #include <new>
 #include <utility>
 
-_PSTL_HIDE_FROM_ABI_PUSH
-
 namespace __pstl {
 namespace __internal {
 
@@ -137,6 +135,4 @@
 } // namespace __internal
 } // namespace __pstl
 
-_PSTL_HIDE_FROM_ABI_POP
-
 #endif /* _PSTL_UTILS_H */