Skip to contentSkip to conversation

perf/tool: remove unneccessary feature-dwarf warning

PATCH Applied David Carrillo-Cisneros 3 participants 3 messages Jan 12, 2017 – Jan 18, 2017 perf events

lore
Share & tools
lore

David Carrillo-Cisneros

author
#0 lore raw

PATCH 1/1 perf/tool: remove unneccessary feature-dwarf warning

Don't warn for feature-dwarf==0 if user explicitily disabled dwarf by NO_DWARF=1.

Signed-off-by David Carrillo-Cisneros <[email protected]>
---
 tools/perf/Makefile.config | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/Makefile.config +4 -2
index 94318c07d89d..bf79344cd10c 100644
@@ -291,8 +291,10 @@ else
       endif
     endif
     ifneq ($(feature-dwarf), 1)
-      msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);
-      NO_DWARF := 1
+      ifndef NO_DWARF
+        msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);
+        NO_DWARF := 1
+      endif
     else
       ifneq ($(feature-dwarf_getlocations), 1)
         msg := $(warning Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.157);
Signature · 1 line
2.11.0.390.gc69c2f50cf-goog
maintainer Applied
#1 lore raw

Em Thu, Jan 12, 2017 at 01:01:59PM -0800, David Carrillo-Cisneros escreveu:

Quoted 2 lines

Don't warn for feature-dwarf==0 if user explicitily disabled dwarf by NO_DWARF=1.

Thanks, applied.

- Arnaldo

merge bot
#2 lore raw

[tip:perf/core] perf tools: Remove unneccessary feature-dwarf warning

In reply to David Carrillo-Cisneros
perf tools: Remove unneccessary feature-dwarf warning
Commit-ID:  2484c4c58fd1bc0d7711d294c530a1518da6a172
Gitweb:     http://git.kernel.org/tip/2484c4c58fd1bc0d7711d294c530a1518da6a172
Author:     David Carrillo-Cisneros <[email protected]>
AuthorDate: Thu, 12 Jan 2017 13:01:59 -0800
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 16 Jan 2017 14:59:15 -0300

perf tools: Remove unneccessary feature-dwarf warning

Don't warn for feature-dwarf==0 if user explicitily disabled DWARF by using NO_DWARF=1.

Signed-off-by David Carrillo-Cisneros <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/Makefile.config | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/Makefile.config +4 -2
index 76c84f0..03cf947 100644
@@ -291,8 +291,10 @@ else
       endif
     endif
     ifneq ($(feature-dwarf), 1)
-      msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);
-      NO_DWARF := 1
+      ifndef NO_DWARF
+        msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);
+        NO_DWARF := 1
+      endif
     else
       ifneq ($(feature-dwarf_getlocations), 1)
         msg := $(warning Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.157);