Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 1 | From e4a29888cb52c1eafd3ab57a6e220b38147ecfbe Mon Sep 17 00:00:00 2001 |
| 2 | From: Etienne Cordonnier <ecordonnier@snap.com> |
| 3 | Date: Tue, 14 Mar 2023 13:39:23 +0100 |
| 4 | Subject: [PATCH] adb: Fix build on big endian systems |
| 5 | |
| 6 | The usb_linux_client.c file defines cpu_to_le16/32 by using the C |
| 7 | library htole16/32 function calls. However, cpu_to_le16/32 are used |
| 8 | when initializing structures, i.e in a context where a function call |
| 9 | is not allowed. |
| 10 | |
| 11 | It works fine on little endian systems because htole16/32 are defined |
| 12 | by the C library as no-ops. But on big-endian systems, they are |
| 13 | actually doing something, which might involve calling a function, |
| 14 | causing build failures. |
| 15 | |
| 16 | To solve this, we simply open-code cpu_to_le16/32 in a way that allows |
| 17 | them to be used when initializing structures. |
| 18 | |
| 19 | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 20 | [Forward-ported to version 29] |
| 21 | Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> |
| 22 | |
| 23 | --- |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 24 | Upstream-Status: Pending |
| 25 | |
Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 26 | system/core/adb/daemon/usb_ffs.cpp | 11 +++++++++-- |
| 27 | 1 file changed, 9 insertions(+), 2 deletions(-) |
| 28 | |
| 29 | diff --git a/system/core/adb/daemon/usb_ffs.cpp b/system/core/adb/daemon/usb_ffs.cpp |
| 30 | index b19fa5d5..ef2291ca 100644 |
| 31 | --- a/system/core/adb/daemon/usb_ffs.cpp |
| 32 | +++ b/system/core/adb/daemon/usb_ffs.cpp |
| 33 | @@ -39,8 +39,15 @@ |
| 34 | |
| 35 | #define USB_EXT_PROP_UNICODE 1 |
| 36 | |
| 37 | -#define cpu_to_le16(x) htole16(x) |
| 38 | -#define cpu_to_le32(x) htole32(x) |
| 39 | +#if __BYTE_ORDER == __LITTLE_ENDIAN |
| 40 | +# define cpu_to_le16(x) (x) |
| 41 | +# define cpu_to_le32(x) (x) |
| 42 | +#else |
| 43 | +# define cpu_to_le16(x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) |
| 44 | +# define cpu_to_le32(x) \ |
| 45 | + ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ |
| 46 | + (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) |
| 47 | +#endif |
| 48 | |
| 49 | // clang-format off |
| 50 | struct func_desc { |