Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #494 from stilor/cygwin-fixes
Cygwin fixes
- Loading branch information
Showing
18 changed files
with
241 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,3 +5,4 @@ conf | |
| zconf.lex.c | ||
| zconf.hash.c | ||
| zconf.tab.c | ||
| *.exe | ||
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| >From cfbc1c62a1ea5c5809d11b957ad29cd820db15b8 Mon Sep 17 00:00:00 2001 | ||
| From: Paul Eggert <address@hidden> | ||
| Date: Mon, 21 Mar 2016 00:49:17 -0700 | ||
| Subject: [PATCH] sys_select: port to new Cygwin | ||
|
|
||
| Problem reported by Ken Brown in: | ||
| https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00054.html | ||
| * lib/sys_select.in.h [__CYGWIN__]: Avoid "unknown type name" | ||
| diagnostics. | ||
| --- | ||
| ChangeLog | 8 ++++++++ | ||
| lib/sys_select.in.h | 10 ++++++---- | ||
| 2 files changed, 14 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/gettext-tools/gnulib-lib/sys_select.in.h b/gettext-tools/gnulib-lib/sys_select.in.h | ||
| index d6d3f9f..7281144 100644 | ||
| --- a/gettext-tools/gnulib-lib/sys_select.in.h | ||
| +++ b/gettext-tools/gnulib-lib/sys_select.in.h | ||
| @@ -81,8 +81,9 @@ | ||
| of 'struct timeval', and no definition of this type. | ||
| Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() | ||
| in <sys/time.h>. | ||
| - But avoid namespace pollution on glibc systems. */ | ||
| -# ifndef __GLIBC__ | ||
| + But avoid namespace pollution on glibc systems and "unknown type | ||
| + name" problems on Cygwin. */ | ||
| +# if !(defined __GLIBC__ || defined __CYGWIN__) | ||
| # include <sys/time.h> | ||
| # endif | ||
|
|
||
| @@ -100,10 +101,11 @@ | ||
| #endif | ||
|
|
||
| /* Get definition of 'sigset_t'. | ||
| - But avoid namespace pollution on glibc systems. | ||
| + But avoid namespace pollution on glibc systems and "unknown type | ||
| + name" problems on Cygwin. | ||
| Do this after the include_next (for the sake of OpenBSD 5.0) but before | ||
| the split double-inclusion guard (for the sake of Solaris). */ | ||
| -#if !(defined __GLIBC__ && !defined __UCLIBC__) | ||
| +#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) | ||
| # include <signal.h> | ||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| --- a/gettext-tools/gnulib-lib/sys_select.in.h | ||
| +++ b/gettext-tools/gnulib-lib/sys_select.in.h | ||
| @@ -82,8 +82,8 @@ | ||
| Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() | ||
| in <sys/time.h>. | ||
| But avoid namespace pollution on glibc systems and "unknown type | ||
| - name" problems on Cygwin. */ | ||
| -# if !(defined __GLIBC__ || defined __CYGWIN__) | ||
| + name" problems on newlib systems. */ | ||
| +# if !(defined __GLIBC__ || defined __NEWLIB__) | ||
| # include <sys/time.h> | ||
| # endif | ||
|
|
||
| @@ -102,10 +102,10 @@ | ||
|
|
||
| /* Get definition of 'sigset_t'. | ||
| But avoid namespace pollution on glibc systems and "unknown type | ||
| - name" problems on Cygwin. | ||
| + name" problems on newlib systems.. | ||
| Do this after the include_next (for the sake of OpenBSD 5.0) but before | ||
| the split double-inclusion guard (for the sake of Solaris). */ | ||
| -#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) | ||
| +#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__) | ||
| # include <signal.h> | ||
| #endif | ||
|
|
38 changes: 0 additions & 38 deletions
38
patches/linux/3.0.9/100-headers_install-fix-__packed-in-exported-kernel-head.patch
This file was deleted.
Oops, something went wrong.
File renamed without changes.
16 changes: 16 additions & 0 deletions
16
patches/linux/3.12.67/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
16 changes: 16 additions & 0 deletions
16
patches/linux/3.16.38/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
16 changes: 16 additions & 0 deletions
16
patches/linux/3.18.44/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
16 changes: 16 additions & 0 deletions
16
patches/linux/3.2.83/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
16 changes: 16 additions & 0 deletions
16
patches/linux/3.4.113/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
16 changes: 16 additions & 0 deletions
16
patches/linux/4.1.35/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
16 changes: 16 additions & 0 deletions
16
patches/linux/4.4.32/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
16 changes: 16 additions & 0 deletions
16
patches/linux/4.7.10/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
16 changes: 16 additions & 0 deletions
16
patches/linux/4.8.8/100-Define-R_X86_64_JUMP_SLOT-for-Cygwin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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[] = { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters