aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-08-27 07:50:23 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-08-27 07:50:34 -0700
commit267dfab1bd91954eca636e7aa7f5652f6e72fbfc (patch)
tree9798232e8591cc5ee1872f15bde0f71b3d69cfbd
parente30680c07a1504434db57d598d63bd93b8d01606 (diff)
downloadglibc-267dfab1bd91954eca636e7aa7f5652f6e72fbfc.tar
glibc-267dfab1bd91954eca636e7aa7f5652f6e72fbfc.tar.gz
glibc-267dfab1bd91954eca636e7aa7f5652f6e72fbfc.tar.bz2
glibc-267dfab1bd91954eca636e7aa7f5652f6e72fbfc.zip
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.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/i386/htonl.S6
-rw-r--r--sysdeps/i386/i486/htonl.S34
3 files changed, 7 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index 10833a55e4..fcc23c77df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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 ...
* sysdeps/i386/bits/atomic.h: Here.
diff --git a/sysdeps/i386/htonl.S b/sysdeps/i386/htonl.S
index 698e9762fc..d39bca5725 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 d39bca5725..0000000000
--- 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)