diff --git a/debian/changelog b/debian/changelog index e26699a3f..26443a1aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 28 Jan 2015 17:52:39 +0000 + linux (3.16.7-ckt4-2) unstable; urgency=medium [ Ian Campbell ] diff --git a/debian/patches/bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch b/debian/patches/bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch new file mode 100644 index 000000000..1a74ca0bd --- /dev/null +++ b/debian/patches/bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch @@ -0,0 +1,40 @@ +From: Michael Karcher +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@vger.kernel.org +Cc: Matt Fleming +Reported-by: John Paul Adrian Glaubitz +Signed-off-by: Michael Karcher +Signed-off-by: Steven Rostedt +--- + 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+)"; diff --git a/debian/patches/series b/debian/patches/series index e18b22475..4c30e86ed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -494,3 +494,4 @@ bugfix/all/crypto-include-crypto-module-prefix-in-template.patch 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