From b7627085cb13449bfcabf303f486bfd88bf4526c Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Sat, 17 Jun 2023 15:20:26 +0300
Subject: [PATCH] Revert "Revert "configure: Switch debug build from -O0 to
 -Og""

This reverts commit 7dadd38161844313aa936f93bdce40aac0a90327.

The latest revert cited debuggability trumping performance, but the
performance loss is su huge here that debug builds are unusable and
next promotions time out.

In the interest of progress, pick the lesser of two evils.
---
 configure.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure.py b/configure.py
index fc14b4b833..891cfe30d0 100755
--- a/configure.py
+++ b/configure.py
@@ -286,8 +286,7 @@ modes = {
         'cxx_ld_flags': '',
         'stack-usage-threshold': 1024*40,
         # -fasan -Og breaks some coroutines on aarch64, use -O0 instead
-        # also, -Og was seen to make all variables "optimized out"
-        'optimization-level': '0',
+        'optimization-level': ('0' if platform.machine() == 'aarch64' else 'g'),
         'per_src_extra_cxxflags': {},
         'cmake_build_type': 'Debug',
         'can_have_debug_info': True,