File 6071-erts-Add-correct-frame-pointer-flags-to-erts_interna.patch of Package erlang
From 2d9123254e507cc598716ddd02c573e042892cd9 Mon Sep 17 00:00:00 2001 From: Lukas Larsson <lukas@erlang.org> Date: Tue, 4 Oct 2022 14:26:49 +0200 Subject: [PATCH 1/4] erts: Add correct frame-pointer flags to erts_internal --- erts/emulator/Makefile.in | 5 +++-- erts/lib_src/Makefile.in | 13 ++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 3791d2caa2..b0636b866d 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -1433,8 +1433,9 @@ depend: else depend: $(TTF_DIR)/depend.mk $(TTF_DIR)/depend.mk: $(foreach dep, $(DEPEND_DEPS), $(TTF_DIR)/$(dep).depend.mk) - $(V_at)if [ -f "$@" ]; then rm "$@"; fi - $(V_at)for dep in $^; do cat $$dep >> $@; done + $(gen_verbose) + $(V_at)echo "" > "$@" + $(V_at)for dep in "$^"; do cat $$dep >> "$@"; done $(V_at)cd $(ERTS_LIB_DIR) && $(MAKE) depend endif diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in index 043ef2dbd0..392d10f493 100644 --- a/erts/lib_src/Makefile.in +++ b/erts/lib_src/Makefile.in @@ -94,7 +94,11 @@ CFLAGS += -DERTS_OPCODE_COUNTER_SUPPORT PRE_LD= else override TYPE=opt +ifeq (@JIT_ENABLED@, yes) +OMIT_OMIT_FP=yes +else OMIT_FP=true +endif TYPE_SUFFIX= PRE_LD= endif @@ -311,15 +315,6 @@ include $(YCF_SOURCE_DIR)/main_target.mk $(OBJ_DIR)/MADE: $(YCF_EXECUTABLE) $(ETHREAD_LIB) $(ERTS_INTERNAL_LIBS) $(gen_verbose) -ifeq ($(OMIT_OMIT_FP),yes) - @echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *' - @echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *' - @echo '* * * *' - @echo '* * NOTE: Omit frame pointer optimization has been omitted * *' - @echo '* * * *' - @echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *' - @echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *' -endif $(V_at)echo $? > $(OBJ_DIR)/MADE # -- 2.35.3
