[git commit 0_9_30] avr32/microblaze/vax: punt local byteswap.h

Mike Frysinger vapier at gentoo.org
Sat Oct 10 16:44:02 UTC 2009


commit: http://git.uclibc.org/uClibc/commit/?id=aa4b81faa695d911bc7ccbd5e0d1d8db535afa77
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/0_9_30

These arches are generic C implementations of the byteswap functions, so
rather than keep a useless local copy, use the common C one.

Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/sysdeps/linux/avr32/bits/byteswap.h      |   70 -------------------------
 libc/sysdeps/linux/microblaze/bits/byteswap.h |   41 --------------
 libc/sysdeps/linux/vax/bits/byteswap.h        |   64 ----------------------
 3 files changed, 0 insertions(+), 175 deletions(-)
 delete mode 100644 libc/sysdeps/linux/avr32/bits/byteswap.h
 delete mode 100644 libc/sysdeps/linux/microblaze/bits/byteswap.h
 delete mode 100644 libc/sysdeps/linux/vax/bits/byteswap.h

diff --git a/libc/sysdeps/linux/avr32/bits/byteswap.h b/libc/sysdeps/linux/avr32/bits/byteswap.h
deleted file mode 100644
index f0bea4c..0000000
--- a/libc/sysdeps/linux/avr32/bits/byteswap.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2005 Atmel Corporation
- *
- * This file is subject to the terms and conditions of the GNU Lesser General
- * Public License.  See the file "COPYING.LIB" in the main directory of this
- * archive for more details.
- */
-
-#if !defined _BYTESWAP_H && !defined _NETINET_IN_H
-# error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
-#endif
-
-#ifndef _BITS_BYTESWAP_H
-#define _BITS_BYTESWAP_H 1
-
-/* Swap bytes in 16 bit value.  */
-#if defined __GNUC__
-# define __bswap_16(x) (__extension__ __builtin_bswap_16(x))
-#else
-/* This is better than nothing.  */
-static __inline__ unsigned short int
-__bswap_16 (unsigned short int __bsx)
-{
-	return ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8));
-}
-#endif
-
-/* Swap bytes in 32 bit value.  */
-#if defined __GNUC__
-# define __bswap_32(x) (__extension__ __builtin_bswap_32(x))
-#else
-static __inline__ unsigned int
-__bswap_32 (unsigned int __bsx)
-{
-  return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >>  8) |
-	  (((__bsx) & 0x0000ff00) <<  8) | (((__bsx) & 0x000000ff) << 24));
-}
-#endif
-
-#if defined __GNUC__
-/* 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 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
-
-#endif /* _BITS_BYTESWAP_H */
diff --git a/libc/sysdeps/linux/microblaze/bits/byteswap.h b/libc/sysdeps/linux/microblaze/bits/byteswap.h
deleted file mode 100644
index 9b6a5d7..0000000
--- a/libc/sysdeps/linux/microblaze/bits/byteswap.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * libc/sysdeps/linux/microblaze/bits/byteswap.h -- Macros to swap the order
- * 	of bytes in integer values
- *
- *  Copyright (C) 2001  NEC Corporation
- *  Copyright (C) 2001  Miles Bader <miles at gnu.org>
- *  Copyright (C) 1997,1998,2001  Free Software Foundation, Inc.
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License.  See the file COPYING.LIB in the main
- * directory of this archive for more details.
- */
-
-#if !defined _BYTESWAP_H && !defined _NETINET_IN_H
-# error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
-#endif
-
-/* Swap bytes in 16 bit value.  */
-#define __bswap_constant_16(x) \
-  ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
-
-# define __bswap_16(x) __bswap_constant_16 (x)
-
-/* Swap bytes in 32 bit value.  */
-#define __bswap_constant_32(x) \
-  ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
-   (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
-
-# define __bswap_32(x) __bswap_constant_32 (x)
-
-#if defined __GNUC__ && __GNUC__ >= 2
-/* Swap bytes in 64 bit value.  */
-# define __bswap_64(x)							      \
-     (__extension__							      \
-      ({ union { unsigned long long int __ll;				      \
-		 unsigned long int __l[2]; } __bswap_64_v, __bswap_64_r;      \
-	 __bswap_64_v.__ll = (x);					      \
-	 __bswap_64_r.__l[0] = __bswap_32 (__bswap_64_v.__l[1]);	      \
-	 __bswap_64_r.__l[1] = __bswap_32 (__bswap_64_v.__l[0]);	      \
-	 __bswap_64_r.__ll; }))
-#endif
diff --git a/libc/sysdeps/linux/vax/bits/byteswap.h b/libc/sysdeps/linux/vax/bits/byteswap.h
deleted file mode 100644
index 6b51156..0000000
--- a/libc/sysdeps/linux/vax/bits/byteswap.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Macros to swap the order of bytes in integer values.
-   Copyright (C) 1997, 1998 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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#if !defined _BYTESWAP_H && !defined _NETINET_IN_H
-# error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
-#endif
-
-/* Swap bytes in 16 bit value.  */
-#ifdef __GNUC__
-# define __bswap_16(x) \
-    (__extension__							      \
-     ({ unsigned short int __bsx = (x);					      \
-        ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8)); }))
-#else
-static __inline unsigned short int
-__bswap_16 (unsigned short int __bsx)
-{
-  return ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8));
-}
-#endif
-
-/* Swap bytes in 32 bit value.  */
-#ifdef __GNUC__
-# define __bswap_32(x) \
-    (__extension__							      \
-     ({ unsigned int __bsx = (x);					      \
-        ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >>  8) |    \
-	 (((__bsx) & 0x0000ff00) <<  8) | (((__bsx) & 0x000000ff) << 24)); }))
-#else
-static __inline unsigned int
-__bswap_32 (unsigned int __bsx)
-{
-  return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >>  8) |
-	  (((__bsx) & 0x0000ff00) <<  8) | (((__bsx) & 0x000000ff) << 24));
-}
-#endif
-
-#if defined __GNUC__ && __GNUC__ >= 2
-/* Swap bytes in 64 bit value.  */
-# define __bswap_64(x) \
-     (__extension__							      \
-      ({ union { unsigned long long int __ll;				      \
-		 unsigned long int __l[2]; } __v, __r;			      \
-	 __v.__ll = (x);						      \
-	 __r.__l[0] = __bswap_32 (__v.__l[1]);				      \
-	 __r.__l[1] = __bswap_32 (__v.__l[0]);				      \
-	 __r.__ll; }))
-#endif
-- 
1.6.3.3



More information about the uClibc-cvs mailing list