summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2022-11-02 18:14:15 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2022-11-02 18:15:10 -0700
commitddfcbc95a6be3ddc588a93f21edb69cc7c214d9c (patch)
treed85e36b38c4b4b350684df0a402a902e58d45557 /modules
parent1c3da1d369d6a204222c747cc91f590adad7cfe1 (diff)
downloadgnulib-ddfcbc95a6be3ddc588a93f21edb69cc7c214d9c.tar.gz
scratch_buffer: adjust to glibc changes
Problem reported by Karl Berry in: https://lists.gnu.org/r/bug-gnulib/2022-11/msg00004.html * build-aux/depcomp, doc/make-stds.texi, lib/malloc/scratch_buffer.h: Autoupdate. * build-aux/install-reloc (func_create_wrapper): Omit removed file scratch_buffer_dupfree.c. * config/srclist.txt: Remove lib/malloc/scratch_buffer_dupfree.c * lib/canonicalize-lgpl.c: Merge changes from glibc through its commit ef0700004bf0dccf493a5e8e21f71d9e7972ea9f dated 2022-07-05 11:04:45 +0200. (__strdup) [!_LIBC]: New macro. (struct realpath_bufs): New type. (realpath_stk): Use it as the extra argument. All uses changed. No longer any need for noinline or GCC_BOGUS_WRETURN_LOCAL_ADDR. * lib/canonicalize.c (struct realpath_bufs) (canonicalize_filename_mode_stk): Likewise. * lib/malloc/scratch_buffer_dupfree.c: Remove, since it was removed in glibc. * lib/scratch_buffer.h (scratch_buffer_dupfree) [0]: (__libc_scratch_buffer_dupfree): Remove decls. * modules/relocatable-prog-wrapper (Files): * modules/scratch_buffer (Files, lib_SOURCES): Remove lib/malloc/scratch_buffer_dupfree.c.
Diffstat (limited to 'modules')
-rw-r--r--modules/relocatable-prog-wrapper1
-rw-r--r--modules/scratch_buffer4
2 files changed, 1 insertions, 4 deletions
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index a60aa24d67..052499c1ad 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -19,7 +19,6 @@ lib/stat.c
lib/canonicalize-lgpl.c
lib/scratch_buffer.h
lib/malloc/scratch_buffer.h
-lib/malloc/scratch_buffer_dupfree.c
lib/malloc/scratch_buffer_grow.c
lib/malloc/scratch_buffer_grow_preserve.c
lib/malloc/scratch_buffer_set_array_size.c
diff --git a/modules/scratch_buffer b/modules/scratch_buffer
index 921c8f5497..ace8a34d2c 100644
--- a/modules/scratch_buffer
+++ b/modules/scratch_buffer
@@ -4,7 +4,6 @@ Variable-sized buffer with on-stack default allocation.
Files:
lib/scratch_buffer.h
lib/malloc/scratch_buffer.h
-lib/malloc/scratch_buffer_dupfree.c
lib/malloc/scratch_buffer_grow.c
lib/malloc/scratch_buffer_grow_preserve.c
lib/malloc/scratch_buffer_set_array_size.c
@@ -37,8 +36,7 @@ malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h
$(AM_V_at)mv $@-t $@
MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t
-lib_SOURCES += malloc/scratch_buffer_dupfree.c \
- malloc/scratch_buffer_grow.c \
+lib_SOURCES += malloc/scratch_buffer_grow.c \
malloc/scratch_buffer_grow_preserve.c \
malloc/scratch_buffer_set_array_size.c