diff options
| author | Mike Barcroft <mike@FreeBSD.org> | 2002-02-18 20:35:27 +0000 |
|---|---|---|
| committer | Mike Barcroft <mike@FreeBSD.org> | 2002-02-18 20:35:27 +0000 |
| commit | fd8e4ebc8c18caec3eefac6527831f9ee6a92959 (patch) | |
| tree | 970c36894ee638248ec810bd7570ac8aabb5eaf5 /sys/libkern | |
| parent | 3e1ce344baebe1f56863d29d656549c93a464ded (diff) | |
Notes
Diffstat (limited to 'sys/libkern')
| -rw-r--r-- | sys/libkern/alpha/byte_swap_2.S | 5 | ||||
| -rw-r--r-- | sys/libkern/alpha/byte_swap_4.S | 5 | ||||
| -rw-r--r-- | sys/libkern/alpha/htonl.S | 3 | ||||
| -rw-r--r-- | sys/libkern/alpha/htons.S | 3 | ||||
| -rw-r--r-- | sys/libkern/alpha/ntohl.S | 3 | ||||
| -rw-r--r-- | sys/libkern/alpha/ntohs.S | 3 | ||||
| -rw-r--r-- | sys/libkern/ia64/byte_swap_2.S | 5 | ||||
| -rw-r--r-- | sys/libkern/ia64/byte_swap_4.S | 5 | ||||
| -rw-r--r-- | sys/libkern/ia64/htonl.S | 3 | ||||
| -rw-r--r-- | sys/libkern/ia64/htons.S | 3 | ||||
| -rw-r--r-- | sys/libkern/ia64/ntohl.S | 3 | ||||
| -rw-r--r-- | sys/libkern/ia64/ntohs.S | 3 |
12 files changed, 28 insertions, 16 deletions
diff --git a/sys/libkern/alpha/byte_swap_2.S b/sys/libkern/alpha/byte_swap_2.S index a9d70a968e44..8111918d9b4c 100644 --- a/sys/libkern/alpha/byte_swap_2.S +++ b/sys/libkern/alpha/byte_swap_2.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#ifndef NAME -#define NAME byte_swap_2 +#if !defined(ALIAS) || !defined(NAME) +#error ALIAS or NAME not defined #endif /* @@ -39,6 +39,7 @@ * * Argument is an unsigned 2-byte integer (u_int16_t). */ +XLEAF(ALIAS, 1) LEAF(NAME, 1) /* a0 contains 0x0123 */ extbl a0, 0, t0 /* t0 = 0x 23 */ extbl a0, 1, t1 /* t1 = 0x 01 */ diff --git a/sys/libkern/alpha/byte_swap_4.S b/sys/libkern/alpha/byte_swap_4.S index 9f6df346f260..d31bbe8cd9a8 100644 --- a/sys/libkern/alpha/byte_swap_4.S +++ b/sys/libkern/alpha/byte_swap_4.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#ifndef NAME -#define NAME byte_swap_4 +#if !defined(ALIAS) || !defined(NAME) +#error ALIAS or NAME not defined #endif /* @@ -39,6 +39,7 @@ * * Argument is an unsigned 4-byte integer (u_int32_t). */ +XLEAF(ALIAS, 1) LEAF(NAME, 1) /* a0 contains 0x01234567 */ extbl a0, 0, t0 /* t0 = 0x 67 */ extbl a0, 1, t1 /* t1 = 0x 45 */ diff --git a/sys/libkern/alpha/htonl.S b/sys/libkern/alpha/htonl.S index b5ebaa51d740..2604034b38d3 100644 --- a/sys/libkern/alpha/htonl.S +++ b/sys/libkern/alpha/htonl.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME htonl +#define ALIAS htonl +#define NAME __htonl #include <libkern/alpha/byte_swap_4.S> diff --git a/sys/libkern/alpha/htons.S b/sys/libkern/alpha/htons.S index 9ffabf4a86f9..6b8ea164cba0 100644 --- a/sys/libkern/alpha/htons.S +++ b/sys/libkern/alpha/htons.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME htons +#define ALIAS htons +#define NAME __htons #include <libkern/alpha/byte_swap_2.S> diff --git a/sys/libkern/alpha/ntohl.S b/sys/libkern/alpha/ntohl.S index f86a4042b03e..590203af1ef8 100644 --- a/sys/libkern/alpha/ntohl.S +++ b/sys/libkern/alpha/ntohl.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME ntohl +#define ALIAS ntohl +#define NAME __ntohl #include <libkern/alpha/byte_swap_4.S> diff --git a/sys/libkern/alpha/ntohs.S b/sys/libkern/alpha/ntohs.S index 496f75c78a6f..93068811e450 100644 --- a/sys/libkern/alpha/ntohs.S +++ b/sys/libkern/alpha/ntohs.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME ntohs +#define ALIAS ntohs +#define NAME __ntohs #include <libkern/alpha/byte_swap_2.S> diff --git a/sys/libkern/ia64/byte_swap_2.S b/sys/libkern/ia64/byte_swap_2.S index fbee3c862515..19d0eefbec8f 100644 --- a/sys/libkern/ia64/byte_swap_2.S +++ b/sys/libkern/ia64/byte_swap_2.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#ifndef NAME -#define NAME byte_swap_2 +#if !defined(ALIAS) || !defined(NAME) +#error ALIAS or NAME not defined #endif /* @@ -39,6 +39,7 @@ * * Argument is an unsigned 2-byte integer (u_int16_t). */ +WEAK_ALIAS(ALIAS, NAME) ENTRY(NAME, 1) mux1 r16=in0,@rev ;; diff --git a/sys/libkern/ia64/byte_swap_4.S b/sys/libkern/ia64/byte_swap_4.S index d1836442c287..71019ba4c4c8 100644 --- a/sys/libkern/ia64/byte_swap_4.S +++ b/sys/libkern/ia64/byte_swap_4.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#ifndef NAME -#define NAME byte_swap_4 +#if !defined(ALIAS) || !defined(NAME) +#error ALIAS or NAME not defined #endif /* @@ -39,6 +39,7 @@ * * Argument is an unsigned 4-byte integer (u_int32_t). */ +WEAK_ALIAS(ALIAS, NAME) ENTRY(NAME, 1) mux1 r16=in0,@rev ;; diff --git a/sys/libkern/ia64/htonl.S b/sys/libkern/ia64/htonl.S index 666f70288f9e..f0c89f4daea3 100644 --- a/sys/libkern/ia64/htonl.S +++ b/sys/libkern/ia64/htonl.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME htonl +#define ALIAS htonl +#define NAME __htonl #include <libkern/ia64/byte_swap_4.S> diff --git a/sys/libkern/ia64/htons.S b/sys/libkern/ia64/htons.S index aaea4da97ed8..16a83d600bf2 100644 --- a/sys/libkern/ia64/htons.S +++ b/sys/libkern/ia64/htons.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME htons +#define ALIAS htons +#define NAME __htons #include <libkern/ia64/byte_swap_2.S> diff --git a/sys/libkern/ia64/ntohl.S b/sys/libkern/ia64/ntohl.S index b3062229d598..2f2e7ba86211 100644 --- a/sys/libkern/ia64/ntohl.S +++ b/sys/libkern/ia64/ntohl.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME ntohl +#define ALIAS ntohl +#define NAME __ntohl #include <libkern/ia64/byte_swap_4.S> diff --git a/sys/libkern/ia64/ntohs.S b/sys/libkern/ia64/ntohs.S index ddd7344de523..051f10380e97 100644 --- a/sys/libkern/ia64/ntohs.S +++ b/sys/libkern/ia64/ntohs.S @@ -28,6 +28,7 @@ * rights to redistribute these changes. */ -#define NAME ntohs +#define ALIAS ntohs +#define NAME __ntohs #include <libkern/ia64/byte_swap_2.S> |
