From f6cc1119d29100d39e3a05c5545e7a2dc06383fe Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 18 Jan 2015 20:48:01 +0000 Subject: [PATCH] [sh4] ftrace: Remove -m32 option from recordmcount.pl (Closes: #775611) svn path=/dists/trunk/linux/; revision=22278 --- debian/changelog | 3 +++ ...pl-there-is-no-m32-option-on-super-h.patch | 22 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) create mode 100644 debian/patches/bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch diff --git a/debian/changelog b/debian/changelog index 72f54c9ad..2ef616f69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ linux (3.18.3-1~exp1) UNRELEASED; urgency=medium (Closes: #770102) * [hppa] Create build-dependencies on binutils-hppa64 and gcc-4.9-hppa64 + [ Ben Hutchings ] + * [sh4] ftrace: Remove -m32 option from recordmcount.pl (Closes: #775611) + -- Ian Campbell Thu, 11 Dec 2014 20:37:22 +0000 linux (3.18-1~exp1) experimental; urgency=medium 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..a93937487 --- /dev/null +++ b/debian/patches/bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch @@ -0,0 +1,22 @@ +Subject: scripts/recordmcount.pl: There is no -m32 option on Super-H +From: Michael Karcher +Date: Sat, 17 Jan 2015 23:36:15 +0000 +Origin: http://marc.info/?l=linux-kernel&m=142153803030712&w=2 + +Signed-Off-By: Michael Karcher +--- + scripts/recordmcount.pl | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl +index 56ea99a..537c38c 100755 +--- a/scripts/recordmcount.pl ++++ b/scripts/recordmcount.pl +@@ -255,7 +255,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 9c9d9835f..8921c4ebe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -76,3 +76,4 @@ features/all/mmc_block-increase-max_devices.patch features/all/of-add-optional-options-parameter-to-of_find_node_by.patch features/all/of-support-passing-console-options-with-stdout-path.patch features/all/efi-expose-underlying-uefi-firmware-platform-size-to.patch +bugfix/sh4/scripts-recordmcount.pl-there-is-no-m32-option-on-super-h.patch