diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-04-06 06:40:30 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-04-08 02:19:02 (GMT) |
| commit | 464014aa99d04514b59282860cd51b981eae016a (patch) | |
| tree | 6e4d6ed23c3e60bda75af700538630492fd5f1cc /plugins | |
| parent | ab0b797479a9ac567dbb7fb0585750f158eff006 (diff) | |
| download | mxe-464014aa99d04514b59282860cd51b981eae016a.zip mxe-464014aa99d04514b59282860cd51b981eae016a.tar.gz mxe-464014aa99d04514b59282860cd51b981eae016a.tar.bz2 | |
gcc plugins: update patches
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/gcc6/gcc6.patch | 35 | ||||
| -rw-r--r-- | plugins/gcc7/gcc7.patch | 35 |
2 files changed, 68 insertions, 2 deletions
diff --git a/plugins/gcc6/gcc6.patch b/plugins/gcc6/gcc6.patch index 4cab760..9c14652 100644 --- a/plugins/gcc6/gcc6.patch +++ b/plugins/gcc6/gcc6.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 2 Feb 2017 02:05:50 +1100 -Subject: [PATCH] allow native cpu detection when building with clang +Subject: [PATCH 1/2] allow native cpu detection when building with clang function was disabled for non-gcc5 in: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc @@ -25,3 +25,36 @@ index 1111111..2222222 100644 #include "cpuid.h" struct cache_desc + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Fri, 6 Apr 2018 13:40:22 +1000 +Subject: [PATCH 2/2] remove hard-coded mingw from include path + + +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 1111111..2222222 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1713,7 +1713,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + tmake_file="${tmake_file} i386/t-mingw-w32" + ;; + esac +- native_system_header_dir=/mingw/include ++ native_system_header_dir=/include + target_gtfiles="\$(srcdir)/config/i386/winnt.c" + extra_options="${extra_options} i386/cygming.opt i386/mingw.opt" + case ${target} in +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index 1111111..2222222 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -170,7 +170,7 @@ along with GCC; see the file COPYING3. If not see + /* For native mingw-version we need to take care that NATIVE_SYSTEM_HEADER_DIR + macro contains POSIX-style path. See bug 52947. */ + #undef NATIVE_SYSTEM_HEADER_DIR +-#define NATIVE_SYSTEM_HEADER_DIR "/mingw/include" ++#define NATIVE_SYSTEM_HEADER_DIR "/include" + + /* Output STRING, a string representing a filename, to FILE. + We canonicalize it to be in Unix format (backslashes are replaced diff --git a/plugins/gcc7/gcc7.patch b/plugins/gcc7/gcc7.patch index 4cab760..9c14652 100644 --- a/plugins/gcc7/gcc7.patch +++ b/plugins/gcc7/gcc7.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 2 Feb 2017 02:05:50 +1100 -Subject: [PATCH] allow native cpu detection when building with clang +Subject: [PATCH 1/2] allow native cpu detection when building with clang function was disabled for non-gcc5 in: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc @@ -25,3 +25,36 @@ index 1111111..2222222 100644 #include "cpuid.h" struct cache_desc + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Fri, 6 Apr 2018 13:40:22 +1000 +Subject: [PATCH 2/2] remove hard-coded mingw from include path + + +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 1111111..2222222 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1713,7 +1713,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + tmake_file="${tmake_file} i386/t-mingw-w32" + ;; + esac +- native_system_header_dir=/mingw/include ++ native_system_header_dir=/include + target_gtfiles="\$(srcdir)/config/i386/winnt.c" + extra_options="${extra_options} i386/cygming.opt i386/mingw.opt" + case ${target} in +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index 1111111..2222222 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -170,7 +170,7 @@ along with GCC; see the file COPYING3. If not see + /* For native mingw-version we need to take care that NATIVE_SYSTEM_HEADER_DIR + macro contains POSIX-style path. See bug 52947. */ + #undef NATIVE_SYSTEM_HEADER_DIR +-#define NATIVE_SYSTEM_HEADER_DIR "/mingw/include" ++#define NATIVE_SYSTEM_HEADER_DIR "/include" + + /* Output STRING, a string representing a filename, to FILE. + We canonicalize it to be in Unix format (backslashes are replaced |