--- a/branches/sid/gcc-4.6/debian/rules.defs
+++ b/branches/sid/gcc-4.6/debian/rules.defs
@@ -1110,20 +1110,6 @@ ifeq ($(distribution),Ubuntu)
 endif
 $(foreach x,32 64 n32 hf sf,$(eval $(call gen_biarch,$(x))))
 
-ifneq (,$(filter yes,$(biarch32) $(biarch64) $(biarchn32) $(biarchhf) $(biarchsf)))
-  multilib := yes
-endif
-
-multilib_archs = $(sort $(subst /, , $(biarch64archs) $(biarch32archs) $(biarchn32archs) $(biarchhfarchs) $(biarchsfarchs)))
-
-biarchsubdirs := \
-  $(if $(filter yes,$(biarch64)),$(biarch64subdir),) \
-  $(if $(filter yes,$(biarch32)),$(biarch32subdir),) \
-  $(if $(filter yes,$(biarchn32)),$(biarchn32subdir),) \
-  $(if $(filter yes,$(biarchhf)),$(biarchhfsubdir),) \
-  $(if $(filter yes,$(biarchsf)),$(biarchsfsubdir),)
-biarchsubdirs := {$(strip $(shell echo $(biarchsubdirs) | tr " " ","))}
-
 #ifeq ($(DEB_TARGET_ARCH),ia64)
 #  biarch32 := yes
 #endif
@@ -1231,6 +1217,20 @@ ifeq ($(no_biarch_libs),yes)
 
 endif
 
+ifneq (,$(filter yes,$(biarch32) $(biarch64) $(biarchn32) $(biarchhf) $(biarchsf)))
+  multilib := yes
+endif
+
+multilib_archs = $(sort $(subst /, , $(biarch64archs) $(biarch32archs) $(biarchn32archs) $(biarchhfarchs) $(biarchsfarchs)))
+
+biarchsubdirs := \
+  $(if $(filter yes,$(biarch64)),$(biarch64subdir),) \
+  $(if $(filter yes,$(biarch32)),$(biarch32subdir),) \
+  $(if $(filter yes,$(biarchn32)),$(biarchn32subdir),) \
+  $(if $(filter yes,$(biarchhf)),$(biarchhfsubdir),) \
+  $(if $(filter yes,$(biarchsf)),$(biarchsfsubdir),)
+biarchsubdirs := {$(strip $(shell echo $(biarchsubdirs) | tr " " ","))}
+
 ifeq ($(biarch32),yes)
   with_32bit_check := $(strip $(if $(wildcard build/runcheck.out), \
 				$(shell cat build/runcheck.out), \