summaryrefslogtreecommitdiffstats
path: root/lib/libc/amd64/net
diff options
context:
space:
mode:
authormike <mike@FreeBSD.org>2002-02-18 20:35:27 +0000
committermike <mike@FreeBSD.org>2002-02-18 20:35:27 +0000
commitbcee06d42c20a8ea0e6c6ffb8924e16e7e793c0f (patch)
tree970c36894ee638248ec810bd7570ac8aabb5eaf5 /lib/libc/amd64/net
parentf2e166dc7a7880a8564c2a7cb8ca2b94566d8d6b (diff)
downloadFreeBSD-src-bcee06d42c20a8ea0e6c6ffb8924e16e7e793c0f.zip
FreeBSD-src-bcee06d42c20a8ea0e6c6ffb8924e16e7e793c0f.tar.gz
o Move NTOHL() and associated macros into <sys/param.h>. These are
deprecated in favor of the POSIX-defined lowercase variants. o Change all occurrences of NTOHL() and associated marcros in the source tree to use the lowercase function variants. o Add missing license bits to sparc64's <machine/endian.h>. Approved by: jake o Clean up <machine/endian.h> files. o Remove unused __uint16_swap_uint32() from i386's <machine/endian.h>. o Remove prototypes for non-existent bswapXX() functions. o Include <machine/endian.h> in <arpa/inet.h> to define the POSIX-required ntohl() family of functions. o Do similar things to expose the ntohl() family in libstand, <netinet/in.h>, and <sys/param.h>. o Prepend underscores to the ntohl() family to help deal with complexities associated with having MD (asm and inline) versions, and having to prevent exposure of these functions in other headers that happen to make use of endian-specific defines. o Create weak aliases to the canonical function name to help deal with third-party software forgetting to include an appropriate header. o Remove some now unneeded pollution from <sys/types.h>. o Add missing <arpa/inet.h> includes in userland. Tested on: alpha, i386 Reviewed by: bde, jake, tmm
Diffstat (limited to 'lib/libc/amd64/net')
-rw-r--r--lib/libc/amd64/net/htonl.S4
-rw-r--r--lib/libc/amd64/net/htons.S4
-rw-r--r--lib/libc/amd64/net/ntohl.S4
-rw-r--r--lib/libc/amd64/net/ntohs.S4
4 files changed, 12 insertions, 4 deletions
diff --git a/lib/libc/amd64/net/htonl.S b/lib/libc/amd64/net/htonl.S
index af3354f..6658b69 100644
--- a/lib/libc/amd64/net/htonl.S
+++ b/lib/libc/amd64/net/htonl.S
@@ -43,7 +43,9 @@
#include <machine/asm.h>
-ENTRY(htonl)
+ .weak CNAME(htonl)
+ .set CNAME(htonl),CNAME(__htonl)
+ENTRY(__htonl)
movl 4(%esp),%eax
xchgb %al,%ah
roll $16,%eax
diff --git a/lib/libc/amd64/net/htons.S b/lib/libc/amd64/net/htons.S
index c78b108..c354eaa 100644
--- a/lib/libc/amd64/net/htons.S
+++ b/lib/libc/amd64/net/htons.S
@@ -43,7 +43,9 @@
#include <machine/asm.h>
-ENTRY(htons)
+ .weak CNAME(htons)
+ .set CNAME(htons),CNAME(__htons)
+ENTRY(__htons)
movzwl 4(%esp),%eax
xchgb %al,%ah
ret
diff --git a/lib/libc/amd64/net/ntohl.S b/lib/libc/amd64/net/ntohl.S
index 3a2c202..46ff54e 100644
--- a/lib/libc/amd64/net/ntohl.S
+++ b/lib/libc/amd64/net/ntohl.S
@@ -43,7 +43,9 @@
#include <machine/asm.h>
-ENTRY(ntohl)
+ .weak CNAME(ntohl)
+ .set CNAME(ntohl),CNAME(__ntohl)
+ENTRY(__ntohl)
movl 4(%esp),%eax
xchgb %al,%ah
roll $16,%eax
diff --git a/lib/libc/amd64/net/ntohs.S b/lib/libc/amd64/net/ntohs.S
index 110faf7..3f0a36a 100644
--- a/lib/libc/amd64/net/ntohs.S
+++ b/lib/libc/amd64/net/ntohs.S
@@ -43,7 +43,9 @@
#include <machine/asm.h>
-ENTRY(ntohs)
+ .weak CNAME(ntohs)
+ .set CNAME(ntohs),CNAME(__ntohs)
+ENTRY(__ntohs)
movzwl 4(%esp),%eax
xchgb %al,%ah
ret
OpenPOWER on IntegriCloud