--- gentoo.config-1.0.4	2023-02-04 22:43:39.810152826 -0500
+++ gentoo.config-1.0.5	2023-02-04 22:43:52.490275815 -0500
@@ -93,11 +93,11 @@ linux)
 		avr*)         machine="generic32 -DL_ENDIAN";;
 		bfin*)        machine="generic32 -DL_ENDIAN";;
 	#	hppa64*)      machine=parisc64;;
 		hppa*)        machine="generic32 -DB_ENDIAN";;
 		i[0-9]86*|\
-		x86_64*:x86)  machine=x86;;
+		x86_64*:x86)  [[ "x$CC" = "xclang" || "x$CC" = "xclang "* ]] && machine=x86-clang || machine=x86;;
 		ia64*)        machine=ia64;;
 		loongarch64*) machine="loongarch64 -DL_ENDIAN" system=linux64;;
 		m68*)         machine="latomic -DB_ENDIAN";;
 		mips*el*:o32) machine="mips32 -DL_ENDIAN";;
 		mips*:o32)    machine="mips32 -DB_ENDIAN";;
@@ -122,12 +122,12 @@ linux)
 		sparc*v9*)    machine=sparcv9;;
 		sparc*v8*)    machine=sparcv8;;
 		sparc*)       machine=sparcv8;;
 		s390x*)       machine=s390x system=linux64;;
 		s390*)        machine="generic32 -DB_ENDIAN";;
-		x86_64*:x32)  machine=x32;;
-		x86_64*)      machine=x86_64;;
+		x86_64*:x32)  [[ "x$CC" = "xclang" || "x$CC" = "xclang "* ]] && machine=x32-clang || machine=x32;;
+		x86_64*)  [[ "x$CC" = "xclang" || "x$CC" = "xclang "* ]] && machine=x86_64-clang || machine=x86_64;;
 	esac
 	;;
 BSD)
 	case ${chost_machine} in
 		alpha*)       machine=generic64;;