- more patches updated

[packages/dietlibc.git] / dietlibc-nostrip.patch

diff --git a/dietlibc-nostrip.patch b/dietlibc-nostrip.patch
index f5ab5546d84d2e32e5bdd46a28ebcfd3085db981..0cff4ea16b61602929ed36933dddebdbbed1d65e 100644 (file)
--- a/dietlibc-nostrip.patch
+++ b/dietlibc-nostrip.patch
@@ -4,58 +4,59 @@
  
  $(OBJDIR)/%.o: %.c
        tcc -I. -Iinclude -c $< -o $@
--      $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+-      -$(STRIP) -x -R .comment -R .note $@
  else
  $(OBJDIR)/pstart.o: start.S
-       $(CROSS)$(CC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@
-@@ -171,11 +170,9 @@
+       $(CCC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@
+@@ -171,12 +170,10 @@
  
- $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
-       $(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
--      $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+ $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c | $(OBJDIR)
+       $(CCC) $(INC) $(CFLAGS) $(EXTRACFLAGS) -c $< -o $@
+-      -$(STRIP) -x -R .comment -R .note $@
+ $(OBJDIR)/stack_smash_handler2.o:     EXTRACFLAGS:=-fno-omit-frame-pointer
  
- $(OBJDIR)/%.o: %.c
-       $(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
--      $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
- endif
+ $(OBJDIR)/%.o: %.c | $(OBJDIR)
+       $(CCC) $(INC) $(CFLAGS) $(EXTRACFLAGS) -c $< -o $@ -D__dietlibc__
+-      -$(STRIP) -x -R .comment -R .note $@
  
- ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0)
+ $(addprefix $(OBJDIR)/,$(NO_STACK_PROTECTOR)) \
+ $(addprefix $(PICODIR)/,$(NO_STACKPROTECTOR)):        EXTRACFLAGS+=-fno-stack-protector
 @@ -246,18 +243,15 @@
  
- $(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)/pthread_%.o: libpthread/pthread_%.c | $(PICODIR)
+       $(CCC) $(INC) $(CFLAGS) $(EXTRACFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
+-      $(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)/%.o: %.c | $(PICODIR)
+       $(CCC) $(INC) $(CFLAGS) $(EXTRACFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
+-      $(STRIP) -x -R .comment -R .note $@
  
- $(PICODIR)/dstart.o: start.S
-       $(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
+ $(PICODIR)/dstart.o: start.S | $(PICODIR)
+       $(CCC) $(INC) $(CFLAGS) $(EXTRACFLAGS) -fPIC -D__DYN_LIB $(ASM_CFLAGS) -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 $@
+ $(PICODIR)/dyn_so_start.o: dyn_start.c | $(PICODIR)
+       $(CCC) $(INC) $(CFLAGS) $(EXTRACFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@
+-      $(STRIP) -x -R .comment -R .note $@
  
  DYN_LIBC_PIC = $(LIBOBJ) $(LIBSTDIOOBJ) $(LIBUGLYOBJ) \
  $(LIBCRUFTOBJ) $(LIBCRYPTOBJ) $(LIBSHELLOBJ) $(LIBREGEXOBJ)
 @@ -306,19 +300,15 @@
  
  $(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 $@
+       $(CCC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -DVERSION=\"$(VERSION)\" -lgcc
+-      $(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 $@
+       $(CCC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc
+-      $(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 $@
+       $(LD_UNSET) $(CCC) -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
+-      $(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 $@
+       $(LD_UNSET) $(CCC) -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
+-      $(STRIP) -R .command -R .note $@
  
  $(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load