Attachment 9902 Details for Bug 10590 – fix for 4.0 branch, same as master

[patch] fix for 4.0 branch, same as master

bso10590_power8_byteorder_40t.patch (text/plain), 1.52 KB, created by David Disseldorp on 2014-05-05 15:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2014-05-05 15:20:08 UTC

Size: 1.52 KB

patch

obsolete

>From ec34c28d90ed2f64825beead4f59dfe08171c025 Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@samba.org>
>Date: Mon, 5 May 2014 13:42:36 +0200
>Subject: [PATCH] byteorder: do not assume PowerPC is big-endian
>
>byteorder.h currently uses reverse-indexing ASM instructions for little
>endian multi-byte storage/retrieval on PowerPC. With Power8 this is an
>incorrect assumption, as it can be big or little endian.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10590
>
>Signed-off-by: David Disseldorp <ddiss@samba.org>
>---
> lib/util/byteorder.h | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/lib/util/byteorder.h b/lib/util/byteorder.h
>index 58cd68a..82c050b 100644
>--- a/lib/util/byteorder.h
>+++ b/lib/util/byteorder.h
>@@ -19,6 +19,7 @@
> 
> #ifndef _BYTEORDER_H
> #define _BYTEORDER_H
>+#include <ccan/endian/endian.h>
> 
> /*
>    This file implements macros for machine independent short and 
>@@ -89,10 +90,12 @@ it also defines lots of intermediate macros, just ignore those :-)
> 
> 
> /*
>-  on powerpc we can use the magic instructions to load/store
>-  in little endian
>-*/
>-#if (defined(__powerpc__) && defined(__GNUC__))
>+ * On powerpc we can use the magic instructions to load/store in little endian.
>+ * The instructions are reverse-indexing, so assume a big endian Power
>+ * processor. Power8 can be big or little endian, so we need to explicitly
>+ * check.
>+ */
>+#if (defined(__powerpc__) && defined(__GNUC__) && HAVE_BIG_ENDIAN)
> static __inline__ uint16_t ld_le16(const uint16_t *addr)
> {
> 	uint16_t val;
>-- 
>1.8.4.5
>

Flags:

cs: review+

Actions: View

Attachments on bug 10590: 9900 | 9901 | 9902 | 9917 | 9918