[linux] 01/01: MIPS: libgcc: Fix ABI change in 4.6.2

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 9edbacb8a55ee2585207bb084b7f542c76e671f6
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Jun 17 01:50:50 2016 +0100

    MIPS: libgcc: Fix ABI change in 4.6.2
---
 debian/changelog                                   |   2 +-
 .../mips-libgcc-fix-abi-change-in-4.6.2.patch      | 106 +++++++++++++++++++++
 ... => mips-siginfo-fix-abi-change-in-4.6.2.patch} |   2 +-
 debian/patches/series                              |   3 +-
 4 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 671f277..ef4cf0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 linux (4.6.2-2) UNRELEASED; urgency=medium
 
-  * [mips*] Fix ABI change in 4.6.2
+  * [mips*] Fix ABI changes in 4.6.2
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 16 Jun 2016 12:37:27 +0100
 
diff --git a/debian/patches/debian/mips-libgcc-fix-abi-change-in-4.6.2.patch b/debian/patches/debian/mips-libgcc-fix-abi-change-in-4.6.2.patch
new file mode 100644
index 0000000..7c13a4f
--- /dev/null
+++ b/debian/patches/debian/mips-libgcc-fix-abi-change-in-4.6.2.patch
@@ -0,0 +1,106 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 17 Jun 2016 01:46:59 +0100
+Subject: MIPS: libgcc: Fix ABI change in 4.6.2
+Forwarded: not-needed
+
+Commit aedcfbe06558 ("MIPS: lib: Mark intrinsics notrace") causes the
+hashes of these functions to change, even though their ABI hasn't.
+Hide the 'notrace' from genksyms.
+
+---
+--- a/arch/mips/lib/ashldi3.c
++++ b/arch/mips/lib/ashldi3.c
+@@ -2,6 +2,11 @@
+ 
+ #include "libgcc.h"
+ 
++#ifdef __GENKSYMS__
++#undef notrace
++#define notrace
++#endif
++
+ long long notrace __ashldi3(long long u, word_type b)
+ {
+ 	DWunion uu, w;
+--- a/arch/mips/lib/ashrdi3.c
++++ b/arch/mips/lib/ashrdi3.c
+@@ -2,6 +2,11 @@
+ 
+ #include "libgcc.h"
+ 
++#ifdef __GENKSYMS__
++#undef notrace
++#define notrace
++#endif
++
+ long long notrace __ashrdi3(long long u, word_type b)
+ {
+ 	DWunion uu, w;
+--- a/arch/mips/lib/bswapdi.c
++++ b/arch/mips/lib/bswapdi.c
+@@ -1,5 +1,10 @@
+ #include <linux/module.h>
+ 
++#ifdef __GENKSYMS__
++#undef notrace
++#define notrace
++#endif
++
+ unsigned long long notrace __bswapdi2(unsigned long long u)
+ {
+ 	return (((u) & 0xff00000000000000ull) >> 56) |
+--- a/arch/mips/lib/bswapsi.c
++++ b/arch/mips/lib/bswapsi.c
+@@ -1,5 +1,10 @@
+ #include <linux/module.h>
+ 
++#ifdef __GENKSYMS__
++#undef notrace
++#define notrace
++#endif
++
+ unsigned int notrace __bswapsi2(unsigned int u)
+ {
+ 	return (((u) & 0xff000000) >> 24) |
+--- a/arch/mips/lib/cmpdi2.c
++++ b/arch/mips/lib/cmpdi2.c
+@@ -2,6 +2,11 @@
+ 
+ #include "libgcc.h"
+ 
++#ifdef __GENKSYMS__
++#undef notrace
++#define notrace
++#endif
++
+ word_type notrace __cmpdi2(long long a, long long b)
+ {
+ 	const DWunion au = {
+--- a/arch/mips/lib/lshrdi3.c
++++ b/arch/mips/lib/lshrdi3.c
+@@ -2,6 +2,11 @@
+ 
+ #include "libgcc.h"
+ 
++#ifdef __GENKSYMS__
++#undef notrace
++#define notrace
++#endif
++
+ long long notrace __lshrdi3(long long u, word_type b)
+ {
+ 	DWunion uu, w;
+--- a/arch/mips/lib/ucmpdi2.c
++++ b/arch/mips/lib/ucmpdi2.c
+@@ -2,6 +2,11 @@
+ 
+ #include "libgcc.h"
+ 
++#ifdef __GENKSYMS__
++#undef notrace
++#define notrace
++#endif
++
+ word_type notrace __ucmpdi2(unsigned long long a, unsigned long long b)
+ {
+ 	const DWunion au = {.ll = a};
diff --git a/debian/patches/debian/mips-fix-abi-change-in-4.6.2.patch b/debian/patches/debian/mips-siginfo-fix-abi-change-in-4.6.2.patch
similarity index 97%
rename from debian/patches/debian/mips-fix-abi-change-in-4.6.2.patch
rename to debian/patches/debian/mips-siginfo-fix-abi-change-in-4.6.2.patch
index d9664d2..099c5dc 100644
--- a/debian/patches/debian/mips-fix-abi-change-in-4.6.2.patch
+++ b/debian/patches/debian/mips-siginfo-fix-abi-change-in-4.6.2.patch
@@ -1,6 +1,6 @@
 From: Ben Hutchings <ben at decadent.org.uk>
 Date: Thu, 16 Jun 2016 11:32:49 +0100
-Subject: MIPS: Fix ABI change in 4.6.2
+Subject: MIPS: siginfo: Fix ABI change in 4.6.2
 Forwarded: not-needed
 
 genksyms only looks at the (preprocessed) token stream of a struct
diff --git a/debian/patches/series b/debian/patches/series
index 453515f..0810e58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -114,7 +114,8 @@ bugfix/all/tipc-fix-an-infoleak-in-tipc_nl_compat_link_dump.patch
 bugfix/all/rds-fix-an-infoleak-in-rds_inc_info_copy.patch
 
 # ABI maintenance
-debian/mips-fix-abi-change-in-4.6.2.patch
+debian/mips-siginfo-fix-abi-change-in-4.6.2.patch
+debian/mips-libgcc-fix-abi-change-in-4.6.2.patch
 
 # Tools bug fixes
 bugfix/all/usbip-document-tcp-wrappers.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git