diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild
deleted file mode 100644
index dab40c6d80..0000000000
--- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit cmake check-reqs python-any-r1
-
-DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang"
-HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler"
-# ToDo: unbundle spirv headers/tools
-SPIRV_HEADERS_COMMIT_MAGIC="0bcc624926a25a2a273d07877fd25a6ff5ba1cfb"
-SPIRV_TOOLS_COMMIT_MAGIC="71b2aee6c868a673ec82d1385f97593aa2881316"
-SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz
-https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="
-	sys-libs/zlib:0=
-	>=dev-libs/libffi-3.4.2-r1:0=
-"
-BDEPEND="sys-devel/gnuconfig"
-
-CHECKREQS_MEMORY="4G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_EXTRA_CACHE_FILE="${S}/cmake/caches/PredefinedParams.cmake"
-
-src_prepare() {
-	rm -d "${S}"/external/SPIRV*
-	mv "${WORKDIR}/SPIRV-Headers-${SPIRV_HEADERS_COMMIT_MAGIC}" "${S}/external/SPIRV-Headers" || die "can't move headers"
-	mv "${WORKDIR}/SPIRV-Tools-${SPIRV_TOOLS_COMMIT_MAGIC}" "${S}/external/SPIRV-Tools"|| die "can't move tools"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/dxc"
-		-DLLVM_BUILD_DOCS=0
-		-DLLVM_BUILD_TOOLS=0
-		-DSPIRV_BUILD_TESTS=0
-		-DLLVM_ENABLE_WERROR=0
-		-DSPIRV_WERROR=0
-		-DSPIRV_WARN_EVERYTHING=0
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_VERSION_SUFFIX=dxc
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EPREFIX}/usr/lib/llvm/dxc/lib"
-	EOF
-	doenvd "99${PN}"
-	dosym -r /usr/lib/llvm/dxc/bin/dxc /usr/bin/dxc
-}
diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild
deleted file mode 100644
index 42f1100fa0..0000000000
--- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit cmake check-reqs python-any-r1
-
-DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang"
-HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler"
-# ToDo: unbundle spirv headers/tools and directx headers
-SPIRV_HEADERS_COMMIT_MAGIC="d13b52222c39a7e9a401b44646f0ca3a640fbd47"
-SPIRV_TOOLS_COMMIT_MAGIC="f36a8d47f738cc612c7dd89f145a15465ab437cd"
-DIRECTX_HEADERS_COMMIT_MAGIC="980971e835876dc0cde415e8f9bc646e64667bf7"
-SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz
-https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz
-https://github.com/microsoft/DirectX-Headers/archive/${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-directxheaders-${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="${PYTHON_DEPS}"
-# Todo: unbundle
-#	dev-util/directx-headers
-#	dev-util/spirv-headers
-#	dev-util/spirv-tools
-RDEPEND="
-	sys-libs/zlib:0=
-	>=dev-libs/libffi-3.4.2-r1:0=
-"
-BDEPEND="sys-devel/gnuconfig"
-
-CHECKREQS_MEMORY="4G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_EXTRA_CACHE_FILE="${S}/cmake/caches/PredefinedParams.cmake"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-changes-meaning.patch  # bgo #905173
-)
-src_prepare() {
-	rm -d "${S}"/external/SPIRV* || die
-	rm -d "${S}"/external/DirectX* || die
-	mv "${WORKDIR}/SPIRV-Headers-${SPIRV_HEADERS_COMMIT_MAGIC}" "${S}/external/SPIRV-Headers" || die "can't move headers"
-	mv "${WORKDIR}/SPIRV-Tools-${SPIRV_TOOLS_COMMIT_MAGIC}" "${S}/external/SPIRV-Tools"|| die "can't move tools"
-	mv "${WORKDIR}/DirectX-Headers-${DIRECTX_HEADERS_COMMIT_MAGIC}" "${S}/external/DirectX-Headers"|| die "can't move DXH"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/dxc"
-		-DLLVM_BUILD_DOCS=0
-		-DLLVM_BUILD_TOOLS=0
-		-DSPIRV_BUILD_TESTS=0
-		-DLLVM_ENABLE_WERROR=0
-		-DSPIRV_WERROR=0
-		-DSPIRV_WARN_EVERYTHING=0
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_VERSION_SUFFIX=dxc
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EPREFIX}/usr/lib/llvm/dxc/lib"
-	EOF
-	doenvd "99${PN}"
-	dosym -r /usr/lib/llvm/dxc/bin/dxc /usr/bin/dxc
-}
diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2405.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2405.ebuild
deleted file mode 100644
index d31d0f3f1e..0000000000
--- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.8.2405.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit cmake check-reqs python-any-r1
-
-DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang"
-HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler"
-# ToDo: unbundle spirv headers/tools and directx headers
-SPIRV_HEADERS_COMMIT_MAGIC="4f7b471f1a66b6d06462cd4ba57628cc0cd087d7"
-SPIRV_TOOLS_COMMIT_MAGIC="dd4b663e13c07fea4fbb3f70c1c91c86731099f7"
-DIRECTX_HEADERS_COMMIT_MAGIC="980971e835876dc0cde415e8f9bc646e64667bf7"
-SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz
-https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz
-https://github.com/microsoft/DirectX-Headers/archive/${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-directxheaders-${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="${PYTHON_DEPS}"
-# Todo: unbundle
-#	dev-util/directx-headers
-#	dev-util/spirv-headers
-#	dev-util/spirv-tools
-RDEPEND="
-	sys-libs/zlib:0=
-	>=dev-libs/libffi-3.4.2-r1:0=
-"
-BDEPEND="sys-devel/gnuconfig"
-
-CHECKREQS_MEMORY="4G"
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_EXTRA_CACHE_FILE="${S}/cmake/caches/PredefinedParams.cmake"
-
-src_prepare() {
-	rm -d "${S}"/external/SPIRV* || die
-	rm -d "${S}"/external/DirectX* || die
-	mv "${WORKDIR}/SPIRV-Headers-${SPIRV_HEADERS_COMMIT_MAGIC}" "${S}/external/SPIRV-Headers" || die "can't move headers"
-	mv "${WORKDIR}/SPIRV-Tools-${SPIRV_TOOLS_COMMIT_MAGIC}" "${S}/external/SPIRV-Tools"|| die "can't move tools"
-	mv "${WORKDIR}/DirectX-Headers-${DIRECTX_HEADERS_COMMIT_MAGIC}" "${S}/external/DirectX-Headers"|| die "can't move DXH"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/dxc"
-		-DLLVM_BUILD_DOCS=0
-		-DLLVM_BUILD_TOOLS=0
-		-DSPIRV_BUILD_TESTS=0
-		-DLLVM_ENABLE_WERROR=0
-		-DSPIRV_WERROR=0
-		-DSPIRV_WARN_EVERYTHING=0
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_VERSION_SUFFIX=dxc
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EPREFIX}/usr/lib/llvm/dxc/lib"
-	EOF
-	doenvd "99${PN}"
-	dosym -r /usr/lib/llvm/dxc/bin/dxc /usr/bin/dxc
-}
diff --git a/dev-util/DirectXShaderCompiler/Manifest b/dev-util/DirectXShaderCompiler/Manifest
index dfb1a348f0..e5be85c5a2 100644
--- a/dev-util/DirectXShaderCompiler/Manifest
+++ b/dev-util/DirectXShaderCompiler/Manifest
@@ -1,13 +1,4 @@
-DIST DirectXShaderCompiler-1.7.2207.tar.gz 23764105 BLAKE2B 4b3bab8a961cdec96fd31da85386cf61af304d5ed1f6dcb40530bb2b084bc454f42ecfcbf9bcb228ecd2870c13b7b211509e05e3b7ed08ee3c2ed264505d162d SHA512 4faa6b53f2f694c9593ebf4ac02ce771fe1cb1822595799dc3a6c85752de701afe546b5fbdfedcc0ba466b0081bc679fca1fd7fb5fc05167c7449fb378a1c651
-DIST DirectXShaderCompiler-1.7.2212.tar.gz 23855402 BLAKE2B 0a6ffd8f9b4e716b5c5d8eb9708f79c95397f6c0d76e6b7769b5d47f1ea650941440f9eeb530654bdec84f02be8ed272278b19f00826f7d3d088d2d7170c7531 SHA512 54eb737c56948a46182158141ca8d0bd908a9fec122d93fcee53f8abfe707f0075de7ec6bd86ac5d58a3472110ba29f5849c9ad75f570c540c1a22c403ecb3b5
-DIST DirectXShaderCompiler-1.8.2405.tar.gz 24354504 BLAKE2B 0f84bc2182ef34b0e9a21a24c7a0a811fcdd8dba2683212385f4384064a49ae84b370acb3629dcd1bbbab291b415ab5480181514b4b26c81f67d3fbda20545aa SHA512 62ebc51df8beabb0c64376c2f5fbb170501bbfb360cabc8d4ade037b5a842bcb936140f55120221d4ff020378c728cdf037666698c7a12d5dea1ef42f849a75a
 DIST DirectXShaderCompiler-1.8.2407.tar.gz 24397154 BLAKE2B 533f2e7a15abb2cfda05d7c437030d761cb6127f1c5fc3db851608d3b157eedbbb0fb4059ea3402156d97aebe6da8fde398024d3c94c421ad2dcc5604db24a2c SHA512 7b7a829fd8766942bb526cd0bbda71ebd081c54c6ce83b1266bc8c0340776d1d40f9d0fdb73946d713ee2d21b103ffee5d47110ee72f37b16ade56d3be984990
 DIST DirectXShaderCompiler-directxheaders-980971e835876dc0cde415e8f9bc646e64667bf7.tar.gz 326310 BLAKE2B 8ea4bbae290926c08d02d1a1262e813bb188c62a6deb81ed03954c500473581dc2430d09ca0742c42c5d8bfc2e232c999531ec5ad139aa791b7e8b06dfacd61d SHA512 a570068d3c25c68eba34a2653108e2019f888a7392a803f97da9a401713b14bf4235520f0adc37c2f6ffb27cfb118ca7bb0fc8e446b342a7393c9c64afd84ed8
