master c36792b: Revert my KEY_OPS_CFLAGS change to src/Makefile.in

[Paul Eggert]

branch: master
commit c36792bd79f3a97f292ab0612aa5c3ab1b4d9e70
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Revert my KEY_OPS_CFLAGS change to src/Makefile.in
    
    Now that -Og inlining has been improved this is no longer helpful.
    * src/Makefile.in (KEY_OPS_CFLAGS): Remove.  All uses removed.
    This improved CPU performance of ‘make compile-always’ by 5% on my
    platform, which was gcc -Og, GCC 9.3.1 20200317 (Red Hat 9.3.1-1),
    Fedora 31 x86-64 (AMD Phenom II X4 910e, circa 2010).
---
 src/Makefile.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index dfd32255..552dd2e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -377,14 +377,11 @@ endif
 # Flags that might be in WARN_CFLAGS but are not valid for Objective C.
 NON_OBJC_CFLAGS = -Wignored-attributes -Wignored-qualifiers -Wopenmp-simd
 
-# Cajole GCC into inlining key ops even if it wouldn't normally.
-KEY_OPS_CFLAGS = $(if $(filter -Og,$(CFLAGS)),-DDEFINE_KEY_OPS_AS_MACROS)
-
 # -Demacs makes some files produce the correct version for use in Emacs.
 # MYCPPFLAGS is for by-hand Emacs-specific overrides, e.g.,
 # "make MYCPPFLAGS='-DDBUS_DEBUG'".
-EMACS_CFLAGS = -Demacs $(KEY_OPS_CFLAGS) $(MYCPPFLAGS) \
-  -I. -I$(srcdir) -I$(lib) -I$(top_srcdir)/lib \
+EMACS_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \
+  -I$(lib) -I$(top_srcdir)/lib \
   $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
   $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
   $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \