[packages/dietlibc] - rediffed

hawk hawk at pld-linux.org
Tue Dec 3 02:40:05 CET 2024


commit 2da47d9f5f6ff21d4a9e8ac3e994e3c7d6b4d4bd
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Tue Dec 3 00:48:24 2024 +0100

    - rediffed

 dietlibc-memalign.patch    | 24 ++++++++++++------------
 dietlibc-no-vsyscall.patch |  9 +++++----
 dietlibc-notify.patch      | 35 ++++++++++++++++++-----------------
 dietlibc-opt.patch         | 44 ++++++++++++++++++++++----------------------
 4 files changed, 57 insertions(+), 55 deletions(-)
---
diff --git a/dietlibc-memalign.patch b/dietlibc-memalign.patch
index b3c168c..9c6c90a 100644
--- a/dietlibc-memalign.patch
+++ b/dietlibc-memalign.patch
@@ -1,7 +1,7 @@
-diff -ur dietlibc-0.31/include/stdlib.h dietlibc-0.31-memalign/include/stdlib.h
---- dietlibc-0.31/include/stdlib.h	2009-03-19 15:39:48.000000000 +0100
-+++ dietlibc-0.31-memalign/include/stdlib.h	2009-03-19 15:39:37.000000000 +0100
-@@ -13,6 +13,9 @@
+diff -urNp -x '*.orig' dietlibc-0.34.org/include/stdlib.h dietlibc-0.34/include/stdlib.h
+--- dietlibc-0.34.org/include/stdlib.h	2017-05-02 23:11:36.000000000 +0200
++++ dietlibc-0.34/include/stdlib.h	2024-12-03 00:46:46.340653625 +0100
+@@ -13,6 +13,9 @@ void *calloc(size_t nmemb, size_t size)
  void *malloc(size_t size)  __THROW __attribute_malloc__;
  void free(void *ptr) __THROW;
  void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__;
@@ -9,12 +9,12 @@ diff -ur dietlibc-0.31/include/stdlib.h dietlibc-0.31-memalign/include/stdlib.h
 +int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__;
 +void *valloc(size_t size) __THROW __attribute_malloc__;
  
- char *getenv(const char *name) __THROW __pure;
- int putenv(const char *string) __THROW;
-diff -ur dietlibc-0.31/lib/alloc.c dietlibc-0.31-memalign/lib/alloc.c
---- dietlibc-0.31/lib/alloc.c	2009-03-19 15:39:48.000000000 +0100
-+++ dietlibc-0.31-memalign/lib/alloc.c	2009-03-19 15:38:33.000000000 +0100
-@@ -128,10 +128,14 @@
+ /* useful OpenBSD extension: */
+ void* reallocarray(void* ptr, size_t nmemb, size_t size) __THROW __attribute_malloc__ __attribute_alloc2__(2,3);
+diff -urNp -x '*.orig' dietlibc-0.34.org/lib/alloc.c dietlibc-0.34/lib/alloc.c
+--- dietlibc-0.34.org/lib/alloc.c	2016-02-05 21:17:39.000000000 +0100
++++ dietlibc-0.34/lib/alloc.c	2024-12-03 00:46:46.340653625 +0100
+@@ -128,10 +128,14 @@ static void* REGPARM(1) __small_malloc(s
  }
  
  /* -- PUBLIC FUNCTIONS ---------------------------------------------------- */
@@ -31,7 +31,7 @@ diff -ur dietlibc-0.31/lib/alloc.c dietlibc-0.31-memalign/lib/alloc.c
      size=((__alloc_t*)BLOCK_START(ptr))->size;
      if (size) {
        if (size<=__MAX_SMALL_SIZE)
-@@ -139,7 +143,6 @@
+@@ -139,7 +143,6 @@ static void _alloc_libc_free(void *ptr)
        else
  	munmap(BLOCK_START(ptr),size);
      }
@@ -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,79 @@
+@@ -253,3 +256,79 @@ retzero:
  }
  void* realloc(void* ptr, size_t size) __attribute__((weak,alias("__libc_realloc")));
  
