Renaming, merging with 01_all_nostrip.patch

svn path=/; revision=438

2 files changed, 82 insertions, 23 deletions

diff --git a/dietlibc/patches/0.30-r1/005_all_Makefile.patch b/dietlibc/patches/0.30-r1/005_all_Makefile.patch
new file mode 100644
index 0000000..38166bf
--- /dev/null
+++ b/dietlibc/patches/0.30-r1/005_all_Makefile.patch
@@ -0,0 +1,82 @@
+Index: dietlibc-0.30/Makefile
+===================================================================
+--- dietlibc-0.30.orig/Makefile
++++ dietlibc-0.30/Makefile
+@@ -100,7 +100,6 @@ all: $(WHAT)
+ 
+ profiling: $(OBJDIR)/libgmon.a $(OBJDIR)/pstart.o
+ 
+-CFLAGS=-pipe -nostdinc
+ CROSS=
+ 
+ CC=gcc
+@@ -132,10 +131,6 @@ include $(ARCH)/Makefile.add
+ 
+ LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH))
+ 
+-ifeq ($(CFLAGS),-pipe -nostdinc)
+-CFLAGS+=-O -fomit-frame-pointer
+-endif
+-
+ ifneq ($(DEBUG),)
+ CFLAGS = -g
+ COMMENT = :
+@@ -161,7 +156,6 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
+ 
+ $(OBJDIR)/%.o: %.c
+ 	tcc -I. -Iinclude -c $< -o $@
+-	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+ else
+ $(OBJDIR)/pstart.o: start.S
+ 	$(CROSS)$(CC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@
+@@ -171,11 +165,9 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
+ 
+ $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
+ 	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
+-	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+ 
+ $(OBJDIR)/%.o: %.c
+ 	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
+-	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+ endif
+ 
+ ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0)
+@@ -246,18 +238,15 @@ $(PICODIR)/%.o: %.S $(ARCH)/syscalls.h
+ 
+ $(PICODIR)/pthread_%.o: libpthread/pthread_%.c
+ 	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
+-	$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
+ 
+ $(PICODIR)/%.o: %.c
+ 	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
+-	$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
+ 
+ $(PICODIR)/dstart.o: start.S
+ 	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
+ 
+ $(PICODIR)/dyn_so_start.o: dyn_start.c
+ 	$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@
+-	$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
+ 
+ DYN_LIBC_PIC = $(LIBOBJ) $(LIBSTDIOOBJ) $(LIBUGLYOBJ) \
+ $(LIBCRUFTOBJ) $(LIBCRYPTOBJ) $(LIBSHELLOBJ) $(LIBREGEXOBJ)
+@@ -306,19 +295,15 @@ CURNAME=$(notdir $(shell pwd))
+ 
+ $(OBJDIR)/diet: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
+ 	$(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -DVERSION=\"$(VERSION)\" -lgcc
+-	$(CROSS)strip -R .comment -R .note $@
+ 
+ $(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
+ 	$(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc
+-	$(CROSS)strip -R .comment -R .note $@
+ 
+ $(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
+ 	$(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
+-	$(CROSS)strip -R .command -R .note $@
+ 
+ $(PICODIR)/diet-dyn-i: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
+ 	$(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
+-	$(CROSS)strip -R .command -R .note $@
+ 
+ $(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load
+ 
diff --git a/dietlibc/patches/0.30-r1/00_all_custom-cflags.patch b/dietlibc/patches/0.30-r1/00_all_custom-cflags.patch
deleted file mode 100644
index d692fe7..0000000
--- a/dietlibc/patches/0.30-r1/00_all_custom-cflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: dietlibc-0.30/Makefile
-===================================================================
---- dietlibc-0.30.orig/Makefile
-+++ dietlibc-0.30/Makefile
-@@ -100,7 +100,6 @@ all: $(WHAT)
- 
- profiling: $(OBJDIR)/libgmon.a $(OBJDIR)/pstart.o
- 
--CFLAGS=-pipe -nostdinc
- CROSS=
- 
- CC=gcc
-@@ -132,10 +131,6 @@ include $(ARCH)/Makefile.add
- 
- LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH))
- 
--ifeq ($(CFLAGS),-pipe -nostdinc)
--CFLAGS+=-O -fomit-frame-pointer
--endif
--
- ifneq ($(DEBUG),)
- CFLAGS = -g
- COMMENT = :