File otp_src_18.4-erts-cflags.patch of Package erlang

diff -Ndur otp_src_18.4/erts/configure.in otp_src_18.4-erts-cflags/erts/configure.in
--- otp_src_18.4/erts/configure.in	2015-01-30 17:57:06.000000000 +0200
+++ otp_src_18.4-erts-cflags/erts/configure.in	2015-02-20 21:45:18.426439190 +0200
@@ -505,37 +505,6 @@
 
 extra_flags="-I${ERL_TOP}/erts/$host $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
-
-
 
 CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-R"
 case $host_os in
@@ -620,8 +589,7 @@
   WFLAGS=""
   WERRORFLAGS=""
 fi
-dnl DEBUG_FLAGS is obsolete (I hope)
-AC_SUBST(DEBUG_FLAGS)
+
 AC_SUBST(DEBUG_CFLAGS)
 AC_SUBST(WFLAGS)
 AC_SUBST(WERRORFLAGS)
diff -Ndur otp_src_18.4/erts/emulator/Makefile.in otp_src_18.4-erts-cflags/erts/emulator/Makefile.in
--- otp_src_18.4/erts/emulator/Makefile.in	2015-01-30 17:57:06.000000000 +0200
+++ otp_src_18.4-erts-cflags/erts/emulator/Makefile.in	2015-02-20 21:43:51.867445046 +0200
@@ -259,14 +259,6 @@
 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
@@ -308,11 +300,10 @@
 CS_TYPE_FLAGS = $(subst QUANTIFY,FAKE_QUANTIFY, \
 		$(subst PURIFY,FAKE_PURIFY, $(TYPE_FLAGS)))
 endif
-CS_CFLAGS_ = $(CS_TYPE_FLAGS) $(DEFS) $(WFLAGS)
 ifeq ($(GCC),yes)
-CS_CFLAGS = $(subst -O2, $(GEN_OPT_FLGS) $(UNROLL_FLG), $(CS_CFLAGS_))
+CS_CFLAGS = $(CS_TYPE_FLAGS) $(GEN_OPT_FLGS) $(UNROLL_FLG) $(DEFS) $(WFLAGS)
 else
-CS_CFLAGS = $(CS_CFLAGS_)
+CS_CFLAGS = $(CS_TYPE_FLAGS) $(DEFS) $(WFLAGS)
 endif
 CS_LDFLAGS = $(LDFLAGS)
 CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal$(TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
@@ -963,7 +954,7 @@
 	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/%.o: hipe/%.c
-	$(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(BINDIR)/hipe_mkliterals$(TF_MARKER):	$(OBJDIR)/hipe_mkliterals.o
 	$(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
@@ -1015,7 +1006,7 @@
 # Use -fomit-frame-pointer to work around gcc (v4.5.2) bug causing
 # "error: r7 cannot be used in asm here" for DEBUG build.
 $(OBJDIR)/hipe_arm.o:           hipe/hipe_arm.c
-	$(V_CC) $(subst O2,O3, $(CFLAGS)) -fomit-frame-pointer $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) -fomit-frame-pointer $(INCLUDES) -c $< -o $@
 
 # end of HiPE section
 ########################################
diff -Ndur otp_src_18.4/erts/emulator/zlib/zlib.mk otp_src_18.4-erts-cflags/erts/emulator/zlib/zlib.mk
--- otp_src_18.4/erts/emulator/zlib/zlib.mk	2015-01-30 17:57:06.000000000 +0200
+++ otp_src_18.4-erts-cflags/erts/emulator/zlib/zlib.mk	2015-02-20 21:43:51.867445046 +0200
@@ -53,7 +53,7 @@
 ifeq ($(TYPE),debug)
 ZLIB_CFLAGS = $(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 -Ndur otp_src_18.4/erts/lib_src/Makefile.in otp_src_18.4-erts-cflags/erts/lib_src/Makefile.in
--- otp_src_18.4/erts/lib_src/Makefile.in	2015-01-30 17:57:06.000000000 +0200
+++ otp_src_18.4-erts-cflags/erts/lib_src/Makefile.in	2015-02-20 21:43:51.868445046 +0200
@@ -39,7 +39,7 @@
 ERLANG_OSTYPE=@ERLANG_OSTYPE@
 
 OMIT_FP=false
-CFLAGS=$(subst O2,O3, @CFLAGS@)
+CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
 
 ifeq ($(TYPE),debug)