include/stdlib.h: merged

Change-Id: I26b032566d1d7a816df56254c5f9e6dc82626a70

diff --git a/include/stdlib.h b/include/stdlib.h
index 03a735e20d79d785e8eb0d60e162f992b2703669..f9f6231bdd09e0ef5dabac8d34a3e50e6ca97ad8 100644 (file)
--- 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 3c6a4257af5f74e2a9a31805e1f864f7dc082ea7..55fdcf38580ef753419c7d099864e20fbcb9b958 100644 (file)
--- 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 8ad9600a0498090ac847a9e35636b7e282f7c6d7..86174b4ec0f147c3ce3673f1eb309767d0b2a99d 100644 (file)
--- 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