-DIST DirectXShaderCompiler-headers-0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
 DIST DirectXShaderCompiler-headers-2acb319af38d43be3ea76bfabf3998e5281d8d12.tar.gz 522013 BLAKE2B fa3ab292fbdc0b219e23f3919014b7e2f891dee3fab4a1c21829013ff93cb445c920fa30358b6162a4bdbb28ddf9babe56286f0e8e96a51825add2b3ee3e8a04 SHA512 364ab8ea4a81b3589bd9e58d50c89d21859cb4a324b224f74ec7c371631f127c0e7f36d074436b6cba8a1919e83d3a3790baa94268b47862c28a2d3ca55fccfa
-DIST DirectXShaderCompiler-headers-4f7b471f1a66b6d06462cd4ba57628cc0cd087d7.tar.gz 472655 BLAKE2B 5021f997445539ecaf825460f7e675a1e8d9be7457245a3db31f6fdc63956b8b4987da63f813ece3b8158a8eec4e56760693d1d2dfc49be37ee09a29e299ba82 SHA512 adfdf80baf8c8e83595dfbd9245b821b00918f342174d2ff643b426c0da16a9c79877131a697b39b579a2ec691daeae24f846517eac017e41ba6209098f25eab
-DIST DirectXShaderCompiler-headers-d13b52222c39a7e9a401b44646f0ca3a640fbd47.tar.gz 446718 BLAKE2B 39162460b730cc495a1c2cdd2c9f8e173ad1f88c1f9f5070155347ff455275b33fb043f4ab85b47131cb5014a8adc07d3066f99fc5442ce661f0f388fb1396f0 SHA512 390078d26976e7e95fdda10816bff4946dbae8d7e92d8bdd88501725bf7683ba48b47ca5cbc5491e47539a39bfb9eb5c423e24f2f03dba2e4fe1923bf8e4dd9b
 DIST DirectXShaderCompiler-tools-0cfe9e7219148716dfd30b37f4d21753f098707a.tar.gz 3173510 BLAKE2B 66717fe54b26d1fdc758e179574e228c5723ef769578708376ab4098b0ca7670a9a1ec81cd3caa2f234879ac2c49cbe3e7c2ca82000448d393e1e0394e7dd4ed SHA512 fd6beea7307add32c1d0f0b317e1707822cf806b02cc09519d6ec05f432ab2f7c38725de10bbe34c8e701b8a32c95f9a93b0fcadcfb227d4dfab2e365b476944
