From b206eb625b3e73d000b003b664df9b587c824329 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 2 Feb 2009 16:45:09 +0000
Subject: [PATCH] merge r14357,r14358 to 8.09

SVN-Revision: 14359
---
 include/kernel-defaults.mk   | 6 ++++--
 toolchain/binutils/Config.in | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 90761bf014..ee929261db 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -89,11 +89,13 @@ define Kernel/CompileModules/Default
 	+$(MAKE) $(KERNEL_MAKEOPTS) modules
 endef
 
+OBJCOPY_STRIP = -R .reginfo -R .note -R .comment -R .mdebug -R .note.gnu.build-id
+
 define Kernel/CompileImage/Default
 	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),,rm -f $(TARGET_DIR)/init)
 	+$(MAKE) $(KERNEL_MAKEOPTS) $(KERNELNAME)
-	$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
-	$(KERNEL_CROSS)objcopy -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.elf
+	$(KERNEL_CROSS)objcopy -O binary $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
+	$(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.elf
 endef
 
 define Kernel/Clean/Default
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 3a28b6553d..6a655a6647 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -28,4 +28,5 @@ config BINUTILS_VERSION
 	default "2.17"            if BINUTILS_VERSION_2_17
 	default "2.18"            if BINUTILS_VERSION_2_18
 	default "2.18"            if TARGET_avr32
+	default "2.18"            if TARGET_ppc44x || TARGET_ppc40x
 	default "2.17"
-- 
2.30.2