diff --git a/debian/libc++-X.Y-dev.install.in b/debian/libc++-X.Y-dev.install.in
index 8099a083..1a4d26ee 100644
--- a/debian/libc++-X.Y-dev.install.in
+++ b/debian/libc++-X.Y-dev.install.in
@@ -1,11 +1,11 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.so
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a
 usr/lib/llvm-@LLVM_VERSION@/include/c++/
-usr/lib/llvm-@LLVM_VERSION@/include/*/c++/v1/
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++experimental.a
+usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a
 
 # C++ modules
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.modules.json
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.modules.json
 usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/std.compat/*.inc
 usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/*.cppm
 usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/std/*.inc
diff --git a/debian/libc++1-X.Y.install.in b/debian/libc++1-X.Y.install.in
index 606c7fcf..78e2cd3b 100644
--- a/debian/libc++1-X.Y.install.in
+++ b/debian/libc++1-X.Y.install.in
@@ -1 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.so.*
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.*
diff --git a/debian/libc++abi-X.Y-dev.install.in b/debian/libc++abi-X.Y-dev.install.in
index ce71f3e6..8774c6ae 100644
--- a/debian/libc++abi-X.Y-dev.install.in
+++ b/debian/libc++abi-X.Y-dev.install.in
@@ -1,3 +1,3 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi*so
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi*so
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a
 libcxxabi/include/* usr/lib/llvm-@LLVM_VERSION@/include/
diff --git a/debian/libc++abi1-X.Y.install.in b/debian/libc++abi1-X.Y.install.in
index a7e1c070..6e27733d 100644
--- a/debian/libc++abi1-X.Y.install.in
+++ b/debian/libc++abi1-X.Y.install.in
@@ -1 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi.so.*
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.*
diff --git a/debian/libllvmlibc-X.Y-dev.install.in b/debian/libllvmlibc-X.Y-dev.install.in
index e8fe2fc3..cd6c1add 100644
--- a/debian/libllvmlibc-X.Y-dev.install.in
+++ b/debian/libllvmlibc-X.Y-dev.install.in
@@ -1 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libllvmlibc.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libllvmlibc.a
diff --git a/debian/libunwind-X.Y-dev.install.in b/debian/libunwind-X.Y-dev.install.in
index f01f1bb5..f22f67f2 100644
--- a/debian/libunwind-X.Y-dev.install.in
+++ b/debian/libunwind-X.Y-dev.install.in
@@ -1,5 +1,5 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so
+usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a
 usr/include/libunwind
 usr/lib/llvm-@LLVM_VERSION@/include/*unwind*
 usr/lib/llvm-@LLVM_VERSION@/include/mach-o/
diff --git a/debian/libunwind-X.Y.install.in b/debian/libunwind-X.Y.install.in
index 9857c78a..e26306e4 100644
--- a/debian/libunwind-X.Y.install.in
+++ b/debian/libunwind-X.Y.install.in
@@ -1 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so.*
+usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.*
diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 156d0132..3f742131 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -485,8 +485,8 @@ echo "Testing linking clang-cpp ..."
 
 clang-$VERSION -lclang-cpp$VERSION -v foo.cpp -o o &> /dev/null || true
 if ! ldd o 2>&1|grep -q  libclang-cpp; then
-    echo "Didn't link against libclang-cpp$VERSION"
-    exit 42
+	echo "Didn't link against libclang-cpp$VERSION"
+	exit 42
 fi
 ./o > /dev/null
 
@@ -955,7 +955,7 @@ if test ! -f /usr/lib/llvm-$VERSION/include/c++/v1/vector; then
     exit -1;
 fi
 
-if test ! -f /usr/lib/llvm-$VERSION/lib/$ARCH/libc++abi.so; then
+if test ! -f /usr/lib/llvm-$VERSION/lib/libc++abi.so; then
     echo "Install libc++abi-$VERSION-dev";
     exit -1;
 fi
@@ -1042,8 +1042,7 @@ EOF
 # Builds the std module
 clang++-$VERSION -std=c++20 \
 	-nostdinc++ \
-	-isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \
-    -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \
+	-isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \
 	-Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \
 	--precompile -o std.pcm \
 	-c /usr/lib/llvm-$VERSION/share/libc++/v1/std.cppm
@@ -1051,8 +1050,7 @@ clang++-$VERSION -std=c++20 \
 # Builds the std.compat module
 clang++-$VERSION -std=c++20 \
 	-nostdinc++ \
-	-isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \
-    -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \
+	-isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \
 	-Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \
 	--precompile -o std.compat.pcm \
 	-fmodule-file=std=std.pcm \
@@ -1161,8 +1159,7 @@ int main(void)
 clang-$VERSION -Wconversion -Werror foo.c &> /dev/null || true
 
 if test -f /usr/bin/g++; then
-g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -I/usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \
-    -L/usr/lib/llvm-$VERSION/lib/ \
+g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -L/usr/lib/llvm-$VERSION/lib/ \
     foo.cpp -nodefaultlibs -std=c++17 -lc++ -lc++abi -lm -lc -lgcc_s -lgcc|| true
 ./o > /dev/null
 fi
@@ -1182,7 +1179,6 @@ EOF
 clang-$VERSION -std=c++20 \
 	-nostdinc++ \
 	-isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \
-    -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \
 	-Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \
 	--precompile -o std.pcm \
 	-c /usr/lib/llvm-$VERSION/share/libc++/v1/std.cppm
@@ -1191,7 +1187,6 @@ clang-$VERSION -std=c++20 \
 clang-$VERSION -std=c++20 \
 	-nostdinc++ \
 	-isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \
-    -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \
 	-Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \
 	--precompile -o std.compat.pcm \
 	-fmodule-file=std=std.pcm \
@@ -1201,7 +1196,6 @@ clang-$VERSION -std=c++20 \
 clang-$VERSION -std=c++20 \
 	-nostdinc++ \
 	-isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \
-    -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \
 	-L /usr/lib/llvm-$VERSION/lib \
 	-fmodule-file=std=std.pcm \
 	-fmodule-file=std.compat=std.compat.pcm \
@@ -1425,7 +1419,7 @@ int main(int, char**) {
   return -2;
 }
 '> foo.cpp
-clang++-$VERSION foo.cpp /usr/lib/llvm-$VERSION/lib/$ARCH/libunwind.a -I/usr/include/libunwind/ -lpthread -ldl
+clang++-$VERSION foo.cpp /usr/lib/llvm-$VERSION/lib/libunwind.a -I/usr/include/libunwind/ -lpthread -ldl
 ./a.out||true
 clang++-$VERSION foo.cpp -unwindlib=libunwind -rtlib=compiler-rt -I/usr/include/libunwind -ldl
 ./a.out||true
diff --git a/debian/rules b/debian/rules
index c69c0730..6d7d3cf1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -829,8 +829,8 @@ endif
 	-DLIBOMP_OMPT_SUPPORT=OFF \
 	-DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \
 	$(CMAKE_EXTRA) \
-	-DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" \
-	-DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" \
+	-DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
+	-DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
 	-DCLANG_ENABLE_BOOTSTRAP=ON \
 	-DCLANG_BOOTSTRAP_TARGETS="$(ENABLED_STAGE2_CMAKE_BUILD_TARGETS)" \
 	-DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_DEFAULT_TARGET_ONLY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION;CMAKE_C_COMPILER_LAUNCHER;CMAKE_CXX_COMPILER_LAUNCHER" \
@@ -860,8 +860,8 @@ endif
 	-DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \
 	-DBOOTSTRAP_PYTHON_EXECUTABLE=/usr/bin/python3 \
 	$(BOOTSTRAP_CMAKE_EXTRA) \
-	-DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" \
-	-DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON"
+	-DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
+	-DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF"
 
 	FOUND_VERSION=`grep LLVM_VERSION_STRING build-llvm/include/llvm/Config/llvm-config.h|cut -d\" -f2`; \
 	if ! echo "$(LLVM_VERSION_FULL)"|grep "$$FOUND_VERSION"; then \
@@ -1180,7 +1180,7 @@ override_dh_auto_install:
 ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe))
 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 	# To fix custom-library-search-path
-	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/*/*.so
+	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so
 endif
 endif
 
