From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 7 Jan 2025 05:21:43 +0000 (+0100) Subject: [3.12] gh-128472: Add `-skip-funcs` to BOLT options to fix computed goto errors ... X-Git-Tag: v3.12.9~102 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=115d5043b1a7f1890eb5f17a5c9779d666415656;p=thirdparty%2FPython%2Fcpython.git [3.12] gh-128472: Add `-skip-funcs` to BOLT options to fix computed goto errors (gh-128511) (gh-128572) gh-128472: Add `-skip-funcs` to BOLT options to fix computed goto errors (gh-128511) * Add `-skip-funcs` to BOLT options to fix computed goto errors * NEWS --------- (cherry picked from commit 24b147a19b360c49cb1740aa46211d342aaa071f) Co-authored-by: Zanie Blue Co-authored-by: Gregory Szorc --- diff --git a/Misc/NEWS.d/next/Build/2025-01-04-22-39-10.gh-issue-128472.Wt5E6M.rst b/Misc/NEWS.d/next/Build/2025-01-04-22-39-10.gh-issue-128472.Wt5E6M.rst new file mode 100644 index 000000000000..c6233e1f2d86 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-01-04-22-39-10.gh-issue-128472.Wt5E6M.rst @@ -0,0 +1,2 @@ +Skip BOLT optimization of functions using computed gotos, fixing errors on +build with LLVM 19. diff --git a/configure b/configure index c9de45a2331a..32c9600b2e8c 100755 --- a/configure +++ b/configure @@ -9165,7 +9165,7 @@ fi printf %s "checking BOLT_COMMON_FLAGS... " >&6; } if test -z "${BOLT_COMMON_FLAGS}" then - BOLT_COMMON_FLAGS=-update-debug-sections + BOLT_COMMON_FLAGS=" -update-debug-sections -skip-funcs=_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1 " fi diff --git a/configure.ac b/configure.ac index 7325d00e3942..0f60c8499657 100644 --- a/configure.ac +++ b/configure.ac @@ -2114,7 +2114,14 @@ if test -z "${BOLT_COMMON_FLAGS}" then AS_VAR_SET( [BOLT_COMMON_FLAGS], - [-update-debug-sections] + [m4_normalize(" + [-update-debug-sections] + + dnl At least LLVM 19.x doesn't support computed gotos in PIC compiled code. + dnl Exclude functions containing computed gotos. + dnl TODO this may be fixed in LLVM 20.x via https://github.com/llvm/llvm-project/pull/120267. + [-skip-funcs=_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1] + ")] ) fi