diff --git a/ChangeLog b/ChangeLog
index 406710870b..863869de52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* Makerules (build-shlib): Work around different order of
+	processing of -B option in different gcc versions.
+
 	* posix/regex.c: Fix alignment problem.
 	Patch by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
diff --git a/Makerules b/Makerules
index 5c9b757ea9..5f938dd102 100644
--- a/Makerules
+++ b/Makerules
@@ -415,7 +415,8 @@ lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(+interp)
 
 define build-shlib
 $(LINK.o) -shared -Wl,-O1 -o $@ $(sysdep-LDFLAGS) $(config-LDFLAGS)  \
-	  $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) $(load-map-file) \
+	  $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
+	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
 	  -Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \
 	  $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \
 	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \