Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 246755 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.old (-5 / +5 lines)
Lines 132-138 paxtest: $(TESTS) genpaxtest Link Here
132
132
133
$(EXEC_TESTS) $(MPROT_TESTS): body.o
133
$(EXEC_TESTS) $(MPROT_TESTS): body.o
134
	$(CC) $(CFLAGS) -o $@.o -c $@.c
134
	$(CC) $(CFLAGS) -o $@.o -c $@.c
135
	$(CC) $(LDFLAGS) $(PTHREAD) -o $@ $< $@.o
135
	$(CC) $(LDFLAGS) -o $@ $< $@.o $(PTHREAD)
136
	
136
	
137
$(RAND_TESTS): randbody.o
137
$(RAND_TESTS): randbody.o
138
	$(CC) $(CFLAGS) -o $@.o -c $@.c
138
	$(CC) $(CFLAGS) -o $@.o -c $@.c
Lines 178-184 getstack2: getstack.o Link Here
178
	
178
	
179
$(MPROTSH_TESTS): body.o shlibtest.so
179
$(MPROTSH_TESTS): body.o shlibtest.so
180
	$(CC) $(CFLAGS) -o $@.o -c $@.c
180
	$(CC) $(CFLAGS) -o $@.o -c $@.c
181
	$(CC) $(LDFLAGS) $(PTHREAD) -o $@ $@.o $^
181
	$(CC) $(LDFLAGS) -o $@ $@.o $^ $(PTHREAD)
182
182
183
# used for RANDEXEC'd binaries
183
# used for RANDEXEC'd binaries
184
retbody.o: body.c
184
retbody.o: body.c
Lines 187-198 retbody.o: body.c Link Here
187
# build as ET_EXEC (recommended by PaX Team, not really a requirement)
187
# build as ET_EXEC (recommended by PaX Team, not really a requirement)
188
$(RET_TESTS): retbody.o
188
$(RET_TESTS): retbody.o
189
	$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c
189
	$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c
190
	$(CC) $(LDFLAGS) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o
190
	$(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD)
191
191
192
# build as ET_EXEC (not in Adamantix's Makefile)
192
# build as ET_EXEC (not in Adamantix's Makefile)
193
$(RETX_TESTS): retbody.o
193
$(RETX_TESTS): retbody.o
194
	$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c
194
	$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c
195
	$(CC) $(LDFLAGS) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o
195
	$(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD)
196
	$(PAXBIN) -SPXM $@
196
	$(PAXBIN) -SPXM $@
197
	
197
	
198
# should also shlibbss.o and shlibdata.o be built w/ PIC?
198
# should also shlibbss.o and shlibdata.o be built w/ PIC?
Lines 204-207 shlib%.so: shlib%.o Link Here
204
	$(CC) $(SHLDFLAGS) -shared -o $@ $<
204
	$(CC) $(SHLDFLAGS) -shared -o $@ $<
205
205
206
$(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o
206
$(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o
207
	$(CC) $(LDFLAGS) $(PTHREAD) -o $@ body.o $@.o $(SHLIBS) $(DL)
207
	$(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) $(DL) $(PTHREAD)

Return to bug 246755