[Qemu-devel] [PATCH for 2.9 v2] configure: remove Cygwin

[Qemu-devel] [PATCH for 2.9 v2] configure: remove Cygwin

[Paolo Bonzini]

The Cygwin target is really compiling for native Win32 with -mno-cygwin.
Except, GCC 4.7.0 has finally removed the long deprecated -mno-cygwin
option, and that happened about five years ago.

Let it rest in peace.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 bsd-user/mmap.c | 5 -----
 configure       | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index ee59073..1ad018a 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -199,12 +199,7 @@ static int mmap_frag(abi_ulong real_start,
     return 0;
 }
 
-#if defined(__CYGWIN__)
-/* Cygwin doesn't have a whole lot of address space.  */
-static abi_ulong mmap_next_start = 0x18000000;
-#else
 static abi_ulong mmap_next_start = 0x40000000;
-#endif
 
 unsigned long last_brk;
 
diff --git a/configure b/configure
index 99d8bec..b9a30cf 100755
--- a/configure
+++ b/configure
@@ -553,12 +553,6 @@ fi
 HOST_VARIANT_DIR=""
 
 case $targetos in
-CYGWIN*)
-  mingw32="yes"
-  QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS"
-  audio_possible_drivers="sdl"
-  audio_drv_list="sdl"
-;;
 MINGW32*)
   mingw32="yes"
   hax="yes"
-- 
2.9.3

Re: [Qemu-devel] [PATCH for 2.9 v2] configure: remove Cygwin

[Stefan Weil]

Am 17.03.2017 um 17:08 schrieb Paolo Bonzini:
> The Cygwin target is really compiling for native Win32 with -mno-cygwin.
> Except, GCC 4.7.0 has finally removed the long deprecated -mno-cygwin
> option, and that happened about five years ago.
>
> Let it rest in peace.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---

Reviewed-by: Stefan Weil <sw@weilnetz.de>

CC'ing qemu-trivial for the pull request.

I only wonder whether we should raise an error if people
try building QEMU with native Cygwin (not Cygwin / Mingw-w64).

Stefan


>  bsd-user/mmap.c | 5 -----
>  configure       | 6 ------
>  2 files changed, 11 deletions(-)
>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index ee59073..1ad018a 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -199,12 +199,7 @@ static int mmap_frag(abi_ulong real_start,
>      return 0;
>  }
>
> -#if defined(__CYGWIN__)
> -/* Cygwin doesn't have a whole lot of address space.  */
> -static abi_ulong mmap_next_start = 0x18000000;
> -#else
>  static abi_ulong mmap_next_start = 0x40000000;
> -#endif
>
>  unsigned long last_brk;
>
> diff --git a/configure b/configure
> index 99d8bec..b9a30cf 100755
> --- a/configure
> +++ b/configure
> @@ -553,12 +553,6 @@ fi
>  HOST_VARIANT_DIR=""
>
>  case $targetos in
> -CYGWIN*)
> -  mingw32="yes"
> -  QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS"
> -  audio_possible_drivers="sdl"
> -  audio_drv_list="sdl"
> -;;
>  MINGW32*)
>    mingw32="yes"
>    hax="yes"
>

Re: [Qemu-devel] [PATCH for 2.9 v2] configure: remove Cygwin

[Peter Maydell]

On 17 March 2017 at 17:52, Stefan Weil <sw@weilnetz.de> wrote:
> Am 17.03.2017 um 17:08 schrieb Paolo Bonzini:
>>
>> The Cygwin target is really compiling for native Win32 with -mno-cygwin.
>> Except, GCC 4.7.0 has finally removed the long deprecated -mno-cygwin
>> option, and that happened about five years ago.
>>
>> Let it rest in peace.
>>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>
>
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
>
> CC'ing qemu-trivial for the pull request.
>
> I only wonder whether we should raise an error if people
> try building QEMU with native Cygwin (not Cygwin / Mingw-w64).

I think the "warn about deprecated hosts" patch that I posted
earlier today will effectively end up doing that, because it
changes the case $targetos from "default to assuming Linux" to
"explicitly check for Linux, and default to an error message".

thanks
-- PMM

Re: [Qemu-devel] [PATCH for 2.9 v2] configure: remove Cygwin

[Peter Maydell]

On 17 March 2017 at 16:08, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The Cygwin target is really compiling for native Win32 with -mno-cygwin.
> Except, GCC 4.7.0 has finally removed the long deprecated -mno-cygwin
> option, and that happened about five years ago.
>
> Let it rest in peace.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  bsd-user/mmap.c | 5 -----
>  configure       | 6 ------
>  2 files changed, 11 deletions(-)
>

Applied to master, thanks.

-- PMM