(__bswap_64): Handle constant argument case separately.

diff --git a/bits/byteswap.h b/bits/byteswap.h
index b193ea1..ec2051a 100644 (file)
--- a/bits/byteswap.h
+++ b/bits/byteswap.h
@@ -53,12 +53,27 @@ __bswap_32 (unsigned int __bsx)
 
 #if defined __GNUC__ && __GNUC__ >= 2
 /* Swap bytes in 64 bit value.  */
+#define __bswap_constant_64(x) \
+     ((((x) & 0xff00000000000000ull) >> 56)                                  \
+      | (((x) & 0x00ff000000000000ull) >> 40)                                \
+      | (((x) & 0x0000ff0000000000ull) >> 24)                                \
+      | (((x) & 0x000000ff00000000ull) >> 8)                                 \
+      | (((x) & 0x00000000ff000000ull) << 8)                                 \
+      | (((x) & 0x0000000000ff0000ull) << 24)                                \
+      | (((x) & 0x000000000000ff00ull) << 40)                                \
+      | (((x) & 0x00000000000000ffull) << 56))
+
 # define __bswap_64(x) \
      (__extension__                                                          \
-      ({ union { unsigned long long int __ll;                                \
-                unsigned int __l[2]; } __v, __r;                             \
-        __v.__ll = (x);                                                      \
-        __r.__l[0] = __bswap_32 (__v.__l[1]);                                \
-        __r.__l[1] = __bswap_32 (__v.__l[0]);                                \
+      ({ union { __extension__ unsigned long long int __ll;                  \
+                unsigned long int __l[2]; } __w, __r;                        \
+         if (__builtin_constant_p (x))                                       \
+          __r.__ll = __bswap_constant_64 (x);                                \
+        else                                                                 \
+          {                                                                  \
+            __w.__ll = (x);                                                  \
+            __r.__l[0] = __bswap_32 (__w.__l[1]);                            \
+            __r.__l[1] = __bswap_32 (__w.__l[0]);                            \
+          }                                                                  \
         __r.__ll; }))
 #endif

diff --git a/sysdeps/generic/bits/byteswap.h b/sysdeps/generic/bits/byteswap.h
index b193ea1..ec2051a 100644 (file)
--- a/sysdeps/generic/bits/byteswap.h
+++ b/sysdeps/generic/bits/byteswap.h
@@ -53,12 +53,27 @@ __bswap_32 (unsigned int __bsx)
 
 #if defined __GNUC__ && __GNUC__ >= 2
 /* Swap bytes in 64 bit value.  */
+#define __bswap_constant_64(x) \
+     ((((x) & 0xff00000000000000ull) >> 56)                                  \
+      | (((x) & 0x00ff000000000000ull) >> 40)                                \
+      | (((x) & 0x0000ff0000000000ull) >> 24)                                \
+      | (((x) & 0x000000ff00000000ull) >> 8)                                 \
+      | (((x) & 0x00000000ff000000ull) << 8)                                 \
+      | (((x) & 0x0000000000ff0000ull) << 24)                                \
+      | (((x) & 0x000000000000ff00ull) << 40)                                \
+      | (((x) & 0x00000000000000ffull) << 56))
+
 # define __bswap_64(x) \
      (__extension__                                                          \
-      ({ union { unsigned long long int __ll;                                \
-                unsigned int __l[2]; } __v, __r;                             \
-        __v.__ll = (x);                                                      \
-        __r.__l[0] = __bswap_32 (__v.__l[1]);                                \
-        __r.__l[1] = __bswap_32 (__v.__l[0]);                                \
+      ({ union { __extension__ unsigned long long int __ll;                  \
+                unsigned long int __l[2]; } __w, __r;                        \
+         if (__builtin_constant_p (x))                                       \
+          __r.__ll = __bswap_constant_64 (x);                                \
+        else                                                                 \
+          {                                                                  \
+            __w.__ll = (x);                                                  \
+            __r.__l[0] = __bswap_32 (__w.__l[1]);                            \
+            __r.__l[1] = __bswap_32 (__w.__l[0]);                            \
+          }                                                                  \
         __r.__ll; }))
 #endif

diff --git a/sysdeps/i386/bits/byteswap.h b/sysdeps/i386/bits/byteswap.h
index a1ba6b8..64fc56a 100644 (file)
--- a/sysdeps/i386/bits/byteswap.h
+++ b/sysdeps/i386/bits/byteswap.h
@@ -1,5 +1,5 @@
 /* Macros to swap the order of bytes in integer values.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -84,12 +84,27 @@
 
 #if defined __GNUC__ && __GNUC__ >= 2
 /* Swap bytes in 64 bit value.  */
+#define __bswap_constant_64(x) \
+     ((((x) & 0xff00000000000000ull) >> 56)                                  \
+      | (((x) & 0x00ff000000000000ull) >> 40)                                \
+      | (((x) & 0x0000ff0000000000ull) >> 24)                                \
+      | (((x) & 0x000000ff00000000ull) >> 8)                                 \
+      | (((x) & 0x00000000ff000000ull) << 8)                                 \
+      | (((x) & 0x0000000000ff0000ull) << 24)                                \
+      | (((x) & 0x000000000000ff00ull) << 40)                                \
+      | (((x) & 0x00000000000000ffull) << 56))
+
 # define __bswap_64(x) \
      (__extension__                                                          \
       ({ union { __extension__ unsigned long long int __ll;                  \
                 unsigned long int __l[2]; } __w, __r;                        \
-        __w.__ll = (x);                                                      \
-        __r.__l[0] = __bswap_32 (__w.__l[1]);                                \
-        __r.__l[1] = __bswap_32 (__w.__l[0]);                                \
+         if (__builtin_constant_p (x))                                       \
+          __r.__ll = __bswap_constant_64 (x);                                \
+        else                                                                 \
+          {                                                                  \
+            __w.__ll = (x);                                                  \
+            __r.__l[0] = __bswap_32 (__w.__l[1]);                            \
+            __r.__l[1] = __bswap_32 (__w.__l[0]);                            \
+          }                                                                  \
         __r.__ll; }))
 #endif