[uClibc-cvs] svn commit: trunk/uClibc/libc/sysdeps/linux/common

[solar at uclibc.org]

Author: solar
Date: 2005-05-27 13:46:34 -0600 (Fri, 27 May 2005)
New Revision: 10422

Log:
- keep gcc-4.x happy

Modified:
   trunk/uClibc/libc/sysdeps/linux/common/Makefile
   trunk/uClibc/libc/sysdeps/linux/common/ssp.c


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/common/Makefile
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/Makefile	2005-05-27 05:53:52 UTC (rev 10421)
+++ trunk/uClibc/libc/sysdeps/linux/common/Makefile	2005-05-27 19:46:34 UTC (rev 10422)
@@ -28,6 +28,7 @@
 ifneq ($(strip $(UCLIBC_HAS_SSP)),y)
 SRCS := $(filter-out ssp.c,$(SRCS))
 endif
+ssp.o: CFLAGS += $(SSP_DISABLE_FLAGS)
 
 OBJS  = $(patsubst %.c,%.o, $(SRCS))
 

Modified: trunk/uClibc/libc/sysdeps/linux/common/ssp.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/ssp.c	2005-05-27 05:53:52 UTC (rev 10421)
+++ trunk/uClibc/libc/sysdeps/linux/common/ssp.c	2005-05-27 19:46:34 UTC (rev 10422)
@@ -20,6 +20,10 @@
 # include <config.h>
 #endif
 
+#ifdef __SSP__
+#error ssp.c has to be built w/ -fno-stack-protector
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
@@ -42,7 +46,7 @@
 #endif
 
 /* prototypes */
-extern int __libc_open (__const char *file, int oflag, mode_t mode);
+extern int __libc_open (__const char *file, int oflag, ...);
 extern ssize_t __libc_read(int fd, void *buf, size_t count);
 extern int __libc_close (int fd);