--- /root/work_upstream/original_portage/sys-libs/glibc/files/eblits/common.eblit	2009-12-01 06:06:49.000000000 +0100
+++ /usr/portage/sys-libs/glibc/files/eblits/common.eblit	2010-06-10 20:26:32.202607046 +0200
@@ -129,6 +132,9 @@ setup_flags() {
 							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a"
 						fi
 					;;
+					sparc32|sparcv8)
+						CTARGET_OPT="sparcv8-unknown-linux-gnu"
+					;;
 					*)
 						if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then
 							CTARGET_OPT="sparcv9v2-unknown-linux-gnu"
@@ -136,6 +142,8 @@ setup_flags() {
 							CTARGET_OPT="sparcv9v-unknown-linux-gnu"
 						elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then
 							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
+						elif is-flagq "-mcpu=v8" || is-flagq "-mcpu=supersparc" || is-flagq "-mcpu=hypersparc" || is-flagq "-mno-v8plus"; then
+						     	CTARGET_OPT="sparcv8-unknown-linux-gnu"
 						else
 							CTARGET_OPT="sparcv9-unknown-linux-gnu"
 						fi
@@ -150,6 +158,8 @@ setup_flags() {
 					CTARGET_OPT="sparcv9b-unknown-linux-gnu"
 				elif { is_crosscompile && want_nptl; } || is-flagq "-mcpu=ultrasparc2" || is-flagq "-mcpu=ultrasparc"; then
 					CTARGET_OPT="sparcv9-unknown-linux-gnu"
+				elif [[ ${ABI} = "sparc32" ]] || [[ ${ABI} = "sparcv8" ]] || is-flagq "-mcpu=v8" || is-flagq "-mcpu=supersparc" || is-flagq "-mcpu=hypersparc" || is-flagq "-mno-v8plus"; then
+				     	CTARGET_OPT="sparcv8-unknown-linux-gnu"
 				fi
 			fi
 		;;