File otp_src_24.1.2-erts-cflags.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File otp_src_24.1.2-erts-cflags.patch of Package erlang (Revision e9e9df5cd07247af20e8ef23ec8a4cab)

Currently displaying revision e9e9df5cd07247af20e8ef23ec8a4cab , Show latest

diff -Ndurp otp_src_24.1.2/erts/configure.in otp_src_24.1.2-erts-cflags/erts/configure.in
--- otp_src_24.1.2/erts/configure.in	2021-10-04 18:12:13.000000000 +0300
+++ otp_src_24.1.2-erts-cflags/erts/configure.in	2021-10-13 14:30:24.798935689 +0300
@@ -475,35 +475,6 @@ AC_SUBST(ERTS_CONFIG_H_IDIR)
 
 extra_flags="$ERTS_CONFIG_H_IDIR $OTP_EXTRA_FLAGS"
 CFLAGS="$CFLAGS $extra_flags"
-DEBUG_CFLAGS="-g $CPPFLAGS $extra_flags $DEBUG_CFLAGS"
-DEBUG_FLAGS=-g
-
-dnl
-dnl Adjust DEBUG_CFLAGS to match CFLAGS in terms of -m
-dnl
-
-case $CFLAGS in
-	*-m64*)
-		case $DEBUG_CFLAGS in
-			*-m64*)
-				;;
-			*)
-				DEBUG_CFLAGS="-m64 $DEBUG_CFLAGS"
-				;;
-		esac
-		;;
-	*-m32*)
-		case $DEBUG_CFLAGS in
-			*-m32*)
-				;;
-			*)
-				DEBUG_CFLAGS="-m32 $DEBUG_CFLAGS"
-				;;
-		esac
-		;;
-	*)
-		;;
-esac
 
 lfs_conf=ok
 lfs_source=none
@@ -603,8 +574,6 @@ case "$CFLAGS" in
   If you want to build erts without any optimization, pass -O0 to CFLAGS.]) ;;
 esac
 
-dnl DEBUG_FLAGS is obsolete (I hope)
-AC_SUBST(DEBUG_FLAGS)
 AC_SUBST(DEBUG_CFLAGS)
 AC_SUBST(WFLAGS)
 AC_SUBST(WERRORFLAGS)
diff -Ndurp otp_src_24.1.2/erts/emulator/Makefile.in otp_src_24.1.2-erts-cflags/erts/emulator/Makefile.in
--- otp_src_24.1.2/erts/emulator/Makefile.in	2021-10-04 18:12:13.000000000 +0300
+++ otp_src_24.1.2-erts-cflags/erts/emulator/Makefile.in	2021-10-13 14:33:36.330361956 +0300
@@ -300,14 +300,6 @@ ifeq (@EMU_LOCK_CHECKING@,yes)
 NO_INLINE_FUNCTIONS=true
 endif
 
-ifneq ($(filter tile-%,$(TARGET)), )
-# -O2 generally produces faster for tile-cc, because the code is smaller.
-# Since tile-cc looks like gcc, we need to override the normal gcc -O3 setting.
-OPT_LEVEL = -O2
-else
-OPT_LEVEL = -O3
-endif
-
 ifeq ($(GCC),yes)
 ifeq ($(NO_INLINE_FUNCTIONS),true)
 GEN_OPT_FLGS = $(OPT_LEVEL) -fno-inline-functions
@@ -337,11 +329,10 @@ RC=false
 endif
 endif
 
-CS_CFLAGS_ = $(TYPE_FLAGS) $(DEFS) $(WFLAGS)
 ifeq ($(GCC),yes)
-CS_CFLAGS = $(subst -O2, $(GEN_OPT_FLGS) $(UNROLL_FLG), $(CS_CFLAGS_))
+CS_CFLAGS = $(TYPE_FLAGS) $(GEN_OPT_FLGS) $(UNROLL_FLG) $(DEFS) $(WFLAGS)
 else
-CS_CFLAGS = $(CS_CFLAGS_)
+CS_CFLAGS = $(TYPE_FLAGS) $(DEFS) $(WFLAGS)
 endif
 CS_LDFLAGS = $(LDFLAGS)
 CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal$(TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ @SOCKET_LIBS@
diff -Ndurp otp_src_24.1.2/erts/emulator/zlib/zlib.mk otp_src_24.1.2-erts-cflags/erts/emulator/zlib/zlib.mk
--- otp_src_24.1.2/erts/emulator/zlib/zlib.mk	2021-10-04 18:12:13.000000000 +0300
+++ otp_src_24.1.2-erts-cflags/erts/emulator/zlib/zlib.mk	2021-10-13 14:30:24.798935689 +0300
@@ -54,7 +54,7 @@ else  # gcov
 ifeq ($(TYPE),debug)
 ZLIB_CFLAGS = -DZLIB_DEBUG=1 $(DEBUG_CFLAGS) $(DEFS) $(THR_DEFS)
 else # debug
-ZLIB_CFLAGS = $(subst -O2, -O3, $(CONFIGURE_CFLAGS) $(DEFS) $(THR_DEFS))
+ZLIB_CFLAGS = $(CONFIGURE_CFLAGS) $(DEFS) $(THR_DEFS)
 #ZLIB_CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #ZLIB_CFLAGS=-g -DDEBUG
 #ZLIB_CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
diff -Ndurp otp_src_24.1.2/erts/lib_src/Makefile.in otp_src_24.1.2-erts-cflags/erts/lib_src/Makefile.in
--- otp_src_24.1.2/erts/lib_src/Makefile.in	2021-10-04 18:12:13.000000000 +0300
+++ otp_src_24.1.2-erts-cflags/erts/lib_src/Makefile.in	2021-10-13 14:30:24.802935592 +0300
@@ -43,7 +43,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
 ERLANG_OSTYPE=@ERLANG_OSTYPE@
 
 OMIT_FP=false
-CFLAGS=$(subst O2,O3, @CFLAGS@)
+CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
 
 ifeq ($(TYPE),debug)

Places

File otp_src_24.1.2-erts-cflags.patch of Package erlang (Revision e9e9df5cd07247af20e8ef23ec8a4cab)

Places