You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
135 lines
4.9 KiB
135 lines
4.9 KiB
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 1/4] 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
|
|
|
|
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/4] 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
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cameron Kaiser <classilla@floodgap.com>
|
|
Date: Sat, 13 Oct 2018 18:59:18 -0700
|
|
Subject: [PATCH 3/4] fix gcc compile error on ppc64le
|
|
|
|
https://gcc.gnu.org/viewcvs/gcc/branches/gcc-6-branch/libcpp/lex.c?view=log&pathrev=261621
|
|
|
|
diff --git a/libcpp/lex.c b/libcpp/lex.c
|
|
index 1111111..2222222 100644
|
|
--- a/libcpp/lex.c
|
|
+++ b/libcpp/lex.c
|
|
@@ -550,7 +550,7 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
|
|
{
|
|
vc m_nl, m_cr, m_bs, m_qm;
|
|
|
|
- data = *((const vc *)s);
|
|
+ data = __builtin_vec_vsx_ld (0, s);
|
|
s += 16;
|
|
|
|
m_nl = (vc) __builtin_vec_cmpeq(data, repl_nl);
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
|
|
Date: Sun, 11 Nov 2018 17:44:43 +0000
|
|
Subject: [PATCH 4/4] Backport from mainline 2018-11-04 Uros Bizjak
|
|
<ubizjak@gmail.com>
|
|
|
|
PR middle-end/58372
|
|
* cfgexpand.c (pass_expand::execute): Move the call to
|
|
finish_eh_generation in front of the call to expand_stack_alignment.
|
|
|
|
testsuite/ChangeLog:
|
|
|
|
Backport from mainline
|
|
2018-11-04 Uros Bizjak <ubizjak@gmail.com>
|
|
|
|
PR middle-end/58372
|
|
* g++.dg/pr58372.C: New test.
|
|
|
|
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@266015 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
|
|
index 1111111..2222222 100644
|
|
--- a/gcc/cfgexpand.c
|
|
+++ b/gcc/cfgexpand.c
|
|
@@ -6260,6 +6260,14 @@ pass_expand::execute (function *fun)
|
|
sbitmap_free (blocks);
|
|
purge_all_dead_edges ();
|
|
|
|
+ /* After initial rtl generation, call back to finish generating
|
|
+ exception support code. We need to do this before cleaning up
|
|
+ the CFG as the code does not expect dead landing pads. */
|
|
+ if (fun->eh->region_tree != NULL)
|
|
+ finish_eh_generation ();
|
|
+
|
|
+ /* Call expand_stack_alignment after finishing all
|
|
+ updates to crtl->preferred_stack_boundary. */
|
|
expand_stack_alignment ();
|
|
|
|
/* Fixup REG_EQUIV notes in the prologue if there are tailcalls in this
|
|
@@ -6267,12 +6275,6 @@ pass_expand::execute (function *fun)
|
|
if (crtl->tail_call_emit)
|
|
fixup_tail_calls ();
|
|
|
|
- /* After initial rtl generation, call back to finish generating
|
|
- exception support code. We need to do this before cleaning up
|
|
- the CFG as the code does not expect dead landing pads. */
|
|
- if (fun->eh->region_tree != NULL)
|
|
- finish_eh_generation ();
|
|
-
|
|
/* Remove unreachable blocks, otherwise we cannot compute dominators
|
|
which are needed for loop state verification. As a side-effect
|
|
this also compacts blocks.
|