2 Subject: add compile flags for hardening
3 Author: Joachim Wiedorn <ad_debian at joonet.de>
5 Last-Update: 2013-06-08
7 To support hardening CFLAGS and LDFLAGS must be used
8 by compiler executions.
11 diff -urNa s10/src/Makefile s11/src/Makefile
12 --- s10/src/Makefile 2013-06-07 22:44:13.000000000 +0200
13 +++ s11/src/Makefile 2013-06-08 13:16:36.415275904 +0200
18 -CPP=$(CC) -E -P -ffreestanding
23 G=`cat foo1 foo2 | grep version | cut -d " " -f 3`
25 -CFLAGS=$(OPT) -Wall $(PCONFIG)
26 -LDFLAGS=#-Xlinker -qmagic
27 +FREE=-P -ffreestanding
28 +CFLAGS=$(FREE) $(OPT) -Wall $(PCONFIG)
31 OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \
36 - $(CC) -c $(CFLAGS) $*.c
37 + $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c
40 $(AS86) -w -l $*.lis -o $*.o $*.s
42 dd if=$*.img of=$*.b bs=32 skip=1
45 - $(CC) $(CFLAGS) -DSTANDALONE -o edit $(EDIT) $(LDFLAGS)
46 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DSTANDALONE -o edit $(EDIT)
48 loader.i: mkloader first.b second.b third.b bitmap.b mbr.b chain.b mbr2.b
53 disk.s: disk.S read.S bdata.h biosdata.S lilo.h Makefile
54 - $(CPP) -traditional $(PCONFIG) -o disk.s disk.S
55 + $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) -o disk.s disk.S
57 mbr.s: mbr.S lilo.h Makefile
58 - $(CPP) -traditional $(PCONFIG) -DMBR=0xafbbe760 \
59 + $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) -DMBR=0xafbbe760 \
63 dd if=$*.img of=$*.b bs=32 skip=49
65 mbr2.s: mbr.S lilo.h Makefile
66 - $(CPP) -traditional $(PCONFIG) -DMBX=0x93c00848 \
67 + $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) -DMBX=0x93c00848 \
71 dd if=$*.img of=$*.b bs=32 skip=49
73 bootsect.s: bootsect.S disk.b
74 - $(CPP) -traditional $(PCONFIG) \
75 + $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \
76 -DSIZEDISKB=`wc -c <disk.b | sed "s/ //g"` \
77 -o bootsect.s bootsect.S
79 pseudo1.s: bootsect.S pseudo.S disk.com
80 cat bootsect.S pseudo.S >$(TMP).S
81 - $(CPP) -traditional $(PCONFIG) \
82 + $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \
83 -DSIZEKRNL=`wc -c <disk.com | sed "s/ //g"` \
84 -DSIZEDISKB=512 -o pseudo1.s $(TMP).S
87 pseudo2.s: bootsect.S pseudo.S
88 $(MAKE) -C ../diagnose all
89 cat bootsect.S pseudo.S >$(TMP).S
90 - $(CPP) -traditional $(PCONFIG) \
91 + $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \
92 -DSIZEKRNL=`wc -c <../diagnose/test4.com | sed "s/ //g"` \
93 -DSIZEDISKB=512 -o pseudo2.s $(TMP).S
96 pseudo3.s: bootsect.S pseudo.S
97 $(MAKE) -C ../diagnose all
98 cat bootsect.S pseudo.S >$(TMP).S
99 - $(CPP) -traditional $(PCONFIG) \
100 + $(CPP) $(CPPFLAGS) -traditional $(PCONFIG) \
101 -DSIZEKRNL=`wc -c <../diagnose/test5.com | sed "s/ //g"` \
102 -DSIZEDISKB=512 -o pseudo3.s $(TMP).S
104 @@ -176,13 +176,13 @@
105 cp -p dparam.S dparam.s
108 - $(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS)
109 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o lilo $(OBJS) $(LIBS)
112 - $(CC) -o lilo.static -static $(LDFLAGS) $(OBJS) $(LIBS)
113 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o lilo.static -static $(OBJS) $(LIBS)
116 - $(CPP) -C -traditional -DLILO_ASM -o common.s common.h
117 + $(CPP) $(CPPFLAGS) -C -traditional -DLILO_ASM -o common.s common.h
119 bitmap.o: bitmap.s common.s
120 third.o: third.s common.s
121 @@ -191,25 +191,25 @@
122 chain.o: chain.s common.s
124 first.s: first.S lilo.h version.h Makefile
125 - $(CPP) $(PCONFIG) -DFIRST=0x62177489 -o first.s first.S
126 + $(CPP) $(CPPFLAGS) $(PCONFIG) -DFIRST=0x62177489 -o first.s first.S
128 second.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
129 graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
130 - $(CPP) $(PCONFIG) -DTEXT=0x9dd476ec second.S -o second.s
131 + $(CPP) $(CPPFLAGS) $(PCONFIG) -DTEXT=0x9dd476ec second.S -o second.s
133 third.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
134 graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
135 - $(CPP) $(PCONFIG) -DMENU=0x2012a4a7 second.S -o third.s
136 + $(CPP) $(CPPFLAGS) $(PCONFIG) -DMENU=0x2012a4a7 second.S -o third.s
138 bitmap.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
139 graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
140 - $(CPP) $(PCONFIG) -DBITMAP=0x2ece2fbe second.S -o bitmap.s
141 + $(CPP) $(CPPFLAGS) $(PCONFIG) -DBITMAP=0x2ece2fbe second.S -o bitmap.s
143 chain.s: chain.S lilo.h version.h first.b Makefile
144 - $(CPP) $(PCONFIG) -DCHAIN=0x536a7646 chain.S -o chain.s
145 + $(CPP) $(CPPFLAGS) $(PCONFIG) -DCHAIN=0x536a7646 chain.S -o chain.s
147 xxx.s: chain.S lilo.h Makefile
148 - $(CPP) chain.S -DXXX -o xxx.s
149 + $(CPP) $(CPPFLAGS) chain.S -DXXX -o xxx.s
153 @@ -254,14 +254,14 @@
156 sed '/\#\#\# Dependencies/q' <Makefile >tmp_make
157 - $(CPP) $(CFLAGS) -MM *.c >>tmp_make
158 + $(CPP) $(CFLAGS) $(CPPFLAGS) -MM *.c >>tmp_make
161 version: common.c lilo.h common.h
162 - $(CC) $(CFLAGS) -DSHS_MAIN -o version common.c
163 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DSHS_MAIN -o version common.c
166 - $(CC) $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
167 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DLILO_BINARY -o mkloader temp.c