diff -urN gcc-4.2-4.2-20070609/debian/README.cross gcc-4.2-4.2-20070609.cross/debian/README.cross
--- gcc-4.2-4.2-20070609/debian/README.cross	2007-06-25 12:48:45.000000000 +0000
+++ gcc-4.2-4.2-20070609.cross/debian/README.cross	2007-06-26 15:27:20.000000000 +0000
@@ -108,17 +108,12 @@
 exists, GCC_TARGET is used.
 
 Run debian/rules control. This will change debian/control file,
-adjusting build-depends.  By default, the packages will depend on the
-system -base package.  This means future upgrades of the system gcc
-will require you to keep your cross compilers in sync by rebuilding.
-If you want to depend on a separate -base package for your cross
-compiler, specify DEB_CROSS_INDEPENDENT=yes on the command line,
+adjusting build-depends.  By default, the packages will not depend on the
+system -base package. A variable DEB_CROSS_INDEPENDENT has been merged with DEB_CROSS variable.
 
 You can then build with either
 
 $ GCC_TARGET=[arch] dpkg-buildpackage -rfakeroot
-or
-$ GCC_TARGET=[arch] DEB_CROSS_INDEPENDENT=yes dpkg-buildpackage -rfakeroot
 
 3. Using crosshurd
 
diff -urN gcc-4.2-4.2-20070609/debian/control.m4 gcc-4.2-4.2-20070609.cross/debian/control.m4
--- gcc-4.2-4.2-20070609/debian/control.m4	2007-06-25 12:48:45.000000000 +0000
+++ gcc-4.2-4.2-20070609.cross/debian/control.m4	2007-06-26 15:27:20.000000000 +0000
@@ -96,7 +96,6 @@
 ifenabled(`gccxbase',`
 dnl override default base package dependencies to cross version
 dnl This creates a toolchain that doesnt depend on the system -base packages
-dnl set via DEB_CROSS_INDEPENDENT=yes
 define(`BASETARGET', `PV`'TS')
 define(`BASEDEP', `gcc`'BASETARGET-base (= ${gcc:Version})')
 define(`SOFTBASEDEP', `gcc`'BASETARGET-base (>= ${gcc:SoftVersion})')
diff -urN gcc-4.2-4.2-20070609/debian/rules.conf gcc-4.2-4.2-20070609.cross/debian/rules.conf
--- gcc-4.2-4.2-20070609/debian/rules.conf	2007-06-25 12:48:45.000000000 +0000
+++ gcc-4.2-4.2-20070609.cross/debian/rules.conf	2007-06-26 15:27:20.000000000 +0000
@@ -368,10 +368,7 @@
 
 ifdef DEB_CROSS
   languages = c c++ objc objpp
-  addons = libgcc lib64gcc libcxx lib64cxx cdev c++dev libobjc objcdev objppdev
-  ifdef DEB_CROSS_INDEPENDENT
-    addons += gccxbase
-  endif
+  addons = libgcc lib64gcc libcxx lib64cxx cdev c++dev libobjc objcdev objppdev gccxbase
 else
   languages = ada c c++ fortran java objc objpp treelang # pascal
   addons = gccbase cdev c++dev fdev fixincl libcxx lib4gcc \
diff -urN gcc-4.2-4.2-20070609/debian/rules.d/binary-libstdcxx-cross.mk gcc-4.2-4.2-20070609.cross/debian/rules.d/binary-libstdcxx-cross.mk
--- gcc-4.2-4.2-20070609/debian/rules.d/binary-libstdcxx-cross.mk	2007-06-25 12:48:45.000000000 +0000
+++ gcc-4.2-4.2-20070609.cross/debian/rules.d/binary-libstdcxx-cross.mk	2007-06-26 15:27:20.000000000 +0000
@@ -304,7 +304,7 @@
 	debian/dh_doclink -p$(p_dev) $(p_lib)
 	debian/dh_doclink -p$(p_pic) $(p_lib)
 	debian/dh_doclink -p$(p_dbg) $(p_lib)
-	cp -p $(srcdir)/libstdc++-v3/config/linker-map.gnu \
+	cp -p $(srcdir)/libstdc++-v3/config/abi/pre/gnu.ver \
 		$(d_pic)/$(gcc_lib_dir)/libstdc++_pic.map
 
 ifeq ($(with_cxxdev),yes)
diff -urN gcc-4.2-4.2-20070609/debian/rules.defs gcc-4.2-4.2-20070609.cross/debian/rules.defs
--- gcc-4.2-4.2-20070609/debian/rules.defs	2007-06-25 12:48:45.000000000 +0000
+++ gcc-4.2-4.2-20070609.cross/debian/rules.defs	2007-06-26 15:27:55.000000000 +0000
@@ -202,9 +202,8 @@
   with_bootstrap=$(WITH_BOOTSTRAP)
 endif
 
-# when DEB_CROSS_INDEPENDENT is set we build and depend on a 
 # separate -base package for the cross compiler.
-ifeq ($(DEB_CROSS_INDEPENDENT),yes)
+ifeq ($(DEB_CROSS),yes)
   with_gccxbase := yes
 endif
 
@@ -381,7 +380,11 @@
 
 # libssp -------------------
 with_ssp := yes
-ssp_no_archs = alpha hppa ia64 m68k mips mipsel hurd-i386
+ifndef DEB_CROSS
+  ssp_no_archs = alpha hppa ia64 m68k mips mipsel hurd-i386
+else
+  ssp_no_archs = arm armel alpha hppa ia64 m68k mips mipsel hurd-i386
+endif
 ifneq (, $(filter $(DEB_TARGET_ARCH),$(ssp_no_archs)))
   with_ssp := not available on $(DEB_TARGET_ARCH)
 endif
diff -urN gcc-4.2-4.2-20070609/debian/rules2 gcc-4.2-4.2-20070609.cross/debian/rules2
--- gcc-4.2-4.2-20070609/debian/rules2	2007-06-25 12:48:45.000000000 +0000
+++ gcc-4.2-4.2-20070609.cross/debian/rules2	2007-06-26 15:27:20.000000000 +0000
@@ -1023,7 +1023,7 @@
   p_doc  = gcc$(pkg_ver)-doc
   p_lgcc = libgcc$(GCC_SONAME)
 else
-  # only triggered if DEB_CROSS_INDEPENDENT set
+  # only triggered if DEB_CROSS set
   p_base = gcc$(pkg_ver)$(cross_bin_arch)-base
   p_cpp  = cpp$(pkg_ver)$(cross_bin_arch)
   p_gcc  = gcc$(pkg_ver)$(cross_bin_arch)