From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 27 Aug 2015 14:50:23 +0000 (-0700)
Subject: Move i486/htonl.S to htonl.S
X-Git-Tag: glibc-2.23~545
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=267dfab1bd91954eca636e7aa7f5652f6e72fbfc;p=thirdparty%2Fglibc.git

Move i486/htonl.S to htonl.S

Since glibc doesn't support i386 any more, we can move i486/htonl.S to
htonl.S.

	* sysdeps/i386/i486/htonl.S: Moved ...
	* sysdeps/i386/htonl.S: here.
---

diff --git a/ChangeLog b/ChangeLog
index 10833a55e4f..fcc23c77df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/i486/htonl.S: Moved ...
+	* sysdeps/i386/htonl.S: here.
+
 2015-08-27  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/i386/i486/bits/atomic.h: Moved to ...
diff --git a/sysdeps/i386/htonl.S b/sysdeps/i386/htonl.S
index 698e9762fca..d39bca5725e 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 d39bca5725e..00000000000
--- 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
-   <http://www.gnu.org/licenses/>.  */
-
-#include <sysdep.h>
-#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)