From owner-svn-src-all@FreeBSD.ORG Wed Apr 8 19:10:21 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 232FA106566B; Wed, 8 Apr 2009 19:10:21 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 10D7E8FC08; Wed, 8 Apr 2009 19:10:21 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n38JAKHo071685; Wed, 8 Apr 2009 19:10:20 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n38JAK47071682; Wed, 8 Apr 2009 19:10:20 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200904081910.n38JAK47071682@svn.freebsd.org> From: Ed Schouten Date: Wed, 8 Apr 2009 19:10:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190854 - in head/sys: amd64/include i386/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2009 19:10:21 -0000 Author: ed Date: Wed Apr 8 19:10:20 2009 New Revision: 190854 URL: http://svn.freebsd.org/changeset/base/190854 Log: Also remove the unused __word_swap_int*() macros. Submitted by: Christoph Mallon Modified: head/sys/amd64/include/endian.h head/sys/i386/include/endian.h Modified: head/sys/amd64/include/endian.h ============================================================================== --- head/sys/amd64/include/endian.h Wed Apr 8 19:06:47 2009 (r190853) +++ head/sys/amd64/include/endian.h Wed Apr 8 19:10:20 2009 (r190854) @@ -69,25 +69,6 @@ extern "C" { #if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P) -#define __word_swap_int_var(x) \ -__extension__ ({ register __uint32_t __X = (x); \ - __asm ("rorl $16, %0" : "+r" (__X)); \ - __X; }) - -#ifdef __OPTIMIZE__ - -#define __word_swap_int_const(x) \ - ((((x) & 0xffff0000) >> 16) | \ - (((x) & 0x0000ffff) << 16)) -#define __word_swap_int(x) (__builtin_constant_p(x) ? \ - __word_swap_int_const(x) : __word_swap_int_var(x)) - -#else /* __OPTIMIZE__ */ - -#define __word_swap_int(x) __word_swap_int_var(x) - -#endif /* __OPTIMIZE__ */ - #define __byte_swap_int_var(x) \ __extension__ ({ register __uint32_t __X = (x); \ __asm ("bswap %0" : "+r" (__X)); \ Modified: head/sys/i386/include/endian.h ============================================================================== --- head/sys/i386/include/endian.h Wed Apr 8 19:06:47 2009 (r190853) +++ head/sys/i386/include/endian.h Wed Apr 8 19:10:20 2009 (r190854) @@ -69,25 +69,6 @@ extern "C" { #if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P) -#define __word_swap_int_var(x) \ -__extension__ ({ register __uint32_t __X = (x); \ - __asm ("rorl $16, %0" : "+r" (__X)); \ - __X; }) - -#ifdef __OPTIMIZE__ - -#define __word_swap_int_const(x) \ - ((((x) & 0xffff0000) >> 16) | \ - (((x) & 0x0000ffff) << 16)) -#define __word_swap_int(x) (__builtin_constant_p(x) ? \ - __word_swap_int_const(x) : __word_swap_int_var(x)) - -#else /* __OPTIMIZE__ */ - -#define __word_swap_int(x) __word_swap_int_var(x) - -#endif /* __OPTIMIZE__ */ - #define __byte_swap_int_var(x) \ __extension__ ({ register __uint32_t __X = (x); \ __asm ("bswap %0" : "+r" (__X)); \