summaryrefslogtreecommitdiffstats
path: root/plugins/gcc6/gcc6.patch
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-10-01 10:42:05 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-10-01 10:42:05 (GMT)
commit4a693c3e8834a0ec35781bf4934e58fbf3a6d52b (patch)
tree4d08c3a39acae3ed177c003277aa093fbcb536fa /plugins/gcc6/gcc6.patch
parentba2afa1afad72673ec2cae7ea9702900dfbe4408 (diff)
downloadmxe-4a693c3e8834a0ec35781bf4934e58fbf3a6d52b.zip
mxe-4a693c3e8834a0ec35781bf4934e58fbf3a6d52b.tar.gz
mxe-4a693c3e8834a0ec35781bf4934e58fbf3a6d52b.tar.bz2
gcc plugins: use plugin-specific patches
From https://github.com/mxe/mxe/commit/9eb13fc4b8ae7a97f3d3b11ddc2f58a79994dd54#commitcomment-24681487, the patch in #1915 is a backport and doesn't apply to gcc > 5.
Diffstat (limited to 'plugins/gcc6/gcc6.patch')
-rw-r--r--plugins/gcc6/gcc6.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/plugins/gcc6/gcc6.patch b/plugins/gcc6/gcc6.patch
new file mode 100644
index 0000000..4cab760
--- /dev/null
+++ b/plugins/gcc6/gcc6.patch
@@ -0,0 +1,27 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+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
+
+function was disabled for non-gcc5 in:
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
+
+clang can build it correctly and this should probably be a feature test
+
+diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
+index 1111111..2222222 100644
+--- a/gcc/config/i386/driver-i386.c
++++ b/gcc/config/i386/driver-i386.c
+@@ -24,7 +24,7 @@ along with GCC; see the file COPYING3. If not see
+
+ const char *host_detect_local_cpu (int argc, const char **argv);
+
+-#if defined(__GNUC__) && (__GNUC__ >= 5 || !defined(__PIC__))
++#if defined(__GNUC__) && (__GNUC__ >= 5 || !defined(__PIC__)) || defined(__clang__)
+ #include "cpuid.h"
+
+ struct cache_desc