logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Revert-Use-__builtin_bswap16-in-EFI_GUID-and-other-p.patch (2618B)

    

  1. From 44f9caeedfaa265b1ced2b77e232ffc94b610b12 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Fri, 31 Jan 2020 13:51:55 -0800
  4. Subject: [PATCH] Revert "Use __builtin_bswap16() in EFI_GUID and other
  5.  places."
  7. This reverts commit 8dddb5e8da3cabb5927b839d6faaa42b48b58a87.
  8. ---
  9.  src/efivar_endian.h         | 24 ++++++++++++------------
  10.  src/include/efivar/efivar.h |  2 +-
  11.  2 files changed, 13 insertions(+), 13 deletions(-)
  13. diff --git a/src/efivar_endian.h b/src/efivar_endian.h
  14. index b8e6a31..ce37019 100644
  15. --- a/src/efivar_endian.h
  16. +++ b/src/efivar_endian.h
  17. @@ -29,12 +29,12 @@
  18.  #define le16_to_cpu(x) (x)
  19.  #define le32_to_cpu(x) (x)
  20.  #define le64_to_cpu(x) ((uint64_t)x)
  21. -#define cpu_to_be16(x) __builtin_bswap16(x)
  22. -#define cpu_to_be32(x) __builtin_bswap32(x)
  23. -#define cpu_to_be64(x) ((uint64_t)__builtin_bswap64(x))
  24. -#define be16_to_cpu(x) __builtin_bswap16(x)
  25. -#define be32_to_cpu(x) __builtin_bswap32(x)
  26. -#define be64_to_cpu(x) ((uint64_t)__builtin_bswap64(x))
  27. +#define cpu_to_be16(x) __bswap_16(x)
  28. +#define cpu_to_be32(x) __bswap_32(x)
  29. +#define cpu_to_be64(x) ((uint64_t)__bswap_64(x))
  30. +#define be16_to_cpu(x) __bswap_16(x)
  31. +#define be32_to_cpu(x) __bswap_32(x)
  32. +#define be64_to_cpu(x) ((uint64_t)__bswap_64(x))
  33.  #else
  34.  #define cpu_to_be16(x) (x)
  35.  #define cpu_to_be32(x) (x)
  36. @@ -42,12 +42,12 @@
  37.  #define be16_to_cpu(x) (x)
  38.  #define be32_to_cpu(x) (x)
  39.  #define be64_to_cpu(x) ((uint64_t)x)
  40. -#define cpu_to_le16(x) __builtin_bswap16(x)
  41. -#define cpu_to_le32(x) __builtin_bswap32(x)
  42. -#define cpu_to_le64(x) ((uint64_t)__builtin_bswap64(x))
  43. -#define le16_to_cpu(x) __builtin_bswap16(x)
  44. -#define le32_to_cpu(x) __builtin_bswap32(x)
  45. -#define le64_to_cpu(x) ((uint64_t)__builtin_bswap64(x))
  46. +#define cpu_to_le16(x) __bswap_16(x)
  47. +#define cpu_to_le32(x) __bswap_32(x)
  48. +#define cpu_to_le64(x) ((uint64_t)__bswap_64(x))
  49. +#define le16_to_cpu(x) __bswap_16(x)
  50. +#define le32_to_cpu(x) __bswap_32(x)
  51. +#define le64_to_cpu(x) ((uint64_t)__bswap_64(x))
  52.  #endif
  53.  
  54.  #endif /* _EFIVAR_ENDIAN_H */
  55. diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h
  56. index 316891c..32d8a29 100644
  57. --- a/src/include/efivar/efivar.h
  58. +++ b/src/include/efivar/efivar.h
  59. @@ -63,7 +63,7 @@ typedef struct {
  60.  
  61.  #if BYTE_ORDER == LITTLE_ENDIAN
  62.  #define EFI_GUID(a,b,c,d,e0,e1,e2,e3,e4,e5) \
  63. -((efi_guid_t) {(a), (b), (c), __builtin_bswap16(d), { (e0), (e1), (e2), (e3), (e4), (e5) }})
  64. +((efi_guid_t) {(a), (b), (c), bswap_16(d), { (e0), (e1), (e2), (e3), (e4), (e5) }})
  65.  #else
  66.  #define EFI_GUID(a,b,c,d,e0,e1,e2,e3,e4,e5) \
  67.  ((efi_guid_t) {(a), (b), (c), (d), { (e0), (e1), (e2), (e3), (e4), (e5) }})
  68. -- 
  69. 2.25.0