Merge commit '7c6d809dfc41' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn

@@ -125,6 +125,7 @@ copy("Headers") {
     "adcintrin.h",
     "adxintrin.h",
     "altivec.h",
+    "amdgpuintrin.h",
     "ammintrin.h",
     "amxavx512intrin.h",
     "amxcomplexintrin.h",
@@ -210,6 +211,7 @@ copy("Headers") {
     "fmaintrin.h",
     "fxsrintrin.h",
     "gfniintrin.h",
+    "gpuintrin.h",
     "hexagon_circ_brev_intrinsics.h",
     "hexagon_protos.h",
     "hexagon_types.h",
@@ -255,6 +257,7 @@ copy("Headers") {
     "msa.h",
     "mwaitxintrin.h",
     "nmmintrin.h",
+    "nvptxintrin.h",
     "opencl-c-base.h",
     "opencl-c.h",
     "openmp_wrappers/__clang_openmp_device_functions.h",