diff --git a/dietlibc-no-vsyscall.patch b/dietlibc-no-vsyscall.patch
index 1b80f26..430894b 100644
--- a/dietlibc-no-vsyscall.patch
+++ b/dietlibc-no-vsyscall.patch
@@ -1,7 +1,8 @@
---- dietlibc-0.33/dietfeatures.h~	2018-02-08 18:18:17.000000000 +0100
-+++ dietlibc-0.33/dietfeatures.h	2018-02-08 18:21:02.388516769 +0100
-@@ -41,11 +41,6 @@
-  * string */
+diff -urNp -x '*.orig' dietlibc-0.34.org/dietfeatures.h dietlibc-0.34/dietfeatures.h
+--- dietlibc-0.34.org/dietfeatures.h	2018-02-01 03:03:38.000000000 +0100
++++ dietlibc-0.34/dietfeatures.h	2024-12-03 00:47:08.669003636 +0100
+@@ -50,11 +50,6 @@
+  * zero-terminate the destination string */
  /* #define WANT_FULL_POSIX_COMPAT */
  
 -/* on i386, Linux has an alternate syscall method since 2002/12/16 */
diff --git a/dietlibc-notify.patch b/dietlibc-notify.patch
index 4f2f518..ed84621 100644
--- a/dietlibc-notify.patch
+++ b/dietlibc-notify.patch
@@ -1,6 +1,7 @@
---- dietlibc-0.32/include/fcntl.h~	2008-02-19 01:28:13.000000000 +0100
-+++ dietlibc-0.32/include/fcntl.h	2010-09-24 19:03:54.093375051 +0200
-@@ -52,6 +52,10 @@
+diff -urNp -x '*.orig' dietlibc-0.34.org/include/fcntl.h dietlibc-0.34/include/fcntl.h
+--- dietlibc-0.34.org/include/fcntl.h	2017-08-09 21:12:25.000000000 +0200
++++ dietlibc-0.34/include/fcntl.h	2024-12-03 00:46:57.932835338 +0100
+@@ -55,6 +55,10 @@ __BEGIN_DECLS
  #define F_SETLK64	13
  #define F_SETLKW64	14
  
@@ -11,7 +12,7 @@
  #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
  
  /* for posix fcntl() and lockf() */
-@@ -78,6 +82,15 @@
+@@ -81,6 +85,15 @@ __BEGIN_DECLS
  #define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
  #define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
  
