From 6b8821515da8851628dd9dcd785dacf07085019b Mon Sep 17 00:00:00 2001 From: Kees Jongenburger Date: Tue, 5 Jun 2012 09:37:32 +0000 Subject: [PATCH] Move setjmp and strnlen to common/lib. Move setjmp and strnlen to common/lib to allow libddekit to use them. --- {lib => common/lib}/libc/arch/i386/gen/_setjmp.S | 0 {lib => common/lib}/libc/string/strnlen.c | 0 lib/libminc/Makefile | 4 ++-- lib/libminc/arch/i386/Makefile.libc.inc | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {lib => common/lib}/libc/arch/i386/gen/_setjmp.S (100%) rename {lib => common/lib}/libc/string/strnlen.c (100%) diff --git a/lib/libc/arch/i386/gen/_setjmp.S b/common/lib/libc/arch/i386/gen/_setjmp.S similarity index 100% rename from lib/libc/arch/i386/gen/_setjmp.S rename to common/lib/libc/arch/i386/gen/_setjmp.S diff --git a/lib/libc/string/strnlen.c b/common/lib/libc/string/strnlen.c similarity index 100% rename from lib/libc/string/strnlen.c rename to common/lib/libc/string/strnlen.c diff --git a/lib/libminc/Makefile b/lib/libminc/Makefile index 0c2fd3316..299f9e023 100644 --- a/lib/libminc/Makefile +++ b/lib/libminc/Makefile @@ -37,8 +37,8 @@ SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c \ random.c strtoll.c strtoul.c strtoull.c strtoumax.c \ memchr.c memcmp.c memcpy.c memmove.c popcount32.c popcount64.c \ strcasecmp.c strcat.c strchr.c strcmp.c strcpy.c strlcat.c \ - strlcpy.c strlen.c strncasecmp.c strncmp.c strncpy.c strrchr.c \ - strsep.c strstr.c ptree.c rb.c sha1.c sha2.c + strlcpy.c strlen.c strncasecmp.c strncmp.c strncpy.c strnlen.c \ + strrchr.c strsep.c strstr.c ptree.c rb.c sha1.c sha2.c SRCS+= ${i} CPPFLAGS.${i}+= -D_LIBC -I${LIBCSRCDIR}/include .endfor diff --git a/lib/libminc/arch/i386/Makefile.libc.inc b/lib/libminc/arch/i386/Makefile.libc.inc index eb3032878..e4c2e2abb 100644 --- a/lib/libminc/arch/i386/Makefile.libc.inc +++ b/lib/libminc/arch/i386/Makefile.libc.inc @@ -1,4 +1,4 @@ -SRCS+= byte_swap_2.S byte_swap_4.S ffs.S +SRCS+= byte_swap_2.S byte_swap_4.S ffs.S _setjmp.S SRCS+= memchr.S memcmp.S memcpy.S memmove.S memset.S \ strcat.S strchr.S strcmp.S strcpy.S strlen.S \ strncmp.S strrchr.S -- 2.44.0