diff mbox series

[1/3] Include endian.h for Haiku to solve bswap* macros build

Message ID CA+XhMqxQ3o_h7_Fwho7gu9x9Pw5jCw=z-goVMyzJgQYqZR-cgA@mail.gmail.com
State New
Headers show
Series second batch of haiku build fix | expand

Commit Message

David CARLIER June 26, 2020, 2:07 p.m. UTC
From 95ef79ddff73eebd1f1bec6673c2c68209fab107 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Fri, 26 Jun 2020 13:56:14 +0000
Subject: [PATCH 1/3] Include endian.h for Haiku to solve bswap* macros build
 failure.

Signed-off-by: David Carlier <devnexen@gmail.com>
---
 include/qemu/bswap.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Philippe Mathieu-Daudé Sept. 26, 2020, 7:55 a.m. UTC | #1
Hi David,

On Fri, Jun 26, 2020 at 4:08 PM David CARLIER <devnexen@gmail.com> wrote:
>
> From 95ef79ddff73eebd1f1bec6673c2c68209fab107 Mon Sep 17 00:00:00 2001
> From: David Carlier <devnexen@gmail.com>
> Date: Fri, 26 Jun 2020 13:56:14 +0000
> Subject: [PATCH 1/3] Include endian.h for Haiku to solve bswap* macros build
>  failure.

Back to this patch, what version of Haiku are you using?
I couldn't find this information in your other emails.
Thanks,
Phil.

>
> Signed-off-by: David Carlier <devnexen@gmail.com>
> ---
>  include/qemu/bswap.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
> index 2a9f3fe783..1d3e4c24e4 100644
> --- a/include/qemu/bswap.h
> +++ b/include/qemu/bswap.h
> @@ -8,6 +8,8 @@
>  # include <machine/bswap.h>
>  #elif defined(__FreeBSD__)
>  # include <sys/endian.h>
> +#elif defined(__HAIKU__)
> +# include <endian.h>
>  #elif defined(CONFIG_BYTESWAP_H)
>  # include <byteswap.h>
>
> --
> 2.26.0
>
David CARLIER Sept. 26, 2020, 8:27 a.m. UTC | #2
Hi the last image available the beta 2.

Regards.

On Sat, 26 Sep 2020 at 08:56, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Hi David,
>
> On Fri, Jun 26, 2020 at 4:08 PM David CARLIER <devnexen@gmail.com> wrote:
> >
> > From 95ef79ddff73eebd1f1bec6673c2c68209fab107 Mon Sep 17 00:00:00 2001
> > From: David Carlier <devnexen@gmail.com>
> > Date: Fri, 26 Jun 2020 13:56:14 +0000
> > Subject: [PATCH 1/3] Include endian.h for Haiku to solve bswap* macros build
> >  failure.
>
> Back to this patch, what version of Haiku are you using?
> I couldn't find this information in your other emails.
> Thanks,
> Phil.
>
> >
> > Signed-off-by: David Carlier <devnexen@gmail.com>
> > ---
> >  include/qemu/bswap.h | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
> > index 2a9f3fe783..1d3e4c24e4 100644
> > --- a/include/qemu/bswap.h
> > +++ b/include/qemu/bswap.h
> > @@ -8,6 +8,8 @@
> >  # include <machine/bswap.h>
> >  #elif defined(__FreeBSD__)
> >  # include <sys/endian.h>
> > +#elif defined(__HAIKU__)
> > +# include <endian.h>
> >  #elif defined(CONFIG_BYTESWAP_H)
> >  # include <byteswap.h>
> >
> > --
> > 2.26.0
> >
>
Carlo Arenas Sept. 26, 2020, 10:31 a.m. UTC | #3
FWIW the 32 bit image (haiku-r1beta2-x86_gcc2h-anyboot.zip[1]), uses
gcc 2.95.3 as system CC
a newer gcc (the same version that is used for the 64 bit port) is
provided as an alternative though

Carlo

[1] https://www.haiku-os.org/get-haiku/r1beta2/
Philippe Mathieu-Daudé Sept. 26, 2020, 11:22 a.m. UTC | #4
On 9/26/20 12:31 PM, Carlo Arenas wrote:
> FWIW the 32 bit image (haiku-r1beta2-x86_gcc2h-anyboot.zip[1]), uses
> gcc 2.95.3 as system CC
> a newer gcc (the same version that is used for the 64 bit port) is
> provided as an alternative though

This GCC is too old to build QEMU: since commit efc6c070aca
GCC 4.8 is required.

The image provided by David (Haiku shredder 1 hrev54154+115)
provides GCC 8.3.

> 
> Carlo
> 
> [1] https://www.haiku-os.org/get-haiku/r1beta2/
>
diff mbox series

Patch

diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 2a9f3fe783..1d3e4c24e4 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -8,6 +8,8 @@ 
 # include <machine/bswap.h>
 #elif defined(__FreeBSD__)
 # include <sys/endian.h>
+#elif defined(__HAIKU__)
+# include <endian.h>
 #elif defined(CONFIG_BYTESWAP_H)
 # include <byteswap.h>