From patchwork Wed Aug 26 17:36:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lu, Hongjiu" X-Patchwork-Id: 8457 Received: (qmail 13144 invoked by alias); 26 Aug 2015 17:36:24 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 13119 invoked by uid 89); 26 Aug 2015 17:36:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, NO_DNS_FOR_FROM, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mga01.intel.com X-ExtLoop1: 1 Date: Wed, 26 Aug 2015 10:36:20 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH 3/8] Move i486/htonl.S to htonl.S Message-ID: <20150826173620.GD21261@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Since glibc doesn't support i386 any more, we can move i486/htonl.S to htonl.S. OK for master? H.J. --- * sysdeps/i386/i486/htonl.S: Moved ... * sysdeps/i386/htonl.S: here. --- sysdeps/i386/htonl.S | 6 ++---- sysdeps/i386/i486/htonl.S | 34 ---------------------------------- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 sysdeps/i386/i486/htonl.S diff --git a/sysdeps/i386/htonl.S b/sysdeps/i386/htonl.S index 698e976..d39bca5 100644 --- a/sysdeps/i386/htonl.S +++ b/sysdeps/i386/htonl.S @@ -1,4 +1,4 @@ -/* Change byte order in word. For Intel 80386. +/* Change byte order in word. For Intel 80x86, x >= 4. Copyright (C) 1997-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -27,9 +27,7 @@ .text ENTRY (htonl) movl 4(%esp), %eax - rorw $8, %ax - rorl $16, %eax - rorw $8, %ax + bswap %eax ret END (htonl) diff --git a/sysdeps/i386/i486/htonl.S b/sysdeps/i386/i486/htonl.S deleted file mode 100644 index d39bca5..0000000 --- a/sysdeps/i386/i486/htonl.S +++ /dev/null @@ -1,34 +0,0 @@ -/* Change byte order in word. For Intel 80x86, x >= 4. - Copyright (C) 1997-2015 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include "asm-syntax.h" - -/* - INPUT PARAMETERS: - word (sp + 4) -*/ - - .text -ENTRY (htonl) - movl 4(%esp), %eax - bswap %eax - ret -END (htonl) - -weak_alias (htonl, ntohl)