[kernel] r22294 - in dists/sid/linux/debian: . patches patches/bugfix/sh4

[Ben Hutchings]

Author: benh
Date: Wed Jan 28 17:53:17 2015
New Revision: 22294

Log:
[sh4] ftrace: Remove -m32 option from recordmcount.pl (Closes: #775611)

Added:
   dists/sid/linux/debian/patches/bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Wed Jan 28 03:37:06 2015	(r22293)
+++ dists/sid/linux/debian/changelog	Wed Jan 28 17:53:17 2015	(r22294)
@@ -1,3 +1,9 @@
+linux (3.16.7-ckt4-3) UNRELEASED; urgency=medium
+
+  * [sh4] ftrace: Remove -m32 option from recordmcount.pl (Closes: #775611)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2015 17:52:39 +0000
+
 linux (3.16.7-ckt4-2) unstable; urgency=medium
 
   [ Ian Campbell ]

Added: dists/sid/linux/debian/patches/bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch	Wed Jan 28 17:53:17 2015	(r22294)
@@ -0,0 +1,40 @@
+From: Michael Karcher <kernel at mkarcher.dialup.fu-berlin.de>
+Date: Sun, 18 Jan 2015 00:36:15 +0100
+Subject: scripts/recordmcount.pl: There is no -m32 gcc option on Super-H
+ anymore
+Origin: https://git.kernel.org/linus/1caf6aaaa47471831d77c75f094d4e00ad1ec808
+
+Compiling SH with gcc-4.8 fails due to the -m32 option not being
+supported.
+
+From http://buildd.debian-ports.org/status/fetch.php?pkg=linux&arch=sh4&ver=3.16.7-ckt4-1&stamp=1421425783
+
+      CC      init/main.o
+    gcc-4.8: error: unrecognized command line option '-m32'
+    ld: cannot find init/.tmp_mc_main.o: No such file or directory
+    objcopy: 'init/.tmp_mx_main.o': No such file
+    rm: cannot remove 'init/.tmp_mx_main.o': No such file or directory
+    rm: cannot remove 'init/.tmp_mc_main.o': No such file or directory
+
+Link: http://lkml.kernel.org/r/1421537778-29001-1-git-send-email-kernel@mkarcher.dialup.fu-berlin.de
+Link: http://lkml.kernel.org/r/54BCBDD4.10102@physik.fu-berlin.de
+
+Cc: stable at vger.kernel.org
+Cc: Matt Fleming <matt at console-pimps.org>
+Reported-by: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
+Signed-off-by: Michael Karcher <kernel at mkarcher.dialup.fu-berlin.de>
+Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
+---
+ scripts/recordmcount.pl | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/scripts/recordmcount.pl
++++ b/scripts/recordmcount.pl
+@@ -262,7 +262,6 @@ if ($arch eq "x86_64") {
+     # force flags for this arch
+     $ld .= " -m shlelf_linux";
+     $objcopy .= " -O elf32-sh-linux";
+-    $cc .= " -m32";
+ 
+ } elsif ($arch eq "powerpc") {
+     $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)";

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Wed Jan 28 03:37:06 2015	(r22293)
+++ dists/sid/linux/debian/patches/series	Wed Jan 28 17:53:17 2015	(r22294)
@@ -494,3 +494,4 @@
 bugfix/all/crypto-add-missing-crypto-module-aliases.patch
 bugfix/x86/kvm-x86-fix-of-previously-incomplete-fix-for-cve-201.patch
 bugfix/x86/kvm-x86-sysenter-emulation-is-broken.patch
+bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch