summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2005-05-27 19:46:34 +0000
committerNed Ludd <solar@gentoo.org>2005-05-27 19:46:34 +0000
commit97f7b347cf7cd3f4d72523e1df99334ce9ed9e42 (patch)
treea11da73294f9cab76bb570990887751715dd1757 /libc/sysdeps/linux
parent16d10b9a837d067e8eac0bef1c9469cc0372c358 (diff)
- keep gcc-4.x happy
Diffstat (limited to 'libc/sysdeps/linux')
-rw-r--r--libc/sysdeps/linux/common/Makefile1
-rw-r--r--libc/sysdeps/linux/common/ssp.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 5e17cc9fc..84b29ac53 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -28,6 +28,7 @@ endif
ifneq ($(strip $(UCLIBC_HAS_SSP)),y)
SRCS := $(filter-out ssp.c,$(SRCS))
endif
+ssp.o: CFLAGS += $(SSP_DISABLE_FLAGS)
OBJS = $(patsubst %.c,%.o, $(SRCS))
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index e58dfdb9a..9db8338e7 100644
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -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);