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

Collapse All | Expand All

(-)Makefile.ori (-11 lines)
Lines 163-169 $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h Link Here
163
163
164
$(OBJDIR)/%.o: %.c
164
$(OBJDIR)/%.o: %.c
165
	tcc -I. -Iinclude -c $< -o $@
165
	tcc -I. -Iinclude -c $< -o $@
166
	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
167
else
166
else
168
$(OBJDIR)/pstart.o: start.S
167
$(OBJDIR)/pstart.o: start.S
169
	$(CROSS)$(CC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@
168
	$(CROSS)$(CC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@
Lines 173-183 $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h Link Here
173
172
174
$(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
173
$(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
175
	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
174
	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
176
	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
177
175
178
$(OBJDIR)/%.o: %.c
176
$(OBJDIR)/%.o: %.c
179
	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
177
	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
180
	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
181
endif
178
endif
182
179
183
ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0)
180
ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0)
Lines 247-264 $(PICODIR)/%.o: %.S $(ARCH)/syscalls.h Link Here
247
244
248
$(PICODIR)/pthread_%.o: libpthread/pthread_%.c
245
$(PICODIR)/pthread_%.o: libpthread/pthread_%.c
249
	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
246
	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
250
	$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
251
247
252
$(PICODIR)/%.o: %.c
248
$(PICODIR)/%.o: %.c
253
	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
249
	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
254
	$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
255
250
256
$(PICODIR)/dstart.o: start.S
251
$(PICODIR)/dstart.o: start.S
257
	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
252
	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
258
253
259
$(PICODIR)/dyn_so_start.o: dyn_start.c
254
$(PICODIR)/dyn_so_start.o: dyn_start.c
260
	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@
255
	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@
261
	$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
262
256
263
DYN_LIBC_PIC = $(LIBOBJ) $(LIBSTDIOOBJ) $(LIBUGLYOBJ) \
257
DYN_LIBC_PIC = $(LIBOBJ) $(LIBSTDIOOBJ) $(LIBUGLYOBJ) \
264
$(LIBCRUFTOBJ) $(LIBCRYPTOBJ) $(LIBSHELLOBJ) $(LIBREGEXOBJ)
258
$(LIBCRUFTOBJ) $(LIBCRYPTOBJ) $(LIBSHELLOBJ) $(LIBREGEXOBJ)
Lines 310-328 CURNAME=$(notdir $(shell pwd)) Link Here
310
304
311
$(OBJDIR)/diet: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
305
$(OBJDIR)/diet: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
312
	$(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -DVERSION=\"$(VERSION)\" -lgcc
306
	$(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -DVERSION=\"$(VERSION)\" -lgcc
313
	$(CROSS)strip -R .comment -R .note $@
314
307
315
$(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
308
$(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
316
	$(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc
309
	$(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc
317
	$(CROSS)strip -R .comment -R .note $@
318
310
319
$(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
311
$(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
320
	$(LD_UNSET) $(CROSS)$(CC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(HOME)/$(PICODIR)/libdl.so
312
	$(LD_UNSET) $(CROSS)$(CC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(HOME)/$(PICODIR)/libdl.so
321
	$(CROSS)strip -R .command -R .note $@
322
313
323
$(PICODIR)/diet-dyn-i: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
314
$(PICODIR)/diet-dyn-i: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
324
	$(LD_UNSET) $(CROSS)$(CC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(ILIBDIR)/libdl.so -DINSTALLVERSION
315
	$(LD_UNSET) $(CROSS)$(CC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(ILIBDIR)/libdl.so -DINSTALLVERSION
325
	$(CROSS)strip -R .command -R .note $@
326
316
327
$(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load
317
$(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load
328
318
Lines 535-541 $(OBJDIR)/fcntl64.o: dietfeatures.h Link Here
535
# This facepalm brought to you by: Ubuntu!
525
# This facepalm brought to you by: Ubuntu!
536
$(OBJDIR)/stackgap.o: lib/stackgap.c dietfeatures.h
526
$(OBJDIR)/stackgap.o: lib/stackgap.c dietfeatures.h
537
	$(CROSS)$(CC) $(INC) $(CFLAGS) -c lib/stackgap.c -o $@ -D__dietlibc__ -fno-stack-protector
527
	$(CROSS)$(CC) $(INC) $(CFLAGS) -c lib/stackgap.c -o $@ -D__dietlibc__ -fno-stack-protector
538
	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
539
528
540
# WANT_MALLOC_ZERO
529
# WANT_MALLOC_ZERO
541
$(OBJDIR)/strndup.o: dietfeatures.h
530
$(OBJDIR)/strndup.o: dietfeatures.h

Return to bug 378711