Don't rename bswap{16,32} if either _KERNEL or _STANDALONE are defined,
instead of just if _KERNEL was defined. Fixes sbmips bootblocks build problems. Thanks to Valeriy Ushakov for showing me where the problem was.
This commit is contained in:
parent
6a86b29b9d
commit
1ee1a1e6e2
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: byte_swap_2.S,v 1.1 2005/12/20 19:28:49 christos Exp $ */
|
||||
/* $NetBSD: byte_swap_2.S,v 1.2 2006/02/08 21:52:36 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
@ -36,14 +36,14 @@
|
|||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
ASMSTR("from: @(#)htons.s 8.1 (Berkeley) 6/4/93")
|
||||
ASMSTR("$NetBSD: byte_swap_2.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
|
||||
ASMSTR("$NetBSD: byte_swap_2.S,v 1.2 2006/02/08 21:52:36 simonb Exp $")
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#undef _LOCORE
|
||||
#define _LOCORE /* XXX not really, just assembly-code source */
|
||||
#include <machine/endian.h>
|
||||
|
||||
#ifdef _KERNEL
|
||||
#if defined(_KERNEL) || defined(_STANDALONE)
|
||||
#define BSWAP16_NAME bswap16
|
||||
#else
|
||||
#ifdef __ABICALLS__
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: byte_swap_4.S,v 1.1 2005/12/20 19:28:49 christos Exp $ */
|
||||
/* $NetBSD: byte_swap_4.S,v 1.2 2006/02/08 21:52:36 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
@ -36,14 +36,14 @@
|
|||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
ASMSTR("from: @(#)htonl.s 8.1 (Berkeley) 6/4/93")
|
||||
ASMSTR("$NetBSD: byte_swap_4.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
|
||||
ASMSTR("$NetBSD: byte_swap_4.S,v 1.2 2006/02/08 21:52:36 simonb Exp $")
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#undef _LOCORE
|
||||
#define _LOCORE /* XXX not really, just assembly-code source */
|
||||
#include <machine/endian.h>
|
||||
|
||||
#ifdef _KERNEL
|
||||
#if defined(_KERNEL) || defined(_STANDALONE)
|
||||
#define BSWAP32_NAME bswap32
|
||||
#else
|
||||
#ifdef __ABICALLS__
|
||||
|
|
Loading…
Reference in New Issue