diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2018-06-05 01:29:59 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2018-06-05 01:29:59 -0500 |
| commit | 937525d05cda3a597d1a7ed3962324a12e79bd11 (patch) | |
| tree | 3dccfcc8bc181a95644972e407e16292638b538c | |
| parent | 7d1ab1e68f4ae0117999ce55ca04e64928db76f9 (diff) | |
| download | cygwin-gcc-937525d05cda3a597d1a7ed3962324a12e79bd11.tar.gz cygwin-gcc-937525d05cda3a597d1a7ed3962324a12e79bd11.tar.xz cygwin-gcc-937525d05cda3a597d1a7ed3962324a12e79bd11.zip | |
Fix patch fuzz
| -rw-r--r-- | 0001-share-mingw-fset-stack-executable-with-cygwin.patch | 6 | ||||
| -rw-r--r-- | 0017-__cxa-atexit-for-Cygwin.patch | 23 |
2 files changed, 4 insertions, 25 deletions
diff --git a/0001-share-mingw-fset-stack-executable-with-cygwin.patch b/0001-share-mingw-fset-stack-executable-with-cygwin.patch index ae86c1a..d5663b7 100644 --- a/0001-share-mingw-fset-stack-executable-with-cygwin.patch +++ b/0001-share-mingw-fset-stack-executable-with-cygwin.patch @@ -29,9 +29,9 @@ diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h index 2186937..803fb6c 100644 --- a/gcc/config/i386/cygwin.h +++ b/gcc/config/i386/cygwin.h -@@ -156,3 +156,7 @@ along with GCC; see the file COPYING3. If not see - /* We should find a way to not have to update this manually. */ - #define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-16.dll" +@@ -153,3 +153,7 @@ along with GCC; see the file COPYING3. If not see + #endif + #define LIBGCC_SONAME "cyggcc_s" LIBGCC_EH_EXTN "-1.dll" +/* Make stack executable to avoid DEP problems with trampolines. */ +#define HAVE_ENABLE_EXECUTE_STACK diff --git a/0017-__cxa-atexit-for-Cygwin.patch b/0017-__cxa-atexit-for-Cygwin.patch index c0a740e..e119f1f 100644 --- a/0017-__cxa-atexit-for-Cygwin.patch +++ b/0017-__cxa-atexit-for-Cygwin.patch @@ -4,30 +4,9 @@ Date: Thu, 30 Oct 2014 17:15:02 +0800 Subject: [PATCH 17/21] __cxa-atexit for Cygwin --- - gcc/config.gcc | 2 ++ libgcc/config/i386/cygming-crtbegin.c | 4 ++++ - 2 files changed, 6 insertions(+) + 1 file changed, 4 insertions(+) -diff --git a/gcc/config.gcc b/gcc/config.gcc -index 75807f5..aa5c032 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -1655,6 +1655,7 @@ i[34567]86-*-cygwin*) - fi - default_use_cxa_atexit=yes - use_gcc_stdint=wrap -+ default_use_cxa_atexit=yes - ;; - x86_64-*-cygwin*) - need_64bit_isa=yes -@@ -1964,6 +1965,7 @@ mep-*-*) - with_headers=yes - fi - use_gcc_stdint=wrap -+ default_use_cxa_atexit=yes - ;; - microblaze*-linux*) - case $target in diff --git a/libgcc/config/i386/cygming-crtbegin.c b/libgcc/config/i386/cygming-crtbegin.c index 87928e5..90904cd 100644 --- a/libgcc/config/i386/cygming-crtbegin.c |