From 705d9b91c0afd90921bb94d19da583110439ef3a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 10 Dec 2024 11:19:25 -0800 Subject: [PATCH] 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. (cherry picked from commit 1012e2a43b9d78ad623f2daa2204a2d1cec830a5) --- admin/merge-gnulib | 4 ++-- 1 file 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 @@ GNULIB_URL=https://git.savannah.gnu.org/git/gnulib.git GNULIB_MODULES=' - alignasof alloca-opt binary-io boot-time byteswap c-ctype c-strcase - canonicalize-lgpl + alignasof alloca-opt binary-io boot-time builtin-expect byteswap + c-ctype c-strcase canonicalize-lgpl careadlinkat close-stream copy-file-range crypto/md5 crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer -- 2.39.2