From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Sun, 28 Aug 2022 00:10:38 +0000 (+0900)
Subject: [PATCH 2/2] Change optimize to O2
X-Git-Tag: archive/raspbian/1.9.4-2+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d9454506e0e699c9c1f7a360dadc83012f37cfc5;p=lz4.git

[PATCH 2/2] Change optimize to O2

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Gbp-Pq: Name 0002-Change-optimize-to-O2.patch
---

diff --git a/Makefile b/Makefile
index e70c3db..021db67 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ clangtest: clean
 	$(MAKE) -C $(TESTDIR) all CC=$(CC)
 
 .PHONY: clangtest-native
-clangtest-native: CFLAGS = -O3 -Werror -Wconversion -Wno-sign-conversion
+clangtest-native: CFLAGS = -O2 -g -Werror -Wconversion -Wno-sign-conversion
 clangtest-native: clean
 	clang -v
 	$(MAKE) -C $(LZ4DIR)  all    CC=clang
@@ -156,13 +156,13 @@ clangtest-native: clean
 
 .PHONY: usan
 usan: CC      = clang
-usan: CFLAGS  = -O3 -g -fsanitize=undefined -fno-sanitize-recover=undefined -fsanitize-recover=pointer-overflow
+usan: CFLAGS  = -O2 -g -fsanitize=undefined -fno-sanitize-recover=undefined -fsanitize-recover=pointer-overflow
 usan: LDFLAGS = $(CFLAGS)
 usan: clean
 	CC=$(CC) CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
 
 .PHONY: usan32
-usan32: CFLAGS = -m32 -O3 -g -fsanitize=undefined
+usan32: CFLAGS = -m32 -O2 -g -fsanitize=undefined
 usan32: LDFLAGS = $(CFLAGS)
 usan32: clean
 	$(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
@@ -181,9 +181,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
@@ -196,7 +196,7 @@ test-freestanding:
 
 .PHONY: cxxtest cxx32test
 cxxtest cxx32test: CC := "$(CXX) -Wno-deprecated"
-cxxtest cxx32test: CFLAGS = -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror
+cxxtest cxx32test: CFLAGS = -O2 -g -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror
 cxx32test: CFLAGS += -m32
 cxxtest cxx32test: clean
 	$(CXX) -v
diff --git a/contrib/djgpp/Makefile b/contrib/djgpp/Makefile
index 8cd3580..d49382e 100644
--- 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/examples/Makefile b/examples/Makefile
index 8be5c81..c52b5e5 100644
--- 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)
 
@@ -102,7 +102,7 @@ test : all $(LZ4)
 	$(LZ4) -vt $(TESTFILE).lz4
 
 .PHONY: cxxtest
-cxxtest: CFLAGS := -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror
+cxxtest: CFLAGS := -O2 -g -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror
 cxxtest: clean
 	CC=$(CXX) $(MAKE) -C . all CFLAGS="$(CFLAGS)"
 
diff --git a/lib/Makefile b/lib/Makefile
index 06503cb..0ca1dad 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -48,7 +48,7 @@ BUILD_STATIC:=yes
 
 CPPFLAGS+= -DXXH_NAMESPACE=LZ4_
 CPPFLAGS+= $(MOREFLAGS)
-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 eb8cc1e..5dbd0ed 100644
--- 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 fc4d6f1..3cbd71a 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -47,7 +47,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 b48070a..ca398f5 100644
--- 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