From 42d7eda0ccdf3249591c95dbf2dd5bddee61ee8e Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Mon, 2 Dec 2013 16:49:00 +0100 Subject: [PATCH] include/stdlib.h: merged Change-Id: I26b032566d1d7a816df56254c5f9e6dc82626a70 --- include/stdlib.h | 3 --- lib/libminc/arch/earm/Makefile.libc.inc | 6 ++++-- lib/libminc/arch/i386/Makefile.libc.inc | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/stdlib.h b/include/stdlib.h index 03a735e20..f9f6231bd 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -246,9 +246,6 @@ int posix_memalign(void **, size_t, size_t); void *alloca(int); /* built-in for gcc */ #elif defined(__PCC__) && !defined(__GNUC__) #define alloca(size) __builtin_alloca(size) -#elif (__GNUC__ >= 2) -/* LSC: MINIX Patch needed (2 following lines) */ -#define alloca(size) __builtin_alloca(size) #else void *alloca(size_t); #endif /* __GNUC__ */ diff --git a/lib/libminc/arch/earm/Makefile.libc.inc b/lib/libminc/arch/earm/Makefile.libc.inc index 3c6a4257a..55fdcf385 100644 --- a/lib/libminc/arch/earm/Makefile.libc.inc +++ b/lib/libminc/arch/earm/Makefile.libc.inc @@ -1,6 +1,8 @@ -SRCS+= byte_swap_2.S byte_swap_4.S ffs.S +SRCS+= alloca.S byte_swap_2.S byte_swap_4.S divsi3.S + SRCS+= memchr.c memcmp.c memcpy.c memmove.c memset.c \ strcat.c strchr.c strcmp.c strcpy.c strlen.c \ strncmp.c strrchr.c + +SRC+= ffs.S SRCS+= bcmp.c -SRCS+= divsi3.S diff --git a/lib/libminc/arch/i386/Makefile.libc.inc b/lib/libminc/arch/i386/Makefile.libc.inc index 8ad9600a0..86174b4ec 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 _setjmp.S +SRCS+= alloca.S 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