[PATCH 4/4] change optimize

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Gbp-Pq: Name 0004-change-optimize.patch

diff --git a/Makefile b/Makefile
index f4a969234a5a3aad7d3c065bab6769342a174bbd..bb2266961ccf27ae6a431e7ee71c2376f70de9bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ test:
        CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C $(TESTDIR) $@
        CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C $(EXDIR) $@
 
-clangtest: CFLAGS ?= -O3
+clangtest: CFLAGS ?= -O2 -g
 clangtest: CFLAGS += -Werror -Wconversion -Wno-sign-conversion
 clangtest: CC = clang
 clangtest: clean
@@ -138,18 +138,18 @@ clangtest: clean
 
 clangtest-native: clean
        clang -v
-       CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(LZ4DIR)  all    CC=clang
-       CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(PRGDIR)  native CC=clang
-       CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(TESTDIR) native CC=clang
+       CFLAGS="-O2 -g -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(LZ4DIR)  all    CC=clang
+       CFLAGS="-O2 -g -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(PRGDIR)  native CC=clang
+       CFLAGS="-O2 -g -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(TESTDIR) native CC=clang
 
 usan: CC      = clang
-usan: CFLAGS  = -O3 -g -fsanitize=undefined -fno-sanitize-recover=undefined -fsanitize-recover=pointer-overflow
+usan: CFLAGS  = -O2 -g -g -fsanitize=undefined -fno-sanitize-recover=undefined -fsanitize-recover=pointer-overflow
 usan: LDFLAGS = $(CFLAGS)
 usan: clean
        CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
 
 usan32: clean
-       CFLAGS="-m32 -O3 -g -fsanitize=undefined" $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
+       CFLAGS="-m32 -O2 -g -g -fsanitize=undefined" $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
 
 SCANBUILD ?= scan-build
 SCANBUILD_FLAGS += --status-bugs -v --force-analyze-debug-code
@@ -164,9 +164,9 @@ cppcheck:
 platformTest: clean
        echo "\n ---- test lz4 with $(CC) compiler ----"
        $(CC) -v
-       CFLAGS="-O3 -Werror"         $(MAKE) -C $(LZ4DIR) all
-       CFLAGS="-O3 -Werror -static" $(MAKE) -C $(PRGDIR) all
-       CFLAGS="-O3 -Werror -static" $(MAKE) -C $(TESTDIR) all
+       CFLAGS="-O2 -g -Werror"         $(MAKE) -C $(LZ4DIR) all
+       CFLAGS="-O2 -g -Werror -static" $(MAKE) -C $(PRGDIR) all
+       CFLAGS="-O2 -g -Werror -static" $(MAKE) -C $(TESTDIR) all
        $(MAKE) -C $(TESTDIR) test-platform
 
 .PHONY: versionsTest
@@ -174,7 +174,7 @@ versionsTest: clean
        $(MAKE) -C $(TESTDIR) $@
 
 gpptest gpptest32: CC = "$(CXX) -Wno-deprecated"
-gpptest gpptest32: CFLAGS = -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror
+gpptest gpptest32: CFLAGS = -O2 -g -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror
 gpptest32: CFLAGS += -m32
 gpptest gpptest32: clean
        $(CXX) -v

diff --git a/contrib/djgpp/Makefile b/contrib/djgpp/Makefile
index 2ee43564c13eec81c245064577cc6ad14864e328..16712cbf32f5175d5f9b39186f65b2c9632958f9 100644 (file)
--- a/contrib/djgpp/Makefile
+++ b/contrib/djgpp/Makefile
@@ -19,7 +19,7 @@ CC = $(CROSS)-gcc
 AR = $(CROSS)-ar
 LD = $(CROSS)-gcc
 
-CFLAGS ?= -O3 -std=gnu99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
+CFLAGS ?= -O2 -g -std=gnu99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
 LDFLAGS ?= -s
 SRC = programs/bench.c programs/lz4io.c programs/lz4cli.c
 OBJ = $(SRC:.c=.o)

