diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt @@ -257,6 +257,7 @@ cuda_wrappers/cmath cuda_wrappers/complex cuda_wrappers/new + cuda_wrappers/bits/shared_ptr_base.h ) set(ppc_wrapper_files diff --git a/clang/lib/Headers/cuda_wrappers/bits/shared_ptr_base.h b/clang/lib/Headers/cuda_wrappers/bits/shared_ptr_base.h new file mode 100644 --- /dev/null +++ b/clang/lib/Headers/cuda_wrappers/bits/shared_ptr_base.h @@ -0,0 +1,9 @@ +// CUDA headers define __noinline__ which interferes with libstdc++'s use of +// `__attribute((__noinline__))`. In order to avoid compilation error, +// temporarily unset __noinline__ when we include affected libstdc++ header. + +#pragma push_macro("__noinline__") +#undef __noinline__ +#include_next "bits/shared_ptr_base.h" + +#pragma pop_macro("__noinline__")