Browse Source

- keep gcc-4.x happy

Ned Ludd 20 years ago
parent
commit
97f7b347cf
2 changed files with 6 additions and 1 deletions
  1. 1 0
      libc/sysdeps/linux/common/Makefile
  2. 5 1
      libc/sysdeps/linux/common/ssp.c

+ 1 - 0
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))
 

+ 5 - 1
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);