-DIST DirectXShaderCompiler-tools-71b2aee6c868a673ec82d1385f97593aa2881316.tar.gz 3042018 BLAKE2B e9d62559fc270c4140f2638a51b8d14120d84a868a35c488f30bff1b098a98fa1683e85b0778208de61a0b5c0b3f0996071e655a8fa64cc7c3c791527ff9441a SHA512 68f80e4a3395ba7c87ab08f515d265f0c106f39770e043cc8eba5e62f2762405e05e4b5b187e33702ce0a2204fc9d42cbf7ce27a6268daf59f4ab4c04b73d462
-DIST DirectXShaderCompiler-tools-dd4b663e13c07fea4fbb3f70c1c91c86731099f7.tar.gz 3180686 BLAKE2B 21d54c528ceeea3de6d32e071e2fdf9749aabf9381dd3259797d9e6607a047703a5b138a6d7fb24ac4121fa76a557521fddf718f2f6b6ff0cebc16a865250616 SHA512 4f1f16904aecfcf6eef9fbebe99654381405e1ed61e2b61a6c42e9ec7f73208448440c1f87f069859f16f69ee6362ccc89438ef0e11dcc77d5b2a5594bde442a
-DIST DirectXShaderCompiler-tools-f36a8d47f738cc612c7dd89f145a15465ab437cd.tar.gz 3092790 BLAKE2B 2e1978cb7d92f9556650696136f7e68f0aae46ebbca6caf9bd1d22ad42b5d2fad75dcc9aa2504e61e140e6c0a44e807d7aa94b28a25cd131a8fb239f6003bc21 SHA512 53c9c973f79fd321fa3a3d1f305e8674ccd7a02ceaf779aae7650c68b3d0d8d820fbe380b0450892402a1835f8205c8a7e6efb155929bce217d1b39bd4a34eef
diff --git a/dev-util/DirectXShaderCompiler/files/DirectXShaderCompiler-1.7.2212-fix-changes-meaning.patch b/dev-util/DirectXShaderCompiler/files/DirectXShaderCompiler-1.7.2212-fix-changes-meaning.patch
deleted file mode 100644
index 6a6e4f8bb4..0000000000
--- a/dev-util/DirectXShaderCompiler/files/DirectXShaderCompiler-1.7.2212-fix-changes-meaning.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-# related:
-# https://bugs.gentoo.org/905173
-# https://github.com/microsoft/DirectXShaderCompiler/pull/5179
-
-diff --git a/include/llvm/Analysis/DxilValueCache.h b/include/llvm/Analysis/DxilValueCache.h
-index 2622bb19..37124255 100644
---- a/include/llvm/Analysis/DxilValueCache.h
-+++ b/include/llvm/Analysis/DxilValueCache.h
-@@ -52,7 +52,7 @@ struct DxilValueCache : public ImmutablePass {
- 
- private:
- 
--  WeakValueMap ValueMap;
-+  WeakValueMap Map;
-   bool (*ShouldSkipCallback)(Value *V) = nullptr;
- 
-   void MarkUnreachable(BasicBlock *BB);
-@@ -77,8 +77,8 @@ public:
-   Value *GetValue(Value *V, DominatorTree *DT=nullptr);
-   Constant *GetConstValue(Value *V, DominatorTree *DT = nullptr);
-   ConstantInt *GetConstInt(Value *V, DominatorTree *DT = nullptr);
--  void ResetUnknowns() { ValueMap.ResetUnknowns(); }
--  void ResetAll() { ValueMap.ResetAll(); }
-+  void ResetUnknowns() { Map.ResetUnknowns(); }
-+  void ResetAll() { Map.ResetAll(); }
-   bool IsUnreachable(BasicBlock *BB, DominatorTree *DT=nullptr);
-   void SetShouldSkipCallback(bool (*Callback)(Value *V)) { ShouldSkipCallback = Callback; };
- };
-diff --git a/lib/Analysis/DxilValueCache.cpp b/lib/Analysis/DxilValueCache.cpp
-index dbd82a39..f5266927 100644
---- a/lib/Analysis/DxilValueCache.cpp
-+++ b/lib/Analysis/DxilValueCache.cpp
-@@ -57,7 +57,7 @@ bool IsEntryBlock(const BasicBlock *BB) {
- }
- 
- void DxilValueCache::MarkUnreachable(BasicBlock *BB) {
--  ValueMap.Set(BB, ConstantInt::get(Type::getInt1Ty(BB->getContext()), 0));
-+  Map.Set(BB, ConstantInt::get(Type::getInt1Ty(BB->getContext()), 0));
- }
- 
- bool DxilValueCache::MayBranchTo(BasicBlock *A, BasicBlock *B) {
-@@ -93,7 +93,7 @@ bool DxilValueCache::MayBranchTo(BasicBlock *A, BasicBlock *B) {
- }
- 
- bool DxilValueCache::IsUnreachable_(BasicBlock *BB) {
--  if (Value *V = ValueMap.Get(BB))
-+  if (Value *V = Map.Get(BB))
-     if (IsConstantFalse(V))
-       return true;
-   return false;
-@@ -155,7 +155,7 @@ Value *DxilValueCache::ProcessAndSimplify_PHI(Instruction *I, DominatorTree *DT)
-   // that were computed previously.
-   if (!Simplified) {
-     if (SimplifiedNotDominating)
--      if (Value *CachedV = ValueMap.Get(SimplifiedNotDominating))
-+      if (Value *CachedV = Map.Get(SimplifiedNotDominating))
-         Simplified = CachedV;
-   }
- 
-@@ -379,7 +379,7 @@ Value *DxilValueCache::SimplifyAndCacheResult(Instruction *I, DominatorTree *DT)
-   }
- 
-   if (Simplified && isa<Constant>(Simplified))
--    ValueMap.Set(I, Simplified);
-+    Map.Set(I, Simplified);
- 
-   return Simplified;
- }
-@@ -500,7 +500,7 @@ void DxilValueCache::WeakValueMap::Set(Value *Key, Value *V) {
- // If there's a cached value, return it. Otherwise, return
- // the value itself.
- Value *DxilValueCache::TryGetCachedValue(Value *V) {
--  if (Value *Simplified = ValueMap.Get(V))
-+  if (Value *Simplified = Map.Get(V))
-     return Simplified;
-   return V;
- }
-@@ -516,7 +516,7 @@ StringRef DxilValueCache::getPassName() const {
- Value *DxilValueCache::GetValue(Value *V, DominatorTree *DT) {
-   if (dyn_cast<Constant>(V))
-     return V;
--  if (Value *NewV = ValueMap.Get(V))
-+  if (Value *NewV = Map.Get(V))
-     return NewV;
- 
-   return ProcessValue(V, DT);
-@@ -541,7 +541,7 @@ bool DxilValueCache::IsUnreachable(BasicBlock *BB, DominatorTree *DT) {
- 
- LLVM_DUMP_METHOD
- void DxilValueCache::dump() const {
--  ValueMap.dump();
-+  Map.dump();
- }
- 
- void DxilValueCache::getAnalysisUsage(AnalysisUsage &AU) const {
-@@ -580,15 +580,15 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) {
- 
-     // If we haven't seen this value, go in and push things it depends on
-     // into the worklist.
--    if (!ValueMap.Seen(V)) {
--      ValueMap.SetSentinel(V);
-+    if (!Map.Seen(V)) {
-+      Map.SetSentinel(V);
-       if (Instruction *I = dyn_cast<Instruction>(V)) {
- 
-         for (Use &U : I->operands()) {
-           Instruction *UseI = dyn_cast<Instruction>(U.get());
-           if (!UseI)
-             continue;
--          if (!ValueMap.Seen(UseI))
-+          if (!Map.Seen(UseI))
-             WorkList.push_back(UseI);
-         }
- 
-@@ -596,9 +596,9 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) {
-           for (unsigned i = 0; i < PN->getNumIncomingValues(); i++) {
-             BasicBlock *BB = PN->getIncomingBlock(i);
-             TerminatorInst *Term = BB->getTerminator();
--            if (!ValueMap.Seen(Term))
-+            if (!Map.Seen(Term))
-               WorkList.push_back(Term);
--            if (!ValueMap.Seen(BB))
-+            if (!Map.Seen(BB))
-               WorkList.push_back(BB);
-           }
-         }
-@@ -607,9 +607,9 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) {
-         for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; PI++) {
-           BasicBlock *PredBB = *PI;
-           TerminatorInst *Term = PredBB->getTerminator();
--          if (!ValueMap.Seen(Term))
-+          if (!Map.Seen(Term))
-             WorkList.push_back(Term);
--          if (!ValueMap.Seen(PredBB))
-+          if (!Map.Seen(PredBB))
-             WorkList.push_back(PredBB);
-         }
-       }
-diff --git a/tools/clang/include/clang/Basic/Version.h b/tools/clang/include/clang/Basic/Version.h
-index d3a3b4f4..19fa889c 100644
---- a/tools/clang/include/clang/Basic/Version.h
-+++ b/tools/clang/include/clang/Basic/Version.h
-@@ -18,7 +18,8 @@
- 
- #include "clang/Basic/Version.inc"
- #include "llvm/ADT/StringRef.h"
--
-+// HLSL Change - for uint32_t.
-+#include <cstdint>
- /// \brief Helper macro for CLANG_VERSION_STRING.
- #define CLANG_MAKE_VERSION_STRING2(X) #X
-