diff --git a/contrib/gen_manual/Makefile b/contrib/gen_manual/Makefile
index 4cf9d487c33187da0f1a2f767360ae35e790a5ac..61999e0822daffce0e16f68b6ad27a920b8ebe5a 100644 (file)
--- a/contrib/gen_manual/Makefile
+++ b/contrib/gen_manual/Makefile
@@ -30,7 +30,7 @@
 # ################################################################
 
 
-CXXFLAGS ?= -O3
+CXXFLAGS ?= -O2 -g
 CXXFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment
 CXXFLAGS += $(MOREFLAGS)
 FLAGS   = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)

diff --git a/examples/Makefile b/examples/Makefile
index 5e51976fb3bd945993e9c570674e8b00b67539ca..396611e73a98b2d6e31d96ded1f918af54250958 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -28,7 +28,7 @@
 # ##########################################################################
 
 CPPFLAGS += -I../lib
-CFLAGS   ?= -O3
+CFLAGS   ?= -O2 -g
 CFLAGS   += -std=gnu99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes
 FLAGS    := $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
 

diff --git a/lib/Makefile b/lib/Makefile
index c412d229fff5f8e66424de72ce1d594407e7e5b0..248874d297d52810944d7c0d8d1e9b1e3a727590 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -46,7 +46,7 @@ BUILD_SHARED:=yes
 BUILD_STATIC:=yes
 
 CPPFLAGS+= -DXXH_NAMESPACE=LZ4_
-CFLAGS  ?= -O3
+CFLAGS  ?= -O2 -g
 DEBUGFLAGS:= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
              -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes \
              -Wundef -Wpointer-arith -Wstrict-aliasing=1

diff --git a/lib/dll/example/Makefile b/lib/dll/example/Makefile
index 43aaf17f4fd5f78de4b4db1e26f15fbd59ff49ed..c3d13dfa06b5b36123561286e6ffd6e84c32345a 100644 (file)
--- a/lib/dll/example/Makefile
+++ b/lib/dll/example/Makefile
@@ -28,7 +28,7 @@ LZ4DIR  := ../include
 LIBDIR  := ../static
 DLLDIR  := ../dll
 
-CFLAGS  ?= -O3   # can select custom flags. For example : CFLAGS="-O2 -g" make
+CFLAGS  ?= -O2 -g   # can select custom flags. For example : CFLAGS="-O2 -g" make
 CFLAGS  += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum \
            -Wdeclaration-after-statement -Wstrict-prototypes \
            -Wpointer-arith -Wstrict-aliasing=1

diff --git a/programs/Makefile b/programs/Makefile
index 2df53c1d143528a361ace1fa303ed8d870a3c478..e94677219c8e2c0b0287feb39fb0c4480253b96b 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -46,7 +46,7 @@ SRCFILES  = $(sort $(LIBFILES) $(wildcard *.c))
 OBJFILES  = $(SRCFILES:.c=.o)
 
 CPPFLAGS += -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_
-CFLAGS   ?= -O3
+CFLAGS   ?= -O2 -g
 DEBUGFLAGS= -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow \
             -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes \
             -Wpointer-arith -Wstrict-aliasing=1

diff --git a/tests/Makefile b/tests/Makefile
index b071d28012476bb72f6d42815954eb2f91dd3966..57797320f67a421e567f11a132474c3b2b12d808 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -35,7 +35,7 @@ PYTHON  ?= python3
 
 DEBUGLEVEL?= 1
 DEBUGFLAGS = -g -DLZ4_DEBUG=$(DEBUGLEVEL)
-CFLAGS  ?= -O3 # can select custom optimization flags. Example : CFLAGS=-O2 make
+CFLAGS  ?= -O2 -g # can select custom optimization flags. Example : CFLAGS=-O2 make
 CFLAGS  += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow \
            -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes \
            -Wpointer-arith -Wstrict-aliasing=1