merge r14357,r14358 to 8.09

SVN-Revision: 14359

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 90761bf014944177854a1c914931665022de166d..ee929261db114956a8ea604ebbb272978a834450 100644 (file)
--- 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 3a28b6553d8a0805d30b2b50528b957303749670..6a655a6647e0f033705c26ea0a7e10f68cbb7bfa 100644 (file)
--- 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"