[packages/dietlibc] - more patches updated
baggins
baggins at pld-linux.org
Sat Jan 3 18:33:04 CET 2015
commit b25998757b1228a3d696049d9c242e436c8583f7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jan 3 17:32:49 2015 +0000
- more patches updated
dietlibc-memalign.patch | 8 ++-----
dietlibc-nostrip.patch | 61 +++++++++++++++++++++++++------------------------
dietlibc-opt.patch | 16 ++++++-------
dietlibc-platform.patch | 6 ++---
umount-arch.patch | 4 ++--
5 files changed, 46 insertions(+), 49 deletions(-)
---
diff --git a/dietlibc-memalign.patch b/dietlibc-memalign.patch
index d5d86c1..4c93cd7 100644
--- a/dietlibc-memalign.patch
+++ b/dietlibc-memalign.patch
@@ -39,7 +39,7 @@ diff -ur dietlibc-0.31/lib/alloc.c dietlibc-0.31-memalign/lib/alloc.c
}
void __libc_free(void *ptr) __attribute__((alias("_alloc_libc_free")));
void free(void *ptr) __attribute__((weak,alias("_alloc_libc_free")));
-@@ -268,3 +249,83 @@
+@@ -268,3 +249,79 @@
}
void* realloc(void* ptr, size_t size) __attribute__((weak,alias("__libc_realloc")));
@@ -52,7 +52,6 @@ diff -ur dietlibc-0.31/lib/alloc.c dietlibc-0.31-memalign/lib/alloc.c
+struct alignlist *_aligned_blocks;
+
+/* Return memory to the heap. */
-+int __libc_free_aligned(void *ptr);
+int __libc_free_aligned(void *ptr) {
+ struct alignlist *l;
+ register size_t size;
@@ -77,7 +76,6 @@ diff -ur dietlibc-0.31/lib/alloc.c dietlibc-0.31-memalign/lib/alloc.c
+ return 0;
+}
+
-+void * memalign (size_t alignment, size_t size);
+void * memalign (size_t alignment, size_t size) {
+ void * result;
+ unsigned long int adj;
@@ -111,7 +109,6 @@ diff -ur dietlibc-0.31/lib/alloc.c dietlibc-0.31-memalign/lib/alloc.c
+ return result;
+}
+
-+int posix_memalign(void **memptr, size_t alignment, size_t size);
+int posix_memalign(void **memptr, size_t alignment, size_t size)
+{
+ if(alignment % sizeof(void*) != 0) return EINVAL;
@@ -119,7 +116,6 @@ diff -ur dietlibc-0.31/lib/alloc.c dietlibc-0.31-memalign/lib/alloc.c
+ return (*memptr != NULL) ? 0 : ENOMEM;
+}
+
-+void * valloc (size_t size);
+void * valloc (size_t size) {
-+ return memalign(PAGE_SIZE, size);
++ return memalign(__DIET_PAGE_SIZE, size);
+}
diff --git a/dietlibc-nostrip.patch b/dietlibc-nostrip.patch
index f5ab554..0cff4ea 100644
--- 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
diff --git a/dietlibc-opt.patch b/dietlibc-opt.patch
index dbcbf59..c782cd6 100644
--- a/dietlibc-opt.patch
+++ b/dietlibc-opt.patch
@@ -7,11 +7,11 @@ diff -ur dietlibc-0.30.org/findcflags.sh dietlibc-0.30/findcflags.sh
case $version in
- 2.9*) echo -march=i386 -Os -fomit-frame-pointer -malign-functions=1 -malign-jumps=1 -malign-loops=1 -mpreferred-stack-boundary=2 ;;
- 3.0*) echo -march=i386 -Os -fomit-frame-pointer -malign-functions=1 -malign-jumps=1 -malign-loops=1 -mpreferred-stack-boundary=2 ;;
-- [34]*) echo -Os -fomit-frame-pointer -falign-functions=1 -falign-jumps=1 -falign-loops=1 -mpreferred-stack-boundary=2;;
+- [34]*) echo -Os -fomit-frame-pointer -falign-functions=1 -falign-jumps=1 -falign-loops=1 -mpreferred-stack-boundary=4;;
- *) echo -O2 -pipe -fomit-frame-pointer ;;
+ 2.9*) echo ${OPTFLAGS} -Os -fomit-frame-pointer -malign-functions=1 -malign-jumps=1 -malign-loops=1 -mpreferred-stack-boundary=2 ;;
+ 3.0*) echo ${OPTFLAGS} -Os -fomit-frame-pointer -malign-functions=1 -malign-jumps=1 -malign-loops=1 -mpreferred-stack-boundary=2 ;;
-+ [34]*) echo ${OPTFLAGS} -Os -fomit-frame-pointer -falign-functions=1 -falign-jumps=1 -falign-loops=1 -mpreferred-stack-boundary=2;;
++ [34]*) echo ${OPTFLAGS} -Os -fomit-frame-pointer -falign-functions=1 -falign-jumps=1 -falign-loops=1 -mpreferred-stack-boundary=4;;
+ *) echo -O2 ${OPTFLAGS} -pipe -fomit-frame-pointer ;;
esac
diff -ur dietlibc-0.30.org/Makefile dietlibc-0.30/Makefile
@@ -21,23 +21,23 @@ diff -ur dietlibc-0.30.org/Makefile dietlibc-0.30/Makefile
profiling: $(OBJDIR)/libgmon.a $(OBJDIR)/pstart.o
--CFLAGS=-pipe -nostdinc
-+CFLAGS=-pipe -nostdinc $(OPTFLAGS)
+-DEFAULTCFLAGS=-pipe -nostdinc -D_REENTRANT $(EXTRACFLAGS)
++DEFAULTCFLAGS=-pipe -nostdinc -D_REENTRANT $(EXTRACFLAGS) $(OPTFLAGS)
+ CFLAGS=$(DEFAULTCFLAGS)
CROSS=
- CC=gcc
@@ -132,14 +132,6 @@
LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH))
--ifeq ($(CFLAGS),-pipe -nostdinc)
+-ifeq ($(CFLAGS),$(DEFAULTCFLAGS))
-CFLAGS+=-O -fomit-frame-pointer
-endif
-
-ifneq ($(DEBUG),)
-CFLAGS = -g
--COMMENT = :
+-STRIP = :
-endif
- CFLAGS += -W -Wall -Wextra -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wno-switch -Wno-unused -Wredundant-decls
+ CFLAGS += -W -Wall -Wextra -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wno-switch -Wno-unused -Wredundant-decls -Wshadow
PWD=$(shell pwd)
diff --git a/dietlibc-platform.patch b/dietlibc-platform.patch
index c38838d..96cf902 100644
--- a/dietlibc-platform.patch
+++ b/dietlibc-platform.patch
@@ -11,6 +11,6 @@ diff -uNrp dietlibc-0.29.orig/diet.c dietlibc-0.29/diet.c
+ else if (!strncmp(shortplatform, "amd64", 5)) strcpy(shortplatform, "x86_64");
+ else if (!strncmp(shortplatform, "armv", 4)) strcpy(shortplatform, "arm");
+ else if (!strncmp(shortplatform, "sparcv", 6)) strcpy(shortplatform, "sparc");
- } else {
- #ifdef __sparc__
- #ifdef __arch64__
+ else if (strcmp(shortplatform, "powerpc") == 0)
+ strcpy(shortplatform, "ppc");
+ else if (strcmp(shortplatform, "powerpc64") == 0)
diff --git a/umount-arch.patch b/umount-arch.patch
index 9380db9..d39469f 100644
--- a/umount-arch.patch
+++ b/umount-arch.patch
@@ -103,8 +103,8 @@ index f660930..ca00e4d 100644
+++ b/ia64/Makefile.add
@@ -1,2 +1,2 @@
VPATH:=ia64:syscalls.s:$(VPATH)
--LIBOBJ+=$(OBJDIR)/__time.o $(OBJDIR)/__waitpid.o $(OBJDIR)/__nice.o $(OBJDIR)/__alarm.o $(OBJDIR)/__CAS.o
-+LIBOBJ+=$(OBJDIR)/__time.o $(OBJDIR)/__waitpid.o $(OBJDIR)/__nice.o $(OBJDIR)/__alarm.o $(OBJDIR)/__CAS.o $(OBJDIR)/umount-wrapper.o
+-LIBOBJ+=$(OBJDIR)/__time.o $(OBJDIR)/__waitpid.o $(OBJDIR)/__alarm.o $(OBJDIR)/__CAS.o $(OBJDIR)/__pause.o
++LIBOBJ+=$(OBJDIR)/__time.o $(OBJDIR)/__waitpid.o $(OBJDIR)/__alarm.o $(OBJDIR)/__CAS.o $(OBJDIR)/__pause.o $(OBJDIR)/umount-wrapper.o
diff --git a/ia64/umount-wrapper.c b/ia64/umount-wrapper.c
new file mode 100644
index 0000000..2ebffd6
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dietlibc.git/commitdiff/b25998757b1228a3d696049d9c242e436c8583f7
More information about the pld-cvs-commit
mailing list