--- redhat-rpm-config-8.0.45/config.guess.arm	2003-07-07 04:32:13.000000000 +0200
+++ redhat-rpm-config-8.0.45/config.guess	2007-06-09 13:23:16.000000000 +0200
@@ -809,7 +809,14 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep __ARM_EABI__ >/dev/null
+	then
+		echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
+	else
+		echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnueabi
+	fi
 	exit 0 ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
--- redhat-rpm-config-8.0.45/macros.arm	2007-06-09 13:22:58.000000000 +0200
+++ redhat-rpm-config-8.0.45/macros	2007-06-09 13:23:16.000000000 +0200
@@ -5,7 +5,6 @@
 #
 %_vendor		redhat
 %_os			linux
-%_gnu			-gnu
 %_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
 
 %fedora			8
--- redhat-rpm-config-8.0.45/rpmrc.arm	2006-02-04 00:00:26.000000000 +0100
+++ redhat-rpm-config-8.0.45/rpmrc	2007-06-09 13:27:54.000000000 +0200
@@ -43,6 +43,10 @@
 optflags: armv3l %{__global_cflags} -fsigned-char -march=armv3
 optflags: armv4b %{__global_cflags} -fsigned-char -march=armv4
 optflags: armv4l %{__global_cflags} -fsigned-char -march=armv4
+optflags: armv4tl %{__global_cflags} -march=armv4t
+optflags: armv5tel %{__global_cflags} -march=armv5te
+optflags: armv5tejl %{__global_cflags} -march=armv5te
+optflags: armv6l %{__global_cflags} -march=armv6
 
 optflags: atarist %{__global_cflags}
 optflags: atariste %{__global_cflags}