From 6c7170b923273c768a8afcc7f9f83803f9ebf74e Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 26 Mar 2011 15:29:53 +0000
Subject: [PATCH] Revert "kernel: remove all local symbols from kernel modules
 at link time to reduce their size" Use -x when stripping kernel modules
 instead

SVN-Revision: 26305
---
 rules.mk                                              |  2 +-
 .../015-strip_module_local_symbols.patch              | 11 -----------
 .../patches-2.6.37/950-powerpc_crtsavres_prereq.patch |  2 +-
 .../015-strip_module_local_symbols.patch              | 11 -----------
 .../patches-2.6.38/950-powerpc_crtsavres_prereq.patch |  2 +-
 5 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 target/linux/generic/patches-2.6.37/015-strip_module_local_symbols.patch
 delete mode 100644 target/linux/generic/patches-2.6.38/015-strip_module_local_symbols.patch

diff --git a/rules.mk b/rules.mk
index cddfdf5d30..428258f5f4 100644
--- a/rules.mk
+++ b/rules.mk
@@ -211,7 +211,7 @@ else
   RSTRIP:= \
     NM="$(TARGET_CROSS)nm" \
     STRIP="$(STRIP)" \
-    STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded -R .comment -R .pdr -R .mdebug.abi32 -R .note.gnu.build-id -R .gnu.attributes -R .reginfo" \
+    STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded -R .comment -R .pdr -R .mdebug.abi32 -R .note.gnu.build-id -R .gnu.attributes -R .reginfo -x" \
     $(SCRIPT_DIR)/rstrip.sh
 endif
 
diff --git a/target/linux/generic/patches-2.6.37/015-strip_module_local_symbols.patch b/target/linux/generic/patches-2.6.37/015-strip_module_local_symbols.patch
deleted file mode 100644
index 2e2508125d..0000000000
--- a/target/linux/generic/patches-2.6.37/015-strip_module_local_symbols.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -360,7 +360,7 @@
- KBUILD_AFLAGS   := -D__ASSEMBLY__
- KBUILD_AFLAGS_MODULE  := -DMODULE
- KBUILD_CFLAGS_MODULE  := -DMODULE
--KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
-+KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -x
- 
- # Read KERNELRELEASE from include/config/kernel.release (if it exists)
- KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
diff --git a/target/linux/generic/patches-2.6.37/950-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-2.6.37/950-powerpc_crtsavres_prereq.patch
index 47f796a909..861a6b7538 100644
--- a/target/linux/generic/patches-2.6.37/950-powerpc_crtsavres_prereq.patch
+++ b/target/linux/generic/patches-2.6.37/950-powerpc_crtsavres_prereq.patch
@@ -3,7 +3,7 @@
 @@ -361,6 +361,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__
  KBUILD_AFLAGS_MODULE  := -DMODULE
  KBUILD_CFLAGS_MODULE  := -DMODULE
- KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -x
+ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
 +KBUILD_LDFLAGS_MODULE_PREREQ	:= 
  
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)
diff --git a/target/linux/generic/patches-2.6.38/015-strip_module_local_symbols.patch b/target/linux/generic/patches-2.6.38/015-strip_module_local_symbols.patch
deleted file mode 100644
index 86a3e2f1f8..0000000000
--- a/target/linux/generic/patches-2.6.38/015-strip_module_local_symbols.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -361,7 +361,7 @@
- KBUILD_AFLAGS   := -D__ASSEMBLY__
- KBUILD_AFLAGS_MODULE  := -DMODULE
- KBUILD_CFLAGS_MODULE  := -DMODULE
--KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
-+KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -x
- 
- # Read KERNELRELEASE from include/config/kernel.release (if it exists)
- KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
diff --git a/target/linux/generic/patches-2.6.38/950-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-2.6.38/950-powerpc_crtsavres_prereq.patch
index 2d3a67d12b..402cd0cacb 100644
--- a/target/linux/generic/patches-2.6.38/950-powerpc_crtsavres_prereq.patch
+++ b/target/linux/generic/patches-2.6.38/950-powerpc_crtsavres_prereq.patch
@@ -3,7 +3,7 @@
 @@ -362,6 +362,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__
  KBUILD_AFLAGS_MODULE  := -DMODULE
  KBUILD_CFLAGS_MODULE  := -DMODULE
- KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -x
+ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
 +KBUILD_LDFLAGS_MODULE_PREREQ	:= 
  
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)
-- 
GitLab