summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2016-12-05 00:16:58 (GMT)
committerAlexey Neyman <stilor@att.net>2016-12-06 18:33:20 (GMT)
commit25f5b82d2e76971aa1c679c347fb3d3493f426b8 (patch)
treefa54e698cce9a56bf70c33af7f7c9cfb68657e17
parentf6ea9a68b26830f72f8f5242aba9b950f2e4da78 (diff)
Update Linux kernel patches.
3.0.9/100-headers-install-fix*.patch picked up upstream. The Cygwin fix is needed for Cygwin on all kernel versions. Signed-off-by: Alexey Neyman <stilor@att.net>
-rw-r--r--patches/linux/3.0.9/100-headers_install-fix-__packed-in-exported-kernel-head.patch38
-rw-r--r--patches/linux/3.10.104/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch (renamed from patches/linux/4.2.3/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch)0
-rw-r--r--patches/linux/3.12.67/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
-rw-r--r--patches/linux/3.16.38/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
-rw-r--r--patches/linux/3.18.44/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
-rw-r--r--patches/linux/3.2.83/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
-rw-r--r--patches/linux/3.4.113/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
-rw-r--r--patches/linux/4.1.35/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
-rw-r--r--patches/linux/4.4.32/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
-rw-r--r--patches/linux/4.7.10/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
-rw-r--r--patches/linux/4.8.8/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch16
11 files changed, 144 insertions, 38 deletions
diff --git a/patches/linux/3.0.9/100-headers_install-fix-__packed-in-exported-kernel-head.patch b/patches/linux/3.0.9/100-headers_install-fix-__packed-in-exported-kernel-head.patch
deleted file mode 100644
index 8c187c5..0000000
--- a/patches/linux/3.0.9/100-headers_install-fix-__packed-in-exported-kernel-head.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit f210735fe2f17a6225432ee3d1239bcf23a8659c
-Author: Markus Trippelsdorf <markus@trippelsdorf.de>
-Date: Fri Jun 24 15:51:00 2011 +0200
-
- headers_install: fix __packed in exported kernel headers
-
- checkpatch.pl warns about using __attribute__((packed)) in kernel
- headers: "__packed is preferred over __attribute__((packed))". If one
- follows that advice it could cause problems in the exported header
- files, because the outside world doesn't know about this shortcut.
-
- For example busybox will fail to compile:
- CC miscutils/ubi_attach_detach.o
- In file included from miscutils/ubi_attach_detach.c:27:0:
- /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
- /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
- ...
-
- Fix the problem by substituting __packed with __attribute__((packed)) in
- the header_install.pl script.
-
- Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
- CC: Joe Perches <joe@perches.com>
- Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
- Signed-off-by: Michal Marek <mmarek@suse.cz>
-
-diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
-index efb3be1..48462be 100644
---- a/scripts/headers_install.pl
-+++ b/scripts/headers_install.pl
-@@ -35,6 +35,7 @@ foreach my $file (@files) {
- $line =~ s/([\s(])__iomem\s/$1/g;
- $line =~ s/\s__attribute_const__\s/ /g;
- $line =~ s/\s__attribute_const__$//g;
-+ $line =~ s/\b__packed\b/__attribute__((packed))/g;
- $line =~ s/^#include <linux\/compiler.h>//;
- $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
- $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
diff --git a/patches/linux/4.2.3/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/3.10.104/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
index 7b6ee5a..7b6ee5a 100644
--- a/patches/linux/4.2.3/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
+++ b/patches/linux/3.10.104/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
diff --git a/patches/linux/3.12.67/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/3.12.67/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/3.12.67/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {
diff --git a/patches/linux/3.16.38/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/3.16.38/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/3.16.38/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {
diff --git a/patches/linux/3.18.44/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/3.18.44/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/3.18.44/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {
diff --git a/patches/linux/3.2.83/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/3.2.83/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/3.2.83/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {
diff --git a/patches/linux/3.4.113/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/3.4.113/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/3.4.113/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {
diff --git a/patches/linux/4.1.35/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/4.1.35/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/4.1.35/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {
diff --git a/patches/linux/4.4.32/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/4.4.32/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/4.4.32/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {
diff --git a/patches/linux/4.7.10/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/4.7.10/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/4.7.10/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {
diff --git a/patches/linux/4.8.8/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch b/patches/linux/4.8.8/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
new file mode 100644
index 0000000..7b6ee5a
--- /dev/null
+++ b/patches/linux/4.8.8/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
@@ -0,0 +1,16 @@
+--- linux-4.2/arch/x86/tools/relocs.c.orig 2015-10-20 22:36:03.075546600 +0100
++++ linux-4.2/arch/x86/tools/relocs.c 2015-10-20 22:36:04.934950000 +0100
+@@ -187,6 +187,13 @@
+ return name;
+ }
+
++/* Hack for Cygwin */
++#if ELF_BITS == 64
++#if !defined(R_X86_64_JUMP_SLOT) && defined(R_X86_64_JMP_SLOT)
++#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT
++#endif
++#endif
++
+ static const char *rel_type(unsigned type)
+ {
+ static const char *type_name[] = {