diff options
| author | Paul Eggert | 2024-12-10 11:19:25 -0800 |
|---|---|---|
| committer | Paul Eggert | 2024-12-10 12:16:14 -0800 |
| commit | 1012e2a43b9d78ad623f2daa2204a2d1cec830a5 (patch) | |
| tree | 054ad437a7f07f38344adaf887c4fc43e9692236 | |
| parent | 7665ec8df8d1c01211db6a85dda4813d6912ffee (diff) | |
| download | emacs-1012e2a43b9d78ad623f2daa2204a2d1cec830a5.tar.gz emacs-1012e2a43b9d78ad623f2daa2204a2d1cec830a5.zip | |
Use builtin-expect directly
* admin/merge-gnulib (GNULIB_MODULES): Add builtin-expect,
since src/lisp.h now uses __builtin_expect directly,
which we should no longer rely on it being pulled in as
a dependency of some other Gnulib module that we use.
| -rwxr-xr-x | admin/merge-gnulib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index c265b53684e..0c7de65a323 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -26,8 +26,8 @@ | |||
| 26 | GNULIB_URL=https://git.savannah.gnu.org/git/gnulib.git | 26 | GNULIB_URL=https://git.savannah.gnu.org/git/gnulib.git |
| 27 | 27 | ||
| 28 | GNULIB_MODULES=' | 28 | GNULIB_MODULES=' |
| 29 | alignasof alloca-opt binary-io boot-time byteswap c-ctype c-strcase | 29 | alignasof alloca-opt binary-io boot-time builtin-expect byteswap |
| 30 | canonicalize-lgpl | 30 | c-ctype c-strcase canonicalize-lgpl |
| 31 | careadlinkat close-stream copy-file-range | 31 | careadlinkat close-stream copy-file-range |
| 32 | crypto/md5 crypto/md5-buffer | 32 | crypto/md5 crypto/md5-buffer |
| 33 | crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer | 33 | crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer |