diff options
| author | Paul Eggert | 2025-12-09 12:55:17 -0800 |
|---|---|---|
| committer | Paul Eggert | 2025-12-09 13:27:27 -0800 |
| commit | 88bf047d39838393cd16f231e721c8b548a50f42 (patch) | |
| tree | 822067e5af0d720d549eb5e00babd142d7d347f6 /lib | |
| parent | cc05493483a005074608f31a54e496599bd3b296 (diff) | |
| download | emacs-88bf047d39838393cd16f231e721c8b548a50f42.tar.gz emacs-88bf047d39838393cd16f231e721c8b548a50f42.zip | |
Garbage-collect Gnulib sources
Remove Gnulib sources no longer needed or used.
admin/merge-gnulib is typically not smart enough to do that.
* configure.ac: Do not call gl_EEMALLOC, as it is no longer
supplied or needed.
* lib/explicit_bzero.c, lib/malloc/scratch_buffer_dupfree.c:
* lib/xalloc-oversized.h, m4/eealloc.m4, m4/explicit_bzero.m4:
* m4/st_dm_mode.m4, m4/year2038.m4:
Remove.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/explicit_bzero.c | 74 | ||||
| -rw-r--r-- | lib/malloc/scratch_buffer_dupfree.c | 41 | ||||
| -rw-r--r-- | lib/xalloc-oversized.h | 66 |
3 files changed, 0 insertions, 181 deletions
diff --git a/lib/explicit_bzero.c b/lib/explicit_bzero.c deleted file mode 100644 index 59d9895abfe..00000000000 --- a/lib/explicit_bzero.c +++ /dev/null | |||
| @@ -1,74 +0,0 @@ | |||
| 1 | /* Erasure of sensitive data, generic implementation. | ||
| 2 | Copyright (C) 2016-2025 Free Software Foundation, Inc. | ||
| 3 | This file is part of the GNU C Library. | ||
| 4 | |||
| 5 | The GNU C Library is free software; you can redistribute it and/or | ||
| 6 | modify it under the terms of the GNU Lesser General Public | ||
| 7 | License as published by the Free Software Foundation; either | ||
| 8 | version 2.1 of the License, or (at your option) any later version. | ||
| 9 | |||
| 10 | The GNU C Library is distributed in the hope that it will be useful, | ||
| 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 13 | Lesser General Public License for more details. | ||
| 14 | |||
| 15 | You should have received a copy of the GNU Lesser General Public | ||
| 16 | License along with the GNU C Library; if not, see | ||
| 17 | <https://www.gnu.org/licenses/>. */ | ||
| 18 | |||
| 19 | /* An assembler implementation of explicit_bzero can be created as an | ||
| 20 | assembler alias of an optimized bzero implementation. | ||
| 21 | Architecture-specific implementations also need to define | ||
| 22 | __explicit_bzero_chk. */ | ||
| 23 | |||
| 24 | #if !_LIBC | ||
| 25 | # include <config.h> | ||
| 26 | #endif | ||
| 27 | |||
| 28 | /* memset_s need this define */ | ||
| 29 | #if HAVE_MEMSET_S | ||
| 30 | # define __STDC_WANT_LIB_EXT1__ 1 | ||
| 31 | #endif | ||
| 32 | |||
| 33 | #include <string.h> | ||
| 34 | |||
| 35 | #if defined _WIN32 && !defined __CYGWIN__ | ||
| 36 | # define WIN32_LEAN_AND_MEAN | ||
| 37 | # include <windows.h> | ||
| 38 | #endif | ||
| 39 | |||
| 40 | #if _LIBC | ||
| 41 | /* glibc-internal users use __explicit_bzero_chk, and explicit_bzero | ||
| 42 | redirects to that. */ | ||
| 43 | # undef explicit_bzero | ||
| 44 | #endif | ||
| 45 | |||
| 46 | /* Set LEN bytes of S to 0. The compiler will not delete a call to | ||
| 47 | this function, even if S is dead after the call. */ | ||
| 48 | void | ||
| 49 | explicit_bzero (void *s, size_t len) | ||
| 50 | { | ||
| 51 | #if defined _WIN32 && !defined __CYGWIN__ | ||
| 52 | (void) SecureZeroMemory (s, len); | ||
| 53 | #elif HAVE_EXPLICIT_MEMSET | ||
| 54 | explicit_memset (s, '\0', len); | ||
| 55 | #elif HAVE_MEMSET_S | ||
| 56 | (void) memset_s (s, len, '\0', len); | ||
| 57 | #elif defined __GNUC__ && !defined __clang__ | ||
| 58 | memset (s, '\0', len); | ||
| 59 | /* Compiler barrier. */ | ||
| 60 | asm volatile ("" ::: "memory"); | ||
| 61 | #elif defined __clang__ | ||
| 62 | memset (s, '\0', len); | ||
| 63 | /* Compiler barrier. */ | ||
| 64 | /* With asm ("" ::: "memory") LLVM analyzes uses of 's' and finds that the | ||
| 65 | whole thing is dead and eliminates it. Use 'g' to work around this | ||
| 66 | problem. See <https://bugs.llvm.org/show_bug.cgi?id=15495#c11>. */ | ||
| 67 | __asm__ volatile ("" : : "g"(s) : "memory"); | ||
| 68 | #else | ||
| 69 | /* Invoke memset through a volatile function pointer. This defeats compiler | ||
| 70 | optimizations. */ | ||
| 71 | void * (* const volatile volatile_memset) (void *, int, size_t) = memset; | ||
| 72 | (void) volatile_memset (s, '\0', len); | ||
| 73 | #endif | ||
| 74 | } | ||
diff --git a/lib/malloc/scratch_buffer_dupfree.c b/lib/malloc/scratch_buffer_dupfree.c deleted file mode 100644 index 0d31a765d5d..00000000000 --- a/lib/malloc/scratch_buffer_dupfree.c +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | /* Variable-sized buffer with on-stack default allocation. | ||
| 2 | Copyright (C) 2020-2025 Free Software Foundation, Inc. | ||
| 3 | This file is part of the GNU C Library. | ||
| 4 | |||
| 5 | The GNU C Library is free software; you can redistribute it and/or | ||
| 6 | modify it under the terms of the GNU Lesser General Public | ||
| 7 | License as published by the Free Software Foundation; either | ||
| 8 | version 2.1 of the License, or (at your option) any later version. | ||
| 9 | |||
| 10 | The GNU C Library is distributed in the hope that it will be useful, | ||
| 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 13 | Lesser General Public License for more details. | ||
| 14 | |||
| 15 | You should have received a copy of the GNU Lesser General Public | ||
| 16 | License along with the GNU C Library; if not, see | ||
| 17 | <https://www.gnu.org/licenses/>. */ | ||
| 18 | |||
| 19 | #ifndef _LIBC | ||
| 20 | # include <libc-config.h> | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #include <scratch_buffer.h> | ||
| 24 | #include <string.h> | ||
| 25 | |||
| 26 | void * | ||
| 27 | __libc_scratch_buffer_dupfree (struct scratch_buffer *buffer, size_t size) | ||
| 28 | { | ||
| 29 | void *data = buffer->data; | ||
| 30 | if (data == buffer->__space.__c) | ||
| 31 | { | ||
| 32 | void *copy = malloc (size); | ||
| 33 | return copy != NULL ? memcpy (copy, data, size) : NULL; | ||
| 34 | } | ||
| 35 | else | ||
| 36 | { | ||
| 37 | void *copy = realloc (data, size); | ||
| 38 | return copy != NULL ? copy : data; | ||
| 39 | } | ||
| 40 | } | ||
| 41 | libc_hidden_def (__libc_scratch_buffer_dupfree) | ||
diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h deleted file mode 100644 index 808e97b8cae..00000000000 --- a/lib/xalloc-oversized.h +++ /dev/null | |||
| @@ -1,66 +0,0 @@ | |||
| 1 | /* xalloc-oversized.h -- memory allocation size checking | ||
| 2 | |||
| 3 | Copyright (C) 1990-2000, 2003-2004, 2006-2025 Free Software | ||
| 4 | Foundation, Inc. | ||
| 5 | |||
| 6 | This file is free software: you can redistribute it and/or modify | ||
| 7 | it under the terms of the GNU Lesser General Public License as | ||
| 8 | published by the Free Software Foundation; either version 2.1 of the | ||
| 9 | License, or (at your option) any later version. | ||
| 10 | |||
| 11 | This file is distributed in the hope that it will be useful, | ||
| 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | GNU Lesser General Public License for more details. | ||
| 15 | |||
| 16 | You should have received a copy of the GNU Lesser General Public License | ||
| 17 | along with this program. If not, see <https://www.gnu.org/licenses/>. */ | ||
| 18 | |||
| 19 | #ifndef XALLOC_OVERSIZED_H_ | ||
| 20 | #define XALLOC_OVERSIZED_H_ | ||
| 21 | |||
| 22 | #include <stddef.h> | ||
| 23 | #include <stdint.h> | ||
| 24 | |||
| 25 | /* True if N * S does not fit into both ptrdiff_t and size_t. | ||
| 26 | N and S should be nonnegative and free of side effects. | ||
| 27 | This expands to a constant expression if N and S are both constants. | ||
| 28 | By gnulib convention, SIZE_MAX represents overflow in size_t | ||
| 29 | calculations, so the conservative size_t-based dividend to use here | ||
| 30 | is SIZE_MAX - 1. */ | ||
| 31 | #define __xalloc_oversized(n, s) \ | ||
| 32 | ((s) != 0 \ | ||
| 33 | && (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) | ||
| 34 | |||
| 35 | /* Return 1 if and only if an array of N objects, each of size S, | ||
| 36 | cannot exist reliably because its total size in bytes would exceed | ||
| 37 | MIN (PTRDIFF_MAX, SIZE_MAX - 1). | ||
| 38 | |||
| 39 | N and S should be nonnegative and free of side effects. | ||
| 40 | |||
| 41 | Warning: (xalloc_oversized (N, S) ? NULL : malloc (N * S)) can | ||
| 42 | misbehave if N and S are both narrower than ptrdiff_t and size_t, | ||
| 43 | and can be rewritten as (xalloc_oversized (N, S) ? NULL | ||
| 44 | : malloc (N * (size_t) S)). | ||
| 45 | |||
| 46 | This is a macro, not a function, so that it works even if an | ||
| 47 | argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ | ||
| 48 | #if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX | ||
| 49 | # define xalloc_oversized(n, s) \ | ||
| 50 | __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) | ||
| 51 | #elif 5 <= __GNUC__ && !defined __clang__ && !defined __ICC \ | ||
| 52 | && PTRDIFF_MAX < SIZE_MAX | ||
| 53 | # define xalloc_oversized(n, s) \ | ||
| 54 | (__builtin_constant_p (n) && __builtin_constant_p (s) \ | ||
| 55 | ? __xalloc_oversized (n, s) \ | ||
| 56 | : __extension__ \ | ||
| 57 | ({ ptrdiff_t __xalloc_count; \ | ||
| 58 | __builtin_mul_overflow (n, s, &__xalloc_count); })) | ||
| 59 | |||
| 60 | /* Other compilers use integer division; this may be slower but is | ||
| 61 | more portable. */ | ||
| 62 | #else | ||
| 63 | # define xalloc_oversized(n, s) __xalloc_oversized (n, s) | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #endif /* !XALLOC_OVERSIZED_H_ */ | ||