Fixes issue when debugging debug builds of Perf.

When a 'make DEBUG=1' build is done, the command parser is still built with -O6 and is hard to step through.

This change also moves EXTRA_WARNINGS and EXTRA_FLAGS to the end of the compilation line, otherwise they cannot be used to override the default values.

Signed-off-by James Clark <[email protected]>

---
 tools/lib/subcmd/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

tools/lib/subcmd/Makefile +6 -3

index 5b2cd5e58df0..1c777a72bb39 100644
@@ -19,8 +19,7 @@ MAKEFLAGS += --no-print-directory
 
 LIBFILE = $(OUTPUT)libsubcmd.a
 
-CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
-CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -fPIC
+CFLAGS := -ggdb3 -Wall -Wextra -std=gnu99 -fPIC
 
 ifeq ($(DEBUG),0)
   ifeq ($(feature-fortify-source), 1)

@@ -28,7 +27,9 @@ ifeq ($(DEBUG),0)
   endif
 endif
 
-ifeq ($(CC_NO_CLANG), 0)
+ifeq ($(DEBUG),1)
+  CFLAGS += -O0
+else ifeq ($(CC_NO_CLANG), 0)
   CFLAGS += -O3
 else
   CFLAGS += -O6

@@ -43,6 +44,8 @@ CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
 CFLAGS += -I$(srctree)/tools/include/
 
+CFLAGS += $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
+
 SUBCMD_IN := $(OUTPUT)libsubcmd-in.o
 
 all:

Signature · 1 line

2.23.0

Em Mon, Oct 28, 2019 at 11:34:01AM +0000, James Clark escreveu:

Quoted 6 lines

When a 'make DEBUG=1' build is done, the command parser is still built with -O6 and is hard to step through.

This change also moves EXTRA_WARNINGS and EXTRA_FLAGS to the end of the compilation line, otherwise they cannot be used to override the default values.

The patch came mangled, so I'm applying by hand, and separating it into two patches, the first for the first paragraph and the other for the second, ok?

And here is the first patch out of your larger one, I changed the subject line to reflect that this is not tools/perf specific, as tools/objtool/ also uses libsubcmd, added Josh, objtool's maintainer so that he is made aware.

The patch came mangled, so I'm applying by hand, and separating it into two patches, the first for the first paragraph and the other for the second, ok?

Em Tue, Oct 29, 2019 at 11:18:52AM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 4 lines

And here is the first patch out of your larger one, I changed the subject line to reflect that this is not tools/perf specific, as tools/objtool/ also uses libsubcmd, added Josh, objtool's maintainer so that he is made aware.

And the second patch:

commit d0381449fd9ab733ec2daf527263da9f73f1e94e

Author: James Clark <[email protected]>
Date:   Mon Oct 28 11:34:01 2019 +0000

libsubcmd: Use -O0 with DEBUG=1

When a 'make DEBUG=1' build is done, the command parser is still built with -O6 and is hard to step through, fix it making it use -O0 in that case.

Signed-off-by James Clark <[email protected]>

Cc Adrian Hunter <[email protected]>

Cc Ian Rogers <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Josh Poimboeuf <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc nd <[email protected]>

Link http://lore.kernel.org/lkml/[email protected] open here

[ split from a larger patch ]

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

tools/lib/subcmd/Makefile +3 -1

index 352c6062deba..1c777a72bb39 100644
@@ -27,7 +27,9 @@ ifeq ($(DEBUG),0)
   endif
 endif
 
-ifeq ($(CC_NO_CLANG), 0)
+ifeq ($(DEBUG),1)
+  CFLAGS += -O0
+else ifeq ($(CC_NO_CLANG), 0)
   CFLAGS += -O3
 else
   CFLAGS += -O6

Hi Arnaldo,

Thanks for that, yes separating them looks better. I will try to break down commits in the future.

Quoted 3 lines

The patch came mangled, so I'm applying by hand, and separating it into two patches, the first for the first paragraph and the other for the second, ok?

By mangled do you mean the quoted printables "=3D" and "=20"?

It seems like git send-email falls back to this behavior by default:

--transfer-encoding=(7bit|8bit|quoted-printable|base64|auto)

Specify the transfer encoding to be used to send the message over SMTP. 7bit will fail upon encountering a non-ASCII message. quoted-printable can be useful when the repository contains files that contain carriage returns, but makes the raw patch email file (as saved from a MUA) much harder to inspect manually. base64 is even more fool proof, but also even more opaque. auto will use 8bit when possible, and quoted-printable otherwise.

I copied my raw patch and was able to successfully apply it with git am, even with this escaping. Although I did upgrade to a newer version of git (2.23.0).

If I view the patch that you created, then it doesn't have quoted printable escaping. So there does seem to be a difference somewhere.
Do you think I should use "git send-email --transfer-encoding=7bit"?

Thanks
James

Quoted 46 lines · Arnaldo Carvalho de Melo

Em Tue, Oct 29, 2019 at 11:18:52AM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 4 lines

And here is the first patch out of your larger one, I changed the subject line to reflect that this is not tools/perf specific, as tools/objtool/ also uses libsubcmd, added Josh, objtool's maintainer so that he is made aware.

And the second patch:

commit d0381449fd9ab733ec2daf527263da9f73f1e94e

Author: James Clark <[email protected]>
Date:   Mon Oct 28 11:34:01 2019 +0000

libsubcmd: Use -O0 with DEBUG=1

When a 'make DEBUG=1' build is done, the command parser is still built with -O6 and is hard to step through, fix it making it use -O0 in that case.

Signed-off-by James Clark <[email protected]>

Cc Adrian Hunter <[email protected]>

Cc Ian Rogers <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Josh Poimboeuf <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc nd <[email protected]>

Link http://lore.kernel.org/lkml/[email protected] open here

[ split from a larger patch ]

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

tools/lib/subcmd/Makefile +3 -1

index 352c6062deba..1c777a72bb39 100644
@@ -27,7 +27,9 @@ ifeq ($(DEBUG),0)
   endif
 endif
 
-ifeq ($(CC_NO_CLANG), 0)
+ifeq ($(DEBUG),1)
+  CFLAGS += -O0
+else ifeq ($(CC_NO_CLANG), 0)
   CFLAGS += -O3
 else
   CFLAGS += -O6