Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)
- Fix for possible unset uid/gid in toproto
- Fix for default mtree style
- Update libelf
- Importing libexecinfo
- Resynchronize GCC, mpc, gmp, mpfr
- build.sh: Replace params with show-params.
This has been done as the make target has been renamed in the same
way, while a new target named params has been added. This new
target generates a file containing all the parameters, instead of
printing it on the console.
- Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
get getservbyport() out of the inner loop
Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
@@ -1,5 +1,29 @@
|
||||
# $NetBSD: Makefile.inc,v 1.8 2009/07/30 20:57:15 dsl Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.9 2013/08/21 03:05:35 matt Exp $
|
||||
|
||||
SRCS+= memcpy.S bcopy.S memmove.S memset.S bzero.S ffs.S strcmp.S
|
||||
SRCS+= strncmp.S memcmp.S
|
||||
SRCS.string+= memcmp.S memcpy.S memmove.S memset.S
|
||||
SRCS.string+= ffs.S
|
||||
SRCS.string+= bcopy.S bzero.S
|
||||
SRCS.string+= strcat.S
|
||||
SRCS.string+= strcpy.S strlcpy.S strncpy.S
|
||||
.if empty(LIBC_MACHINE_ARCH:M*v7*)
|
||||
SRCS.string+= strcmp.S strncmp.S
|
||||
SRCS.string+= strlen.S strnlen.S
|
||||
SRCS.string+= strchr.S strrchr.S
|
||||
.endif
|
||||
|
||||
.for f in ${SRCS.string}
|
||||
CPUFLAGS.${f}+= -marm
|
||||
.for s in o po pico ln d
|
||||
${f:.S=.${s}}: ${ARCHDIR}/string/Makefile.inc
|
||||
.endfor
|
||||
.endfor
|
||||
|
||||
.if !empty(LIBC_MACHINE_ARCH:M*v7*)
|
||||
SRCS.string+= strcmp.S strncmp.S
|
||||
SRCS.string+= strlen.S strnlen.S
|
||||
SRCS.string+= strchr.S strrchr.S
|
||||
.endif
|
||||
|
||||
SRCS.string+= strlcat.S
|
||||
|
||||
SRCS+= ${SRCS.string}
|
||||
|
||||
53
lib/libc/arch/arm/string/strncat_naive.S
Normal file
53
lib/libc/arch/arm/string/strncat_naive.S
Normal file
@@ -0,0 +1,53 @@
|
||||
/*-
|
||||
* Copyright (c) 2013 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Matt Thomas of 3am Software Foundry.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
|
||||
RCSID("$NetBSD: strncat_naive.S,v 1.1 2013/01/23 05:44:52 matt Exp $")
|
||||
|
||||
/* LINTSTUB: char *strncat(char *, const char *, size_t) */
|
||||
ENTRY(strncat)
|
||||
teq r2, #0 /* count is 0? */
|
||||
RETc(eq) /* yes, just return dst */
|
||||
mov ip, r0 /* need to preserve r0 */
|
||||
1: ldrb r3, [ip], #1 /* load next byte */
|
||||
teq r3, #0 /* was it a NUL? */
|
||||
bne 1b /* no, get next byte */
|
||||
sub ip, ip, #1 /* back up one to the NUL */
|
||||
2: subs r2, r2, #1 /* subtract 1 from the count */
|
||||
blt 3f /* <0? write terminating NUL */
|
||||
ldrb r3, [r1], #1 /* load next byte from append */
|
||||
strb r3, [ip], #1 /* store it */
|
||||
teq r3, #0 /* was it a NUL? */
|
||||
bne 2b /* no, get next byte */
|
||||
RET /* return */
|
||||
3: mov r3, #0 /* load a NUL */
|
||||
strb r3, [ip] /* store it */
|
||||
RET /* return */
|
||||
END(strncat)
|
||||
Reference in New Issue
Block a user