rpms/dietlibc/devel ChangeLog.2005, NONE, 1.1 dietlibc-0.31-smp-fix.patch, NONE, 1.1 dietlibc-0.31-stackgap-minor.patch, NONE, 1.1 dietlibc-0.31-strip.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 dietlibc-0.28-setpriority.patch, 1.4, 1.5 dietlibc-0.29-scall.patch, 1.6, 1.7 dietlibc-0.30-longdouble.patch, 1.4, 1.5 dietlibc-0.31-defpath.patch, 1.4, 1.5 dietlibc-0.31-implicitfunc.patch, 1.7, 1.8 dietlibc-0.31-lcctime.patch, 1.4, 1.5 dietlibc-0.31-no-stack-protector.patch, 1.1, 1.2 dietlibc-0.31-noreturn.patch, 1.4, 1.5 dietlibc-0.31-pagesize.patch, 1.12, 1.13 dietlibc-0.31-printFG.patch, 1.8, 1.9 dietlibc-0.31-stacksmash-dyn.patch, 1.4, 1.5 dietlibc-0.31-stacksmash.patch, 1.4, 1.5 dietlibc-0.31-testsuite.patch, 1.7, 1.8 dietlibc-0.31.20080212-teststdout.patch, 1.4, 1.5 dietlibc.spec, 1.65, 1.66 lastver, 1.1, 1.2 sources, 1.13, 1.14
ensc
ensc at fedoraproject.org
Sat Jul 25 14:52:49 UTC 2009
Author: ensc
Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23944
Modified Files:
.cvsignore dietlibc-0.28-setpriority.patch
dietlibc-0.29-scall.patch dietlibc-0.30-longdouble.patch
dietlibc-0.31-defpath.patch dietlibc-0.31-implicitfunc.patch
dietlibc-0.31-lcctime.patch
dietlibc-0.31-no-stack-protector.patch
dietlibc-0.31-noreturn.patch dietlibc-0.31-pagesize.patch
dietlibc-0.31-printFG.patch dietlibc-0.31-stacksmash-dyn.patch
dietlibc-0.31-stacksmash.patch dietlibc-0.31-testsuite.patch
dietlibc-0.31.20080212-teststdout.patch dietlibc.spec lastver
sources
Added Files:
ChangeLog.2005 dietlibc-0.31-smp-fix.patch
dietlibc-0.31-stackgap-minor.patch dietlibc-0.31-strip.patch
Log Message:
updated
--- NEW FILE ChangeLog.2005 ---
* Sun Oct 30 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-4
- added '-fno-stack-protector' to the CFLAGS
* Sun Oct 30 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-3
- removed '-fstack-protector' from CLI because it uses __stack_chk_fail
which is not provided by dietlibc
* Thu May 26 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-2
- rebuilt
* Tue May 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-1
- updated to 0.29
- unset some compiler options which cause errors with gcc4
- rediffed -scall patch
- removed most patches as already in upstream
* Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-6
- use %%dist instead of %%disttag
- package some more %%doc files (reported by Chris Ricker)
- add %%release to the BuildRoot (reported by Chris Ricker)
- fixed URLs of the sources (reported by Chris Ricker)
* Sun May 1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-5
- added Herbert Poetzl's syscall(2) implementation for x86_64 and
sparc* architectures (see
http://vserver.13thfloor.at/Experimental/delta-diet.diff); rediffed
the .call patch
- catch the case when syscall(2) is used on archs where it is not
implemented yet
- define MADV_* constants on HPPA and IA64 archs
- fix *truncate64() handling on 64bit archs
* Fri Mar 4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-4
- rebuild
- fixed compilation with gcc4
- made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
provided by Colin Hill)
- build the dynamic libs for x86, x86_64 and arm only
- fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the
'__powerpc__' one)
- added some O_* -flags for the HPPA arch
- use more modern flags for '-Os'
* Tue Feb 1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
- updated to 0.28
- unset LD_RUN_PATH which would result in empty rpaths else
- removed the waitpid patch; it is solved upstream
* Tue Aug 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.27-1
- updated to 0.27
* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.26-1
- updated to 0.26
* Fri Apr 9 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.25-1
- updated to 0.25
* Sat Jan 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-5
- renewed -snprintf patch
* Tue Jan 6 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-4
- applied -snprintf patch (from fedora dietlibc-0.24-2 package)
* Tue Dec 30 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-2
- added C99 patch
* Thu Dec 4 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.24-1
- updated to 0.24
* Tue Sep 16 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.23-1
- updated to 0.23
* Fri Nov 8 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.21-1
- updated to 0.21
- removed unpackaged files in %%install-stage
* Thu Jul 11 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.18-1
- updated to 0.18
* Thu Jul 4 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
- Initial build.
dietlibc-0.31-smp-fix.patch:
Makefile | 43 +++++++++++++++++++++----------------------
1 file changed, 21 insertions(+), 22 deletions(-)
--- NEW FILE dietlibc-0.31-smp-fix.patch ---
>From c1354c051ff98683508272385834d35198253542 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 25 Jul 2009 13:54:39 +0200
Subject: [PATCH 02/18] Fixed SMP build
'make -j' fails usually because $(OBJDIR) was not created yet when
compiling files.
This patch adds a $(OBJDIR)/.dirstamp target which is added as a
dependency for object files and executes an 'mkdir'.
Ditto for $(PICODIR)
---
Makefile | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Makefile b/Makefile
index adc2779..8009cb4 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ ILIBDIR=$(LIBDIR)-$(ARCH)
HOME=$(shell pwd)
-WHAT= $(OBJDIR) $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o $(OBJDIR)/dyn_stop.o \
+WHAT= $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o $(OBJDIR)/dyn_stop.o \
$(OBJDIR)/dietlibc.a $(OBJDIR)/liblatin1.a \
$(OBJDIR)/libcompat.a $(OBJDIR)/libm.a \
$(OBJDIR)/librpc.a $(OBJDIR)/libpthread.a \
@@ -150,30 +150,30 @@ PWD=$(shell pwd)
# added real dynamic dietlibc.so
PICODIR = pic-$(ARCH)
-$(OBJDIR) $(PICODIR):
- mkdir $@
-
% :: %,v
+%/.dirstamp:
+ mkdir $*
+ @touch $@
ifeq ($(CC),tcc)
-$(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
+$(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h $(OBJDIR)/.dirstamp
$(CROSS)cpp $(INC) $< | $(CROSS)as -o $@
-$(OBJDIR)/%.o: %.c
+$(OBJDIR)/%.o: %.c $(OBJDIR)/.dirstamp
tcc -I. -Iinclude -c $< -o $@
$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
else
-$(OBJDIR)/pstart.o: start.S
+$(OBJDIR)/pstart.o: start.S $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@
-$(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
+$(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
-$(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
+$(OBJDIR)/pthread_%.o: libpthread/pthread_%.c $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
-$(OBJDIR)/%.o: %.c
+$(OBJDIR)/%.o: %.c $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
endif
@@ -188,7 +188,7 @@ endif
CC+=-D__dietlibc__
-$(OBJDIR)/crypt.o: libcrypt/crypt.c
+$(OBJDIR)/crypt.o: libcrypt/crypt.c $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(SAFER_CFLAGS) -c $< -o $@
DIETLIBC_OBJ = $(OBJDIR)/unified.o \
@@ -203,7 +203,7 @@ $(OBJDIR)/dietlibc.a: $(DIETLIBC_OBJ) $(OBJDIR)/start.o
$(OBJDIR)/librpc.a: $(LIBRPCOBJ)
$(CROSS)ar cru $@ $(LIBRPCOBJ)
-$(OBJDIR)/libcrypt.a:
+$(OBJDIR)/libcrypt.a: $(OBJDIR)/.dirstamp
touch dummy.c
$(CROSS)$(CC) -c dummy.c
$(CROSS)ar cru $@ dummy.o
@@ -235,26 +235,26 @@ dyn: dyn_lib
$(OBJDIR)/libdl.a: $(LIBDLOBJ)
$(CROSS)ar cru $@ $(LIBDLOBJ)
-dyn_lib: $(PICODIR) $(PICODIR)/libc.so $(PICODIR)/dstart.o \
+dyn_lib: $(PICODIR)/libc.so $(PICODIR)/dstart.o \
$(PICODIR)/dyn_so_start.o $(PICODIR)/dyn_start.o $(PICODIR)/dyn_stop.o \
$(PICODIR)/libpthread.so $(PICODIR)/libdl.so $(PICODIR)/libcompat.so \
$(PICODIR)/libm.so $(PICODIR)/diet-dyn $(PICODIR)/diet-dyn-i
-$(PICODIR)/%.o: %.S $(ARCH)/syscalls.h
+$(PICODIR)/%.o: %.S $(ARCH)/syscalls.h $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
-$(PICODIR)/pthread_%.o: libpthread/pthread_%.c
+$(PICODIR)/pthread_%.o: libpthread/pthread_%.c $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
-$(PICODIR)/%.o: %.c
+$(PICODIR)/%.o: %.c $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
-$(PICODIR)/dstart.o: start.S
+$(PICODIR)/dstart.o: start.S $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
-$(PICODIR)/dyn_so_start.o: dyn_start.c
+$(PICODIR)/dyn_so_start.o: dyn_start.c $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@
$(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
@@ -272,13 +272,13 @@ DYN_LIBCOMPAT_OBJS = $(patsubst $(OBJDIR)/%.o,$(PICODIR)/%.o,$(LIBCOMPATOBJ))
DYN_LIBMATH_OBJS = $(patsubst $(OBJDIR)/%.o,$(PICODIR)/%.o,$(LIBMATHOBJ))
-$(PICODIR)/libc.so: $(PICODIR) $(DYN_LIBC_OBJ)
+$(PICODIR)/libc.so: $(DYN_LIBC_OBJ)
$(LD_UNSET) $(CROSS)$(CC) -nostdlib -shared -o $@ $(CFLAGS) -fPIC $(DYN_LIBC_OBJ) -lgcc -Wl,-soname=libc.so
$(PICODIR)/libpthread.so: $(DYN_PTHREAD_OBJS) dietfeatures.h
$(LD_UNSET) $(CROSS)$(CC) -nostdlib -shared -o $@ $(CFLAGS) -fPIC $(DYN_PTHREAD_OBJS) -L$(PICODIR) -lc -Wl,-soname=libpthread.so
-$(PICODIR)/libdl.so: libdl/_dl_main.c dietfeatures.h
+$(PICODIR)/libdl.so: libdl/_dl_main.c dietfeatures.h $(PICODIR)/.dirstamp
$(LD_UNSET) $(CROSS)$(CC) -D__OD_CLEAN_ROOM -DNODIETREF -fPIC -nostdlib -shared -Bsymbolic -Wl,-Bsymbolic \
-o $@ $(SAFE_CFLAGS) $(INC) libdl/_dl_main.c -Wl,-soname=libdl.so
@@ -330,7 +330,7 @@ $(OBJDIR)/load:
chmod 755 $@
clean:
- rm -f *.o *.a t t1 compile load elftrunc exports mapfile libdietc.so
+ rm -f *.o *.a t t1 compile load elftrunc exports mapfile libdietc.so .dirstamp
rm -rf bin-* pic-*
$(MAKE) -C examples clean
$(MAKE) -C dynlinker clean
--
1.6.2.5
dietlibc-0.31-stackgap-minor.patch:
stackgap.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE dietlibc-0.31-stackgap-minor.patch ---
>From b993cb8bebea6870771bb66eae8b6d41f9e6e9e6 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 25 Jul 2009 15:34:44 +0200
Subject: [PATCH 17/18] minor cleanups in stackgap.c
---
lib/stackgap.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/stackgap.c b/lib/stackgap.c
index 5d51c5d..f30b58a 100644
--- a/lib/stackgap.c
+++ b/lib/stackgap.c
@@ -26,9 +26,9 @@ void* __tdataptr;
static void findtlsdata(long* auxvec) {
#if (__WORDSIZE == 64)
- Elf64_Phdr* x=0;
+ Elf64_Phdr const * x=0;
#else
- Elf32_Phdr* x=0;
+ Elf32_Phdr const * x=0;
#endif
size_t i,n;
#ifndef WANT_ELFINFO
@@ -125,9 +125,9 @@ int stackgap(int argc,char* argv[],char* envp[]) {
#endif
#ifdef WANT_STACKGAP
unsigned short s;
+ volatile char* gap;
#endif
#if defined(WANT_STACKGAP) || defined(WANT_SSP)
- volatile char* gap;
#ifndef WANT_ELFINFO
rand=find_rand(auxvec);
#else
--
1.6.2.5
dietlibc-0.31-strip.patch:
Makefile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
--- NEW FILE dietlibc-0.31-strip.patch ---
>From 87682b6ad631272dfdc45e1c760331d803851c06 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 25 Jul 2009 15:12:43 +0200
Subject: [PATCH 03/18] Define and use $(STRIP) makefile variable
This increases readability and makes it easier to turn off stripping
of debug symbols.
---
Makefile | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 8009cb4..dc23d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,7 @@ CROSS=
CC=gcc
INC=-I. -isystem include
+STRIP=$(CROSS)strip
VPATH=lib:libstdio:libugly:libcruft:libcrypt:libshell:liblatin1:libcompat:libdl:librpc:libregex:libm:profiling
@@ -161,7 +162,7 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h $(OBJDIR)/.dirstamp
$(OBJDIR)/%.o: %.c $(OBJDIR)/.dirstamp
tcc -I. -Iinclude -c $< -o $@
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
else
$(OBJDIR)/pstart.o: start.S $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@
@@ -171,11 +172,11 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h $(OBJDIR)/.dirstamp
$(OBJDIR)/pthread_%.o: libpthread/pthread_%.c $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
$(OBJDIR)/%.o: %.c $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
endif
ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0)
@@ -245,18 +246,18 @@ $(PICODIR)/%.o: %.S $(ARCH)/syscalls.h $(PICODIR)/.dirstamp
$(PICODIR)/pthread_%.o: libpthread/pthread_%.c $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
+ $(COMMENT) $(STRIP) -x -R .comment -R .note $@
$(PICODIR)/%.o: %.c $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
+ $(COMMENT) $(STRIP) -x -R .comment -R .note $@
$(PICODIR)/dstart.o: start.S $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
$(PICODIR)/dyn_so_start.o: dyn_start.c $(PICODIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@
- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
+ $(COMMENT) $(STRIP) -x -R .comment -R .note $@
DYN_LIBC_PIC = $(LIBOBJ) $(LIBSTDIOOBJ) $(LIBUGLYOBJ) \
$(LIBCRUFTOBJ) $(LIBCRYPTOBJ) $(LIBSHELLOBJ) $(LIBREGEXOBJ)
@@ -305,19 +306,19 @@ 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 $@
+ $(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 $@
+ $(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 $@
+ $(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 $@
+ $(STRIP) -R .command -R .note $@
$(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load
--
1.6.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 1 Mar 2009 11:53:24 -0000 1.7
+++ .cvsignore 25 Jul 2009 14:52:48 -0000 1.8
@@ -1 +1,2 @@
-dietlibc-0.31.20090228.tar.bz2
+dietlibc-0.32.tar.bz2
+dietlibc-0.32.tar.bz2.sig
dietlibc-0.28-setpriority.patch:
__nice.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Index: dietlibc-0.28-setpriority.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.28-setpriority.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dietlibc-0.28-setpriority.patch 1 Mar 2009 11:53:24 -0000 1.4
+++ dietlibc-0.28-setpriority.patch 25 Jul 2009 14:52:48 -0000 1.5
@@ -1,7 +1,7 @@
-From 5ba671b7b8446645f31fcf7928908950573c53f5 Mon Sep 17 00:00:00 2001
+From fdd7de4dbb4b214b45e1b53100110af4e4895458 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:49:05 +0200
-Subject: [PATCH] Return new nice value for nice(2)
+Subject: [PATCH 01/18] Return new nice value for nice(2)
Changed nice(2) to return the new nice value instead of 0/-1.
---
@@ -29,5 +29,5 @@ index d751104..8e205c0 100644
}
#endif
--
-1.6.0.6
+1.6.2.5
dietlibc-0.29-scall.patch:
syscall.S | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
Index: dietlibc-0.29-scall.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.29-scall.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dietlibc-0.29-scall.patch 1 Mar 2009 11:53:24 -0000 1.6
+++ dietlibc-0.29-scall.patch 25 Jul 2009 14:52:48 -0000 1.7
@@ -1,7 +1,7 @@
-From 5dc478088a3358ba32ae2b4c104735eb966b62d1 Mon Sep 17 00:00:00 2001
+From b855ea26129711c87489ce185def60ea46a77698 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:50:24 +0200
-Subject: [PATCH] Sanity checks for syscall availability
+Subject: [PATCH 05/18] Sanity checks for syscall availability
Catch the case when syscall(2) is not implemented for the actual arch
instead of jumping to the next function and executing the wrong code
@@ -28,5 +28,5 @@ index c9f72bb..4188167 100644
#endif
.size syscall, . - syscall
--
-1.6.0.6
+1.6.2.5
dietlibc-0.30-longdouble.patch:
gamma.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
Index: dietlibc-0.30-longdouble.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.30-longdouble.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dietlibc-0.30-longdouble.patch 1 Mar 2009 11:53:24 -0000 1.4
+++ dietlibc-0.30-longdouble.patch 25 Jul 2009 14:52:48 -0000 1.5
@@ -1,7 +1,7 @@
-From e4be3aa68fdfb87c35378adc3b947e805b923fcf Mon Sep 17 00:00:00 2001
+From 81eaf0eab3a66c6e055dc243fc70b204d33c59a2 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:54:03 +0200
-Subject: [PATCH] Workaround PPC build issues
+Subject: [PATCH 06/18] Workaround PPC build issues
Fixes https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182118 and
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27054
@@ -47,5 +47,5 @@ index 9682f35..370bec6 100644
static const double coeff[] = { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10 };
int signgam;
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-defpath.patch:
paths.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: dietlibc-0.31-defpath.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-defpath.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dietlibc-0.31-defpath.patch 1 Mar 2009 11:53:24 -0000 1.4
+++ dietlibc-0.31-defpath.patch 25 Jul 2009 14:52:48 -0000 1.5
@@ -1,7 +1,7 @@
-From 4fee9a2dc10208f639590cabc07e7f3b91cf0d17 Mon Sep 17 00:00:00 2001
+From 6aecc55de013adb4cf83be57a85092a96034731c Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 18:00:19 +0200
-Subject: [PATCH] Security fix for proper $PATH
+Subject: [PATCH 07/18] Security fix for proper $PATH
Removed '.' from the default $PATH.
---
@@ -22,5 +22,5 @@ index 553b4fa..9bf216f 100644
#define _PATH_DEVNULL "/dev/null"
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-implicitfunc.patch:
getservbyname.c | 1 +
stdlib/testsort.c | 2 ++
stdlib/tst-calloc.c | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
Index: dietlibc-0.31-implicitfunc.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-implicitfunc.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dietlibc-0.31-implicitfunc.patch 1 Mar 2009 11:53:24 -0000 1.7
+++ dietlibc-0.31-implicitfunc.patch 25 Jul 2009 14:52:48 -0000 1.8
@@ -1,7 +1,7 @@
-From 50c65fce74b343c43161d8194d36aa52ebed51ec Mon Sep 17 00:00:00 2001
+From 1a0c2661fa8f3ad43c7d38915c967ad6aac987f9 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:43:08 +0200
-Subject: [PATCH] Fixes for -Werror-no-implicit-functions
+Subject: [PATCH 14/18] Fixes for -Werror-no-implicit-functions
Some fixes for issues preventing builds with
'-Werror-implicit-function-declaration'.
@@ -46,5 +46,5 @@ index a9b9e2a..049117b 100644
#include <limits.h>
#include <malloc.h>
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-lcctime.patch:
strftime.c | 1 +
strptime.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
Index: dietlibc-0.31-lcctime.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-lcctime.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dietlibc-0.31-lcctime.patch 1 Mar 2009 11:53:24 -0000 1.4
+++ dietlibc-0.31-lcctime.patch 25 Jul 2009 14:52:48 -0000 1.5
@@ -1,7 +1,7 @@
-From 7e9b745e0cca4916c29b40fac68cb98d91904b09 Mon Sep 17 00:00:00 2001
+From 93df169bb52d83027d77f17c30212a1b109cfc9d Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:42:20 +0200
-Subject: [PATCH] Fixes/enhancements in str?time() functions
+Subject: [PATCH 13/18] Fixes/enhancements in str?time() functions
This patch changes the used format for %x and %X specifiers in
strptime(3) to match these specified by SUSv2. It adds support
@@ -42,5 +42,5 @@ index 9d7f530..d19f309 100644
case 'y':
i=getint(&s,2);
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-no-stack-protector.patch:
Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Index: dietlibc-0.31-no-stack-protector.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-no-stack-protector.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dietlibc-0.31-no-stack-protector.patch 1 Mar 2009 11:53:24 -0000 1.1
+++ dietlibc-0.31-no-stack-protector.patch 25 Jul 2009 14:52:48 -0000 1.2
@@ -1,17 +1,17 @@
-From 3bbcb9a3a908d1aceb9f69118c1ed17a8d6d1871 Mon Sep 17 00:00:00 2001
+From f49499c7c3a6791249588ab4863d6e9eb1ba1010 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 28 Feb 2009 13:32:45 +0100
-Subject: [PATCH] build some files without stack-protector
+Subject: [PATCH 04/18] Build some files without stack-protector
---
Makefile | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
-index 0cd0105..46ef360 100644
+index dc23d1a..ec97fe9 100644
--- a/Makefile
+++ b/Makefile
-@@ -128,6 +128,8 @@ LIBPTHREAD_OBJS=$(patsubst libpthread/%.c,$(OBJDIR)/%.o,$(shell ./threadsafe.sh)
+@@ -129,6 +129,8 @@ LIBPTHREAD_OBJS=$(patsubst libpthread/%.c,$(OBJDIR)/%.o,$(shell ./threadsafe.sh)
LIBGMON_OBJS=$(OBJDIR)/__mcount.o $(OBJDIR)/monitor.o $(OBJDIR)/profil.o
@@ -20,15 +20,15 @@ index 0cd0105..46ef360 100644
include $(ARCH)/Makefile.add
LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH))
-@@ -177,6 +179,8 @@ $(OBJDIR)/stack_smash_handler2.o: XCFLAGS:=-fno-omit-frame-pointer
- $(OBJDIR)/%.o: %.c
- $(CROSS)$(CC) $(INC) $(CFLAGS) $(XCFLAGS) -c $< -o $@ -D__dietlibc__
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+@@ -177,6 +179,8 @@ $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c $(OBJDIR)/.dirstamp
+ $(OBJDIR)/%.o: %.c $(OBJDIR)/.dirstamp
+ $(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
+
+$(addprefix $(OBJDIR)/,$(NO_STACK_PROTECTOR)): XCFLAGS+=-fno-stack-protector
endif
ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0)
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-noreturn.patch:
stdlib.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: dietlibc-0.31-noreturn.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-noreturn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dietlibc-0.31-noreturn.patch 1 Mar 2009 11:53:24 -0000 1.4
+++ dietlibc-0.31-noreturn.patch 25 Jul 2009 14:52:48 -0000 1.5
@@ -1,7 +1,7 @@
-From c895c51d84b36cf649764193f33f296728b27bdc Mon Sep 17 00:00:00 2001
+From a4e9c68f8d10d81bca7b285c100405492b7687da Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:43:42 +0200
-Subject: [PATCH] __noreturn__ annotation for abort(3)
+Subject: [PATCH 15/18] __noreturn__ annotation for abort(3)
SUSv2 says about abort(3):
@@ -27,5 +27,5 @@ index 34f3a7f..0cea604 100644
extern int rand(void) __THROW;
extern int rand_r(unsigned int *seed) __THROW;
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-pagesize.patch:
alpha/start.S | 9 +++++
arm/start.S | 13 ++++++-
dietdirent.h | 6 ++-
dietelfinfo.h | 20 +++++++++++
dietfeatures.h | 14 ++++++++
dietpagesize.h | 31 +++++++++++++++++
dynlinker/ldso_start.S | 9 +++++
i386/start.S | 7 ++++
ia64/start.S | 10 +++++
include/sys/shm.h | 9 -----
lib/__get_elf_aux_value.c | 14 ++++++++
lib/alloc.c | 9 ++---
lib/closedir.c | 4 +-
lib/mmap64.c | 6 ++-
lib/opendir.c | 4 +-
lib/readdir.c | 2 -
lib/readdir64.c | 6 +--
lib/stackgap.c | 28 +++++++++++++++-
libcruft/getpagesize.c | 28 +++++++---------
libcruft/sysconf.c | 17 ++++++---
mips/start.S | 9 +++++
parisc/start.S | 10 +++++
ppc/start.S | 9 +++++
ppc64/start.S | 9 +++++
s390/start.S | 11 ++++++
s390x/start.S | 11 ++++++
sparc/shmat.c | 8 +---
sparc/start.S | 11 ++++++
sparc64/start.S | 11 ++++++
syscalls.s/environ.S | 16 +++++++++
test/Makefile | 2 -
test/runtests.sh | 2 -
test/sysconf.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++
x86_64/start.S | 17 +++++++++
34 files changed, 400 insertions(+), 52 deletions(-)
Index: dietlibc-0.31-pagesize.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-pagesize.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dietlibc-0.31-pagesize.patch 1 Mar 2009 11:53:24 -0000 1.12
+++ dietlibc-0.31-pagesize.patch 25 Jul 2009 14:52:48 -0000 1.13
@@ -1,7 +1,7 @@
-From 2f762bc732fef1c0e91b7e920c025783d204100e Mon Sep 17 00:00:00 2001
+From e6aa8f40136da35a259bcc92026aa2c8f0c935ff Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:35:14 +0200
-Subject: [PATCH] Support for dynamic PAGE_SIZE
+Subject: [PATCH 11/18] Support for dynamic PAGE_SIZE
This patch adds support for dynamic PAGE_SIZE values. It
is a little bit invasive in several aspects:
@@ -82,7 +82,7 @@ use a type derived from __WORD_SIZE.
lib/opendir.c | 4 ++-
lib/readdir.c | 2 +-
lib/readdir64.c | 6 ++--
- lib/stackgap.c | 20 +++++++++++-
+ lib/stackgap.c | 28 +++++++++++++++-
libcruft/getpagesize.c | 28 +++++++--------
libcruft/sysconf.c | 17 +++++++---
mips/start.S | 9 +++++
@@ -99,7 +99,7 @@ use a type derived from __WORD_SIZE.
test/runtests.sh | 2 +-
test/sysconf.c | 80 +++++++++++++++++++++++++++++++++++++++++++++
x86_64/start.S | 16 +++++++++
- 34 files changed, 392 insertions(+), 51 deletions(-)
+ 34 files changed, 400 insertions(+), 51 deletions(-)
create mode 100644 dietelfinfo.h
create mode 100644 dietpagesize.h
create mode 100644 lib/__get_elf_aux_value.c
@@ -173,7 +173,7 @@ index dbd7206..c9c7127 100644
+#define __DIRSTREAM_BUF_SIZE (__DIET_PAGE_SIZE - offsetof(struct __dirstream, buf))
diff --git a/dietelfinfo.h b/dietelfinfo.h
new file mode 100644
-index 0000000..f18627b
+index 0000000..de8c717
--- /dev/null
+++ b/dietelfinfo.h
@@ -0,0 +1,20 @@
@@ -194,7 +194,7 @@ index 0000000..f18627b
+typedef uint32_t __diet_elf_addr_t;
+#endif
+
-+__diet_elf_addr_t * __get_elf_aux_value(unsigned int tag)
++__diet_elf_addr_t const * __get_elf_aux_value(unsigned int tag)
+ __attribute__((__visibility__("hidden"),__const__)) __pure;
+#endif
diff --git a/dietfeatures.h b/dietfeatures.h
@@ -345,17 +345,17 @@ index 9b2d04d..70bb17e 100644
extern int shmdt (const void *shmaddr) __THROW;
diff --git a/lib/__get_elf_aux_value.c b/lib/__get_elf_aux_value.c
new file mode 100644
-index 0000000..6ddddb4
+index 0000000..8a2e3bc
--- /dev/null
+++ b/lib/__get_elf_aux_value.c
@@ -0,0 +1,14 @@
+#include <stdlib.h>
+#include "../dietelfinfo.h"
+
-+__diet_elf_addr_t *__get_elf_aux_value(unsigned int tag)
++__diet_elf_addr_t const *__get_elf_aux_value(unsigned int tag)
+{
+ extern __diet_elf_addr_t const * const __elfinfo;
-+ __diet_elf_addr_t *aux_ptr;
++ __diet_elf_addr_t const *aux_ptr;
+
+ for (aux_ptr = __elfinfo; aux_ptr[0]!=AT_NULL; aux_ptr += 2)
+ if (aux_ptr[0]==tag)
@@ -505,7 +505,7 @@ index 924f0a8..06d073b 100644
if (errno==ENOSYS) {
trygetdents64=0;
diff --git a/lib/stackgap.c b/lib/stackgap.c
-index 0149bbe..49ad489 100644
+index e974e2c..5d51c5d 100644
--- a/lib/stackgap.c
+++ b/lib/stackgap.c
@@ -6,6 +6,7 @@
@@ -524,18 +524,23 @@ index 0149bbe..49ad489 100644
while (*auxvec) {
if (auxvec[0]==3) {
x=(void*)auxvec[1];
-@@ -37,6 +39,10 @@ static void findtlsdata(long* auxvec) {
+@@ -37,6 +39,15 @@ static void findtlsdata(long* auxvec) {
}
auxvec+=2;
} /* if we don't find the entry, the kernel let us down */
+#else
-+ (void)auxvec;
-+ x = __get_elf_aux_value(AT_PHDR);
++ {
++ __diet_elf_addr_t const *x_addr = __get_elf_aux_value(AT_PHDR);
++
++ (void)auxvec;
++ if (x_addr)
++ x = (__typeof__(x)) *x_addr;
++ }
+#endif
if (!x) return; /* a kernel this old does not support thread local storage anyway */
- n=x->p_memsz/sizeof(*x);
- for (i=1; i<n; ++i)
-@@ -90,6 +96,7 @@ static void setup_tls(tcbhead_t* mainthread) {
+ if (x->p_type!=PT_PHDR) return; /* should start with PT_PHDR */
+ /* if it doesn't, assume there is no thread local storage */
+@@ -92,6 +103,7 @@ static void setup_tls(tcbhead_t* mainthread) {
}
#endif
@@ -543,7 +548,7 @@ index 0149bbe..49ad489 100644
static void* find_rand(long* x) {
while (*x) {
if (*x==25)
-@@ -98,20 +105,27 @@ static void* find_rand(long* x) {
+@@ -100,20 +112,30 @@ static void* find_rand(long* x) {
}
return NULL;
}
@@ -567,12 +572,15 @@ index 0149bbe..49ad489 100644
+#ifndef WANT_ELFINFO
rand=find_rand(auxvec);
+#else
-+ rand = __get_elf_aux_value(25);
++ {
++ __diet_elf_addr_t const *rand_addr = __get_elf_aux_value(25);
++ rand = rand_addr ? (void *)*rand_addr : NULL;
++ }
+#endif
if (!rand) {
char myrand[10];
int fd=open("/dev/urandom",O_RDONLY);
-@@ -132,7 +146,11 @@ int stackgap(int argc,char* argv[],char* envp[]) {
+@@ -134,7 +156,11 @@ int stackgap(int argc,char* argv[],char* envp[]) {
#endif
#if defined(WANT_SSP) || defined(WANT_TLS)
@@ -585,7 +593,7 @@ index 0149bbe..49ad489 100644
memcpy(tlsdata,__tdataptr,__tdatasize);
memset(tlsdata+__tdatasize,0,__tmemsize-__tdatasize);
diff --git a/libcruft/getpagesize.c b/libcruft/getpagesize.c
-index 5ff8973..80f476b 100644
+index 5ff8973..ac701cf 100644
--- a/libcruft/getpagesize.c
+++ b/libcruft/getpagesize.c
@@ -1,25 +1,23 @@
@@ -614,7 +622,7 @@ index 5ff8973..80f476b 100644
+ static size_t pgsz;
+
+ if (__unlikely(pgsz==0)) {
-+ __diet_elf_addr_t *v = __get_elf_aux_value(AT_PAGESZ);
++ __diet_elf_addr_t const *v = __get_elf_aux_value(AT_PAGESZ);
+ pgsz = *v; /* causes segfault when 'v==NULL' */
}
- return PAGE_SIZE;
@@ -628,26 +636,26 @@ index 5ff8973..80f476b 100644
size_t getpagesize(void) __attribute__((weak,alias("__libc_getpagesize")));
-
diff --git a/libcruft/sysconf.c b/libcruft/sysconf.c
-index e9c15cb..b98195c 100644
+index 5a6259c..507de94 100644
--- a/libcruft/sysconf.c
+++ b/libcruft/sysconf.c
-@@ -3,6 +3,9 @@
- #include <limits.h>
+@@ -4,6 +4,9 @@
#include <sys/resource.h>
+ #include <fcntl.h>
+#include "dietelfinfo.h"
+#include "dietpagesize.h"
+
extern int __sc_nr_cpus();
- long sysconf(int name)
-@@ -16,6 +19,14 @@ long sysconf(int name)
+ static long physpages() {
+@@ -40,6 +43,14 @@ long sysconf(int name)
return limit.rlim_cur;
}
case _SC_CLK_TCK:
+#ifdef WANT_ELFINFO
+ {
-+ __diet_elf_addr_t *v = __get_elf_aux_value(AT_CLKTCK);
++ __diet_elf_addr_t const *v = __get_elf_aux_value(AT_CLKTCK);
+ if (v)
+ return *v;
+ }
@@ -656,7 +664,7 @@ index e9c15cb..b98195c 100644
#ifdef __alpha__
return 1024;
#else
-@@ -23,11 +34,7 @@ long sysconf(int name)
+@@ -47,11 +58,7 @@ long sysconf(int name)
#endif
case _SC_PAGESIZE:
@@ -667,8 +675,8 @@ index e9c15cb..b98195c 100644
-#endif
+ return __libc_getpagesize();
- case _SC_ARG_MAX:
- return ARG_MAX;
+ case _SC_PHYS_PAGES:
+ return physpages();
diff --git a/mips/start.S b/mips/start.S
index 57144b3..3cf3433 100644
--- a/mips/start.S
@@ -1039,5 +1047,5 @@ index adc461a..8b4f3c9 100644
#ifdef PROFILING
pushq %rdi /* save reg args */
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-printFG.patch:
include/stdlib.h | 6 ++++-
lib/__dtostr.c | 18 +++++++++++-----
lib/__v_printf.c | 59 +++++++++++++++++++++++++++++--------------------------
test/printf.c | 45 ++++++++++++++++++++++++++++++++++++-----
4 files changed, 88 insertions(+), 40 deletions(-)
Index: dietlibc-0.31-printFG.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-printFG.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dietlibc-0.31-printFG.patch 1 Mar 2009 11:53:24 -0000 1.8
+++ dietlibc-0.31-printFG.patch 25 Jul 2009 14:52:48 -0000 1.9
@@ -1,7 +1,7 @@
-From a38148e35b746f3325d39aca189a38e808c5585e Mon Sep 17 00:00:00 2001
+From d10d2f6fca4e391fa863d771dd8c5f7c01d7dfa4 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:39:23 +0200
-Subject: [PATCH] Fixes/enhancements for INF/NAN handling in printf()
+Subject: [PATCH 12/18] Fixes/enhancements for INF/NAN handling in printf()
This patch adds support for uppercase 'F' and 'G' printf format
specifiers. It fixes handling of -INF values in __dtostr() too;
@@ -271,5 +271,5 @@ index 719461a..ef6050d 100644
return EXIT_SUCCESS;
}
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-stacksmash-dyn.patch:
stack_smash_handler2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: dietlibc-0.31-stacksmash-dyn.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-stacksmash-dyn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dietlibc-0.31-stacksmash-dyn.patch 1 Mar 2009 11:53:24 -0000 1.4
+++ dietlibc-0.31-stacksmash-dyn.patch 25 Jul 2009 14:52:48 -0000 1.5
@@ -1,7 +1,7 @@
-From 62f02d841ea2fb19e365af01892e793ed923ce06 Mon Sep 17 00:00:00 2001
+From 729c8524b8a5f3a4bf4ebda7ae23c0a10ef62560 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:57:09 +0200
-Subject: [PATCH] __stack_chk_fail_local function
+Subject: [PATCH 09/18] __stack_chk_fail_local function
Added __stack_chk_fail_local() function as an alias for __stack_chk_fail().
This is required for dynamic linking.
@@ -22,5 +22,5 @@ index ecefeb8..b03c0d5 100644
/* earlier versions of ProPolice actually gave the address and function
* name as arguments to the handler, so it could print some useful
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-stacksmash.patch:
Makefile | 3 ++-
lib/stack_smash_handler2.c | 11 +++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
Index: dietlibc-0.31-stacksmash.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-stacksmash.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dietlibc-0.31-stacksmash.patch 1 Mar 2009 11:53:24 -0000 1.4
+++ dietlibc-0.31-stacksmash.patch 25 Jul 2009 14:52:48 -0000 1.5
@@ -1,7 +1,7 @@
-From f8b1f860c0038613c31b800ff0466fc1c4e25823 Mon Sep 17 00:00:00 2001
+From 6838387d66f76e8acb227102d46549a26e7b217c Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:56:07 +0200
-Subject: [PATCH] Enhanced __stack_chk_fail
+Subject: [PATCH 08/18] Enhanced __stack_chk_fail
* modified __stack_chk_fail() to trigger a segfault by accessing
address 0x0. Every system with an MMU known by me, segfaults
@@ -15,21 +15,21 @@ Subject: [PATCH] Enhanced __stack_chk_fa
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index adc2779..0cd0105 100644
+index ec97fe9..9ea5078 100644
--- a/Makefile
+++ b/Makefile
-@@ -172,9 +172,10 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
- $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
+@@ -175,9 +175,10 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h $(OBJDIR)/.dirstamp
+ $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c $(OBJDIR)/.dirstamp
$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
+$(OBJDIR)/stack_smash_handler2.o: XCFLAGS:=-fno-omit-frame-pointer
- $(OBJDIR)/%.o: %.c
+ $(OBJDIR)/%.o: %.c $(OBJDIR)/.dirstamp
- $(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
+ $(CROSS)$(CC) $(INC) $(CFLAGS) $(XCFLAGS) -c $< -o $@ -D__dietlibc__
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
- endif
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
+ $(addprefix $(OBJDIR)/,$(NO_STACK_PROTECTOR)): XCFLAGS+=-fno-stack-protector
diff --git a/lib/stack_smash_handler2.c b/lib/stack_smash_handler2.c
index 9e85099..ecefeb8 100644
--- a/lib/stack_smash_handler2.c
@@ -50,5 +50,5 @@ index 9e85099..ecefeb8 100644
+ *(char *)0 = 0;
}
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31-testsuite.patch:
Makefile | 2 +-
asprintf.c | 2 +-
bsearch.c | 2 +-
byteswap.c | 8 ++++----
cycles.c | 2 +-
getmntent.c | 6 +-----
math.c | 29 +++++++++++++++++++++++++++++
mktime.c | 6 +++---
printftest.c | 6 +++---
rand48.c | 12 ++++++------
runtests.sh | 2 +-
speed.c | 4 ++--
stdio/tstscanf.c | 4 ++--
stdlib/tst-malloc.c | 6 +++++-
stdlib/tst-strtod.c | 4 ++--
sysenter.c | 6 +++---
time/tst-strftime.c | 6 +++---
time/tst-strptime.c | 24 ++++++++++++++++++++----
18 files changed, 88 insertions(+), 43 deletions(-)
Index: dietlibc-0.31-testsuite.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31-testsuite.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dietlibc-0.31-testsuite.patch 1 Mar 2009 11:53:24 -0000 1.7
+++ dietlibc-0.31-testsuite.patch 25 Jul 2009 14:52:48 -0000 1.8
@@ -1,7 +1,7 @@
-From 02a0efbc861696460826282e5d0c1e706644991a Mon Sep 17 00:00:00 2001
+From 7227ec436a737f13d8bc1fd9bf8f8995d073eb0b Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:41:23 +0200
-Subject: [PATCH] Several testsuite fixes/enhancments
+Subject: [PATCH 16/18] Several testsuite fixes/enhancments
* test/getmntent.c: I removed the checks which called endmntent()
multiple times resp. with a NULL pointer. Behavior in first
@@ -457,5 +457,5 @@ index 6277ea6..2773180 100644
printf ("not all of `%s' read\n", day_tests[i].input);
result = 1;
--
-1.6.0.6
+1.6.2.5
dietlibc-0.31.20080212-teststdout.patch:
atexit.c | 2 +-
malloc-debugger.c | 2 +-
sendfile.c | 2 +-
waitpid.c | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
Index: dietlibc-0.31.20080212-teststdout.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31.20080212-teststdout.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dietlibc-0.31.20080212-teststdout.patch 1 Mar 2009 11:53:24 -0000 1.4
+++ dietlibc-0.31.20080212-teststdout.patch 25 Jul 2009 14:52:48 -0000 1.5
@@ -1,7 +1,7 @@
-From fd63f368885bbb3e637866a2651348cfce7f69d2 Mon Sep 17 00:00:00 2001
+From 7bf571cbff4c43098d9b1cd2b4bbd9457bff5b60 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 19 Apr 2008 17:45:11 +0200
-Subject: [PATCH] Use stdout instead of stderr in testsuite
+Subject: [PATCH 10/18] Use stdout instead of stderr in testsuite
This patches uses stdout instead stderr when giving out normal status
messages in the testsuite.
@@ -63,5 +63,5 @@ index fe2cb5b..92c0b0e 100644
_exit(23);
}
--
-1.6.0.6
+1.6.2.5
Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- dietlibc.spec 24 Jul 2009 20:15:23 -0000 1.65
+++ dietlibc.spec 25 Jul 2009 14:52:48 -0000 1.66
@@ -4,7 +4,7 @@
## --with dynamic ... enable dynamic lib support
-%global snapshot 20090228
+#global snapshot 20090228
%global pkglibdir %_prefix/lib/dietlibc
%ifarch %ix86 x86_64
@@ -27,8 +27,8 @@
Summary: Small libc implementation
Name: dietlibc
-Version: 0.31
-Release: %release_func 9%{?snapshot:.%snapshot}
+Version: 0.32
+Release: %release_func 0%{?snapshot:.%snapshot}
License: GPLv2
Group: Development/Libraries
URL: http://www.fefe.de/dietlibc/
@@ -55,6 +55,9 @@ Patch47: dietlibc-0.31-lcctime.patch
Patch48: dietlibc-0.31-implicitfunc.patch
Patch49: dietlibc-0.31-noreturn.patch
Patch50: dietlibc-0.31-no-stack-protector.patch
+Patch51: dietlibc-0.31-smp-fix.patch
+Patch52: dietlibc-0.31-stackgap-minor.patch
+Patch53: dietlibc-0.31-strip.patch
BuildRoot: %_tmppath/%name-%version-%release-buildroot
%{?with_dynamic:Requires: dietlibc-lib = %version-%release}
%{!?with_dynamic:Obsoletes: dietlibc-lib < %version-%release}
@@ -112,6 +115,10 @@ This package contains the dynamic librar
%prep
%setup -q %{?snapshot:-n %name-%version.%snapshot}
%patch1 -p1 -b .nice
+%patch51 -p1 -b .smp
+%patch53 -p1 -b .strip
+%patch50 -p1 -b .no-stack-protector
+
%patch10 -p1 -b .scall
%patch30 -p1 -b .longdouble
%patch31 -p1 -b .defpath
@@ -125,7 +132,7 @@ This package contains the dynamic librar
%patch47 -p1 -b .lcctime
%patch48 -p1 -b .implicitfunc
%patch49 -p1 -b .noreturn
-%patch50 -p1 -b .no-stack-protector
+%patch52 -p1 -b .stackgap
%if %{without ssp}
%patch20 -p1 -b .nostackprotector
@@ -144,10 +151,8 @@ sed -i \
dietfeatures.h
%endif
-sed -i -e 's!strip !: !g' Makefile
-
%global fixcflags -fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os -g3 -Werror-implicit-function-declaration
-%global basemakeflags prefix=%pkglibdir BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%pkglibdir
+%global basemakeflags prefix=%pkglibdir BINDIR=%_bindir MAN1DIR=%_mandir/man1 CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%pkglibdir STRIP=:
%global makeflags %basemakeflags
for i in `find test -name 'runtests.sh'`; do
@@ -188,6 +193,8 @@ bash ./runtests-X.sh
%clean
rm -rf $RPM_BUILD_ROOT
+%changelog
+
%files
%defattr(-,root,root,-)
%doc AUTHOR BUGS CAVEAT CHANGES COPYING FAQ PORTING README*
@@ -219,6 +226,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jul 25 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.32-0
+- updated to 0.32
+- fixed stackgap/auxvec patch
+- added patches to fix SMP builds and to prevent object file stripping
+- moved %%changelog entries from 2005 and before into ChangeLog.2005 file
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-9.20090228
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -304,85 +317,3 @@ rm -rf $RPM_BUILD_ROOT
* Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-6
- added '-Os' to the CFLAGS
- exclude PPC arch due to strange compilation errors
-
-* Sun Oct 30 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-4
-- added '-fno-stack-protector' to the CFLAGS
-
-* Sun Oct 30 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-3
-- removed '-fstack-protector' from CLI because it uses __stack_chk_fail
- which is not provided by dietlibc
-
-* Thu May 26 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-2
-- rebuilt
-
-* Tue May 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-1
-- updated to 0.29
-- unset some compiler options which cause errors with gcc4
-- rediffed -scall patch
-- removed most patches as already in upstream
-
-* Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-6
-- use %%dist instead of %%disttag
-- package some more %%doc files (reported by Chris Ricker)
-- add %%release to the BuildRoot (reported by Chris Ricker)
-- fixed URLs of the sources (reported by Chris Ricker)
-
-* Sun May 1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-5
-- added Herbert Poetzl's syscall(2) implementation for x86_64 and
- sparc* architectures (see
- http://vserver.13thfloor.at/Experimental/delta-diet.diff); rediffed
- the .call patch
-- catch the case when syscall(2) is used on archs where it is not
- implemented yet
-- define MADV_* constants on HPPA and IA64 archs
-- fix *truncate64() handling on 64bit archs
-
-* Fri Mar 4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.28-4
-- rebuild
-- fixed compilation with gcc4
-- made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
- provided by Colin Hill)
-- build the dynamic libs for x86, x86_64 and arm only
-- fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the
- '__powerpc__' one)
-- added some O_* -flags for the HPPA arch
-- use more modern flags for '-Os'
-
-* Tue Feb 1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
-- updated to 0.28
-- unset LD_RUN_PATH which would result in empty rpaths else
-- removed the waitpid patch; it is solved upstream
-
-* Tue Aug 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.27-1
-- updated to 0.27
-
-* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.26-1
-- updated to 0.26
-
-* Fri Apr 9 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.25-1
-- updated to 0.25
-
-* Sat Jan 17 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-5
-- renewed -snprintf patch
-
-* Tue Jan 6 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-4
-- applied -snprintf patch (from fedora dietlibc-0.24-2 package)
-
-* Tue Dec 30 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:%VERSION.90.%DATE}-2
-- added C99 patch
-
-* Thu Dec 4 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.24-1
-- updated to 0.24
-
-* Tue Sep 16 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.23-1
-- updated to 0.23
-
-* Fri Nov 8 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.21-1
-- updated to 0.21
-- removed unpackaged files in %%install-stage
-
-* Thu Jul 11 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1:0.18-1
-- updated to 0.18
-
-* Thu Jul 4 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
-- Initial build.
Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lastver 1 Sep 2007 12:34:41 -0000 1.1
+++ lastver 25 Jul 2009 14:52:48 -0000 1.2
@@ -1 +1 @@
-0.31
+0.32
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources 1 Mar 2009 11:53:24 -0000 1.13
+++ sources 25 Jul 2009 14:52:48 -0000 1.14
@@ -1 +1,2 @@
-e627aa62e21a812add91bd7a2b7d9e05 dietlibc-0.31.20090228.tar.bz2
+0098761c17924c15e21d25acdda4a8b5 dietlibc-0.32.tar.bz2
+f2c6737dc9597558da34deed1246c802 dietlibc-0.32.tar.bz2.sig
More information about the fedora-extras-commits
mailing list