@@ -1388,9 +1388,7 @@ override_dh_makeshlibs:
 
 override_dh_shlibdeps:
 # Ignore asan libraries. They would trigger dependencies to multiarch libraries
-	TRIPLE_CLANG_ARCH=`debian/tmp/usr/bin/clang-$(LLVM_VERSION) -dumpmachine`; \
-	echo "TRIPLE_CLANG_ARCH = $$TRIPLE_CLANG_ARCH"; \
-	dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/$$TRIPLE_CLANG_ARCH/ -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so
+	dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so
 
 override_dh_installman:
 	if test -f lld/docs/ld.lld.1; then \
@@ -1441,9 +1439,7 @@ override_dh_install:
 ifeq (${POLLY_ENABLE},yes)
 # only for arch:any builds
 ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(packages)))
-	if  test -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/PollyConfig.cmake; then \
-	dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly; \
-	fi
+	dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly
 # On old Debian & Ubuntu, removing the files is necessary
 	rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 else
@@ -1454,12 +1450,6 @@ endif
 # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages
 # These packages are arch: all, so only do so when the packages are built
 ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(packages)))
-# Keep only one copy of the wasm files
-	rm -rf \
-		$(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/ \
-		$(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/wasm32-wasi/ \
-		$(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/wasm32-wasi/
-
 	mkdir -p $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1
 	if test -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h; then \
 		mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h \