From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jakub@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2153)
 id AEA573943416; Fri, 23 Apr 2021 10:45:35 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AEA573943416
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Jakub Jelinek <jakub@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] Fix Ada bootstrap on
 Cygwin64
X-Act-Checkin: gcc
X-Git-Author: Mikael Pettersson <mikpelinux@gmail.com>
X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch
X-Git-Oldrev: b1c342dacac7f812d1026fce5afe70a2fac2c9e8
X-Git-Newrev: 833708928b454288a02a1ef89895eb6701d40637
Message-Id: <20210423104535.AEA573943416@sourceware.org>
Date: Fri, 23 Apr 2021 10:45:35 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Apr 2021 10:45:35 -0000

https://gcc.gnu.org/g:833708928b454288a02a1ef89895eb6701d40637

commit 833708928b454288a02a1ef89895eb6701d40637
Author: Mikael Pettersson <mikpelinux@gmail.com>
Date:   Tue Mar 9 08:58:56 2021 -0700

    Fix Ada bootstrap on Cygwin64
    
    gcc/ada/
            PR bootstrap/94918
            * raise-gcc.c: On Cygwin include mingw32.h to prevent
            windows.h from including x86intrin.h or emmintrin.h.

Diff:
---
 gcc/ada/raise-gcc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c
index 05d1a40276a..95a99903230 100644
--- a/gcc/ada/raise-gcc.c
+++ b/gcc/ada/raise-gcc.c
@@ -79,6 +79,12 @@ typedef char bool;
    (SJLJ or DWARF). We need a consistently named interface to import from
    a-except, so wrappers are defined here.  */
 
+#ifdef __CYGWIN__
+/* Prevent compile error due to unwind-generic.h including <windows.h>,
+   see comment above #include <windows.h> in mingw32.h.  */
+#include "mingw32.h"
+#endif
+
 #ifndef IN_RTS
   /* For gnat1/gnatbind compilation: cannot use unwind.h, as it is for the
      target. So mimic configure...