5 OSTYPE = $(shell uname -msr)
8 -CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
9 +CFLAGS = -W -Wall -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
13 @@ -194,9 +194,8 @@ libsyslinux.a: bootsect_bin.o ldlinux_bi
14 $(LIB_SO): bootsect_bin.o ldlinux_bin.o syslxmod.o
15 $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) -o $@ $^
17 -gethostip.o: gethostip.c
19 -gethostip: gethostip.o
20 +gethostip: gethostip.c
21 + $(CC) $(LDFLAGS) gethostip.c -o gethostip -fno-stack-protector
23 mkdiskimage: mkdiskimage.in mbr.bin bin2hex.pl
24 $(PERL) bin2hex.pl < mbr.bin | cat mkdiskimage.in - > $@
25 --- syslinux/com32/lib/MCONFIG
26 +++ syslinux/com32/lib/MCONFIG
27 @@ -18,7 +18,7 @@ LIBFLAGS = -DDYNAMIC_CRC_TABLE -DPNG_NO_
29 REQFLAGS = -g -m32 -mregparm=3 -DREGPARM=3 -D__COM32__ -I. -I./sys -I../include
30 OPTFLAGS = -Os -march=i386 -falign-functions=0 -falign-jumps=0 \
32 + -falign-labels=0 -fno-stack-protector
33 WARNFLAGS = -W -Wall -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline
35 CFLAGS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d $(OPTFLAGS) \
36 --- syslinux/com32/libutil/Makefile
37 +++ syslinux/com32/libutil/Makefile
38 @@ -40,10 +40,10 @@ LD = ld -m elf_i386
42 -CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include
43 +CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,)
44 SFLAGS = $(M32) -D__COM32__ -march=i386
45 LDFLAGS = -T ../lib/com32.ld
46 -LNXCFLAGS = -I./include -W -Wall -O -g
47 +LNXCFLAGS = -I./include -W -Wall -O -g $(call gcc_ok,-fno-stack-protector,)
51 --- syslinux/com32/modules/Makefile
52 +++ syslinux/com32/modules/Makefile
53 @@ -25,8 +25,8 @@ LD = ld -m elf_i386
57 -CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__
58 -LNXCFLAGS = -W -Wall -O -g -I../libutil/include
59 +CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ $(call gcc_ok,-fno-stack-protector,)
60 +LNXCFLAGS = -W -Wall -O -g -I../libutil/include $(call gcc_ok,-fno-stack-protector,)
63 SFLAGS = -D__COM32__ -march=i386
64 --- syslinux/com32/samples/Makefile
65 +++ syslinux/com32/samples/Makefile
66 @@ -25,8 +25,8 @@ LD = ld -m elf_i386
70 -CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__
71 -LNXCFLAGS = -W -Wall -O -g -I../libutil/include
72 +CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ $(call gcc_ok,-fno-stack-protector,)
73 +LNXCFLAGS = -W -Wall -O -g -I../libutil/include $(call gcc_ok,-fno-stack-protector,)
76 SFLAGS = -D__COM32__ -march=i386
77 --- syslinux/dos/Makefile
78 +++ syslinux/dos/Makefile
79 @@ -3,7 +3,7 @@ LD = ld -m elf_i386
81 OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer
82 INCLUDES = -include code16.h -I. -I.. -I../libfat
83 -CFLAGS = -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
84 +CFLAGS = -W -Wall -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
88 --- syslinux/extlinux/Makefile
89 +++ syslinux/extlinux/Makefile
93 INCLUDES = -I. -I.. -I../libfat
94 -CFLAGS = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
95 +CFLAGS = -W -Wall -fno-stack-protector -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
98 SRCS = extlinux.c ../extlinux_bss_bin.c ../extlinux_sys_bin.c
99 --- syslinux/memdisk/Makefile
100 +++ syslinux/memdisk/Makefile
101 @@ -20,7 +20,7 @@ M32 := $(call gcc_ok,-m32,)
102 FREE := $(call gcc_ok,-ffreestanding,)
104 CC = gcc $(M32) $(FREE)
105 -CFLAGS = -g -W -Wall -Wno-sign-compare \
106 +CFLAGS = -g -W -Wall -Wno-sign-compare $(call gcc_ok,-fno-stack-protector,) \
107 -Os -fomit-frame-pointer -march=i386 $(ALIGN) \
108 -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
110 --- syslinux/menu/Makefile
111 +++ syslinux/menu/Makefile
112 @@ -5,7 +5,7 @@ M32 := $(call gcc_ok,-m32,)
114 LUDIR = $(COM32DIR)/libutil
115 LDIR = $(COM32DIR)/lib
116 -CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I$(LUDIR)/include -I$(COM32DIR)/include -Ilibmenu -D__COM32__
117 +CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I$(LUDIR)/include -I$(COM32DIR)/include -Ilibmenu -D__COM32__ $(call gcc_ok,-fno-stack-protector,)
118 SFLAGS = -D__COM32__ -march=i386
119 LDFLAGS = -T $(LDIR)/com32.ld
121 --- syslinux/mtools/Makefile
122 +++ syslinux/mtools/Makefile
126 INCLUDES = -I. -I.. -I../libfat
127 -CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
128 +CFLAGS = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
131 SRCS = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c)
132 --- syslinux/sample/Makefile
133 +++ syslinux/sample/Makefile
134 @@ -25,7 +25,7 @@ LD = ld -m elf_i386
138 -CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include
139 +CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include $(call gcc_ok,-fno-stack-protector,)
143 --- syslinux/unix/Makefile
144 +++ syslinux/unix/Makefile
148 INCLUDES = -I. -I.. -I../libfat
149 -CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
150 +CFLAGS = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
153 SRCS = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c)
154 --- syslinux/win32/Makefile
155 +++ syslinux/win32/Makefile
156 @@ -23,7 +23,7 @@ ifeq ($(findstring CYGWIN,$(OSTYPE)),CYG
160 -CFLAGS = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
161 +CFLAGS = -mno-cygwin -W -Wall -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
163 LDFLAGS = -mno-cygwin -Os -s
165 @@ -37,7 +37,7 @@ AR = mingw-ar
166 RANLIB = mingw-ranlib
169 -CFLAGS = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
170 +CFLAGS = -W -Wall -fno-stack-protector -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64