diff -u gcc-4.5-4.5.3/debian/rules.defs gcc-4.5-4.5.3/debian/rules.defs
--- gcc-4.5-4.5.3/debian/rules.defs
+++ gcc-4.5-4.5.3/debian/rules.defs
@@ -259,11 +259,14 @@
 # FIXME: libjava is not ported for thumb, this hack only works for
 # separate gcj builds
 ifeq (,$(findstring gcj,$(PKGSOURCE)))
-  ifeq ($(distribution),Ubuntu)
-    with_arm_thumb := yes
-  endif
   ifeq ($(DEB_TARGET_ARCH),armhf)
     with_arm_thumb := yes
+  else
+    ifeq ($(distribution)-$(DEB_TARGET_ARCH),Ubuntu-armel)
+      ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise))
+        with_arm_thumb := yes
+      endif
+    endif
   endif
 endif
 
@@ -280,7 +283,11 @@
 ifeq ($(DEB_TARGET_ARCH),armhf)
   float_abi := hard
 else ifneq (,$(filter $(distribution)-$(DEB_TARGET_ARCH), Ubuntu-armel))
-  float_abi := softfp
+  ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise))
+    float_abi := softfp
+  else
+    float_abi := soft
+  endif
 else ifneq (,$(filter $(DEB_TARGET_ARCH), arm armel))
   float_abi := soft
 endif
diff -u gcc-4.5-4.5.3/debian/changelog gcc-4.5-4.5.3/debian/changelog
--- gcc-4.5-4.5.3/debian/changelog
+++ gcc-4.5-4.5.3/debian/changelog
@@ -1,3 +1,9 @@
+gcc-4.5 (4.5.3-12ubuntu3) quantal; urgency=low
+
+  * Build on armel for armv5t instead of armv7-a, matching gcc-4.7.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 24 Jun 2012 13:58:11 -0600
+
 gcc-4.5 (4.5.3-12ubuntu2) precise; urgency=low
 
   * Pursuant to the cross-distro consensus on the armhf linker path,
diff -u gcc-4.5-4.5.3/debian/rules2 gcc-4.5-4.5.3/debian/rules2
--- gcc-4.5-4.5.3/debian/rules2
+++ gcc-4.5-4.5.3/debian/rules2
@@ -334,18 +334,36 @@
   CONFARGS += --disable-sjlj-exceptions
   # FIXME: libjava is not ported for thumb, this hack only works for
   # separate gcj builds
-  # any Ubuntu arch or Debian armhf arch
-  ifneq (,$(filter Ubuntu-% Debian-armhf,$(distribution)-$(DEB_TARGET_ARCH)))
+  ifneq (,$(filter armhf,$(DEB_TARGET_ARCH)))
     ifneq (,$(findstring gcj,$(PKGSOURCE)))
-      CONFARGS += --with-arch=armv6
+      with_arm_arch = armv6
     else
-      CONFARGS += --with-arch=armv7-a
+      with_arm_arch = armv7-a
     endif
-    CONFARGS += --with-float=$(float_abi) --with-fpu=vfpv3-d16
+    with_arm_fpu = vfpv3-d16
   else
-    # Debian armel
-    CONFARGS += --with-arch=armv4t --with-float=$(float_abi)
+    # armel
+    ifeq ($(distribution),Debian)
+      with_arm_arch = armv4t
+    else ifneq (,$(filter $(distrelease),karmic))
+      with_arm_arch = armv6
+      with_arm_fpu = vfpv3-d16
+    else ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise))
+      ifneq (,$(findstring gcj,$(PKGSOURCE)))
+        with_arm_arch = armv6
+      else
+        with_arm_arch = armv7-a
+      endif
+      with_arm_fpu = vfpv3-d16
+    else
+      with_arm_arch = armv5t  # starting with quantal
+    endif
+  endif
+  CONFARGS += --with-arch=$(with_arm_arch)
+  ifneq (,$(with_arm_fpu))
+    CONFARGS += --with-fpu=$(with_arm_fpu)
   endif
+  CONFARGS += --with-float=$(float_abi)
   ifeq ($(with_arm_thumb),yes)
     CONFARGS += --with-mode=thumb
   endif