From 199d820a66ca39e45311689d7a8bbb56b8da8e1f Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 23 Jul 2007 01:12:08 -0700
Subject: [PATCH] --- yaml --- r: 62923 b: refs/heads/master c:
 114f51577724b782a30f4f5ceaee9880de93d776 h: refs/heads/master i:   62921:
 cf51a61025dce0301922158e9c6925201ec8bf4d   62919:
 ae9c0b811eb3c3d9fd211492bf822faf1dfac872 v: v3

---
 [refs]                         | 2 +-
 trunk/Makefile                 | 2 +-
 trunk/scripts/Makefile.build   | 2 +-
 trunk/scripts/Makefile.modpost | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0fdda0aba8d9..ba3cfca18795 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1edf1c00acf8d9b60d436d6a0a55e395353a446c
+refs/heads/master: 114f51577724b782a30f4f5ceaee9880de93d776
diff --git a/trunk/Makefile b/trunk/Makefile
index 23f81c9f698e..dfe3d1610a7b 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -299,7 +299,7 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C
 MODFLAGS	= -DMODULE
 CFLAGS_MODULE   = $(MODFLAGS)
 AFLAGS_MODULE   = $(MODFLAGS)
-LDFLAGS_MODULE  = -r
+LDFLAGS_MODULE  =
 CFLAGS_KERNEL	=
 AFLAGS_KERNEL	=
 
diff --git a/trunk/scripts/Makefile.build b/trunk/scripts/Makefile.build
index 3f7b451f3955..7fd6055bedfd 100644
--- a/trunk/scripts/Makefile.build
+++ b/trunk/scripts/Makefile.build
@@ -315,7 +315,7 @@ quiet_cmd_link_multi-y = LD      $@
 cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
 
 quiet_cmd_link_multi-m = LD [M]  $@
-cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
+cmd_link_multi-m = $(cmd_link_multi-y)
 
 # We would rather have a list of rules like
 # 	foo.o: $(foo-objs)
diff --git a/trunk/scripts/Makefile.modpost b/trunk/scripts/Makefile.modpost
index 1818c502007e..d988f5d21e3d 100644
--- a/trunk/scripts/Makefile.modpost
+++ b/trunk/scripts/Makefile.modpost
@@ -98,7 +98,7 @@ targets += $(modules:.ko=.mod.o)
 
 # Step 6), final link of the modules
 quiet_cmd_ld_ko_o = LD [M]  $@
-      cmd_ld_ko_o = $(LD) $(LDFLAGS) $(LDFLAGS_MODULE) -o $@		\
+      cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@		\
 			  $(filter-out FORCE,$^)
 
 $(modules): %.ko :%.o %.mod.o FORCE