@@ -27,7 +28,7 @@
  struct flock {
    int16_t l_type;
    int16_t l_whence;
-@@ -132,6 +145,10 @@
+@@ -137,6 +150,10 @@ struct flock64 {
  #define F_SETSIG	10	/*  for sockets. */
  #define F_GETSIG	11	/*  for sockets. */
  
@@ -38,7 +39,7 @@
  /* for F_[GET|SET]FL */
  #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
  
-@@ -157,6 +174,15 @@
+@@ -162,6 +179,15 @@ struct flock64 {
  #define LOCK_WRITE     128     /* ... Which allows concurrent write operations */
  #define LOCK_RW        192     /* ... Which allows concurrent read & write ops */
  
@@ -54,7 +55,7 @@
  struct flock {
    int16_t l_type;
    int16_t l_whence;
-@@ -209,6 +235,10 @@
+@@ -220,6 +246,10 @@ struct flock {
  #define F_SETLKW64	35
  #endif
  
@@ -65,7 +66,7 @@
  /* for F_[GET|SET]FL */
  #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
  
-@@ -236,6 +266,15 @@
+@@ -247,6 +277,15 @@ struct flock {
  #define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
  #define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
  
@@ -81,7 +82,7 @@
  #ifndef __mips64__
  struct flock {
    int16_t l_type;
-@@ -304,6 +343,10 @@
+@@ -317,6 +356,10 @@ struct flock {
  #define F_SETLK64	13
  #define F_SETLKW64	14
  
@@ -92,7 +93,7 @@
  /* for F_[GET|SET]FL */
  #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
  
-@@ -331,6 +374,15 @@
+@@ -344,6 +387,15 @@ struct flock {
  #define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
  #define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
  
@@ -108,7 +109,7 @@
  struct flock {
    int16_t l_type;
    int16_t l_whence;
-@@ -394,6 +446,10 @@
+@@ -409,6 +461,10 @@ struct flock64 {
  #define F_SETLK64	13
  #define F_SETLKW64	14
  
@@ -119,7 +120,7 @@
  /* for F_[GET|SET]FL */
  #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
  
-@@ -421,6 +477,15 @@
+@@ -436,6 +492,15 @@ struct flock64 {
  #define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
  #define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
  
@@ -135,9 +136,9 @@
  struct flock {
    int16_t l_type;
    int16_t l_whence;
-@@ -478,6 +543,10 @@
- #define F_SETLK64	13
+@@ -505,6 +570,10 @@ struct flock64 {
  #define F_SETLKW64	14
+ #endif
  
 +#define F_SETLEASE	1024	/* Set a lease.  */
 +#define F_GETLEASE	1025	/* Enquire what lease is active.  */
@@ -146,7 +147,7 @@
  /* for F_[GET|SET]FL */
  #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
  
-@@ -505,6 +574,15 @@
+@@ -532,6 +601,15 @@ struct flock64 {
  #define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
  #define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
  
@@ -162,7 +163,7 @@
  struct flock {
    int16_t l_type;
    int16_t l_whence;
-@@ -567,6 +645,10 @@
+@@ -599,6 +677,10 @@ struct flock64 {
  #define F_SETSIG    13 /*  for sockets. */
  #define F_GETSIG    14 /*  for sockets. */
  
@@ -173,7 +174,7 @@
  #define FD_CLOEXEC  1   /* actually anything with low bit set goes */
  
  #define F_RDLCK     1   /* Read lock.  */
-@@ -590,6 +672,15 @@
+@@ -622,6 +704,15 @@ struct flock64 {
  #define LOCK_WRITE     128     /* ... Which allows concurrent write operations */
  #define LOCK_RW                192     /* ... Which allows concurrent read & write ops */
  
diff --git a/dietlibc-opt.patch b/dietlibc-opt.patch
index 1f5c51a..5c1f737 100644
--- a/dietlibc-opt.patch
+++ b/dietlibc-opt.patch
@@ -1,23 +1,7 @@
-diff -ur dietlibc-0.30.org/findcflags.sh dietlibc-0.30/findcflags.sh
---- dietlibc-0.30.org/findcflags.sh	2005-04-23 13:47:18.000000000 +0200
-+++ dietlibc-0.30/findcflags.sh	2007-02-06 22:24:17.449538250 +0100
-@@ -1,8 +1,8 @@
- #!/bin/sh
- version=`${1:-gcc} -v 2>&1 |sed -n '/gcc version/ {s/gcc version //;p;}'`
- 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=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=4;;
-+  *) echo -O2 ${OPTFLAGS} -pipe -fomit-frame-pointer ;;
- esac
-diff -ur dietlibc-0.30.org/Makefile dietlibc-0.30/Makefile
---- dietlibc-0.30.org/Makefile	2006-06-18 20:32:28.000000000 +0200
-+++ dietlibc-0.30/Makefile	2007-02-06 22:25:12.368970500 +0100
-@@ -100,7 +100,7 @@
+diff -urNp -x '*.orig' dietlibc-0.34.org/Makefile dietlibc-0.34/Makefile
+--- dietlibc-0.34.org/Makefile	2018-02-10 19:27:23.000000000 +0100
++++ dietlibc-0.34/Makefile	2024-12-03 00:46:28.132368197 +0100
+@@ -116,7 +116,7 @@ all: $(WHAT)
  
  profiling: $(OBJDIR)/libgmon.a $(OBJDIR)/pstart.o
  
@@ -26,7 +10,7 @@ diff -ur dietlibc-0.30.org/Makefile dietlibc-0.30/Makefile
  CFLAGS=$(DEFAULTCFLAGS)
  CROSS=
  
-@@ -132,14 +132,6 @@
+@@ -152,14 +152,6 @@ include $(ARCH)/Makefile.add
  
  LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH))
  
@@ -40,4 +24,20 @@ diff -ur dietlibc-0.30.org/Makefile dietlibc-0.30/Makefile
 -endif
  CFLAGS += -W -Wall -Wextra -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wno-switch -Wno-unused -Wredundant-decls -Wshadow
  
- PWD=$(shell pwd)
+ ASM_CFLAGS = -Wa,--noexecstack
+diff -urNp -x '*.orig' dietlibc-0.34.org/findcflags.sh dietlibc-0.34/findcflags.sh
+--- dietlibc-0.34.org/findcflags.sh	2014-04-19 17:07:32.000000000 +0200
++++ dietlibc-0.34/findcflags.sh	2024-12-03 00:46:28.132368197 +0100
+@@ -1,8 +1,8 @@
+ #!/bin/sh
+ version=`${1:-gcc} -v 2>&1 |sed -n '/gcc version/ {s/gcc version //;p;}'`
+ 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=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=4;;
++  *) echo -O2 ${OPTFLAGS} -pipe -fomit-frame-pointer ;;
+ esac
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dietlibc.git/commitdiff/2da47d9f5f6ff21d4a9e8ac3e994e3c7d6b4d4bd



More information about the pld-cvs-commit mailing list