[PATCH] perf tools: Pick up libdw without explicit LIBDW_DIR

[PATCH] perf tools: Pick up libdw without explicit LIBDW_DIR

[Ramkumar Ramachandra]

The Makefile logic sets FEATURE_CHECKS_CFLAGS-libdw-dwarf-unwind and
FEATURE_CHECKS_LDFLAGS-libdw-dwarf-unwind only if LIBDW_DIR is
defined. This means that under a normal setup,

  $ make NO_LIBUNWIND=1

won't automatically pick up libdw. Fix this.

Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 tools/perf/config/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index c234182..0c043b0 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -65,10 +65,9 @@ ifndef NO_LIBELF
   ifdef LIBDW_DIR
     LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
     LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
-
-    FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
-    FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
   endif
+  FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
+  FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
 endif
 
 # include ARCH specific config
-- 
1.9.0.431.g014438b

Re: [PATCH] perf tools: Pick up libdw without explicit LIBDW_DIR

[Ramkumar Ramachandra]

Ramkumar Ramachandra wrote:
>  tools/perf/config/Makefile | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Jiri, any comments?

Ram

Re: [PATCH] perf tools: Pick up libdw without explicit LIBDW_DIR

[Jean Pihet]

On 3 April 2014 23:51, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
> Ramkumar Ramachandra wrote:
>>  tools/perf/config/Makefile | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> Jiri, any comments?
Note: this patch is equivalent to '[PATCH] perf tools: Fix feature
check for libdw dwarf unwind' [1] from Josh Boyer. Jiri, your pick ;-)

[1] http://www.spinics.net/lists/kernel/msg1716729.html

FWIW:
Acked-by: Jean Pihet <jean.pihet@linaro.org>

>
> Ram
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] perf tools: Pick up libdw without explicit LIBDW_DIR

[Jiri Olsa]

On Fri, Apr 04, 2014 at 09:46:28AM +0200, Jean Pihet wrote:
> On 3 April 2014 23:51, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
> > Ramkumar Ramachandra wrote:
> >>  tools/perf/config/Makefile | 5 ++---
> >>  1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > Jiri, any comments?

hi,
sorry for late reply, I was out last week

> Note: this patch is equivalent to '[PATCH] perf tools: Fix feature
> check for libdw dwarf unwind' [1] from Josh Boyer. Jiri, your pick ;-)
> 
> [1] http://www.spinics.net/lists/kernel/msg1716729.html
> 
> FWIW:
> Acked-by: Jean Pihet <jean.pihet@linaro.org>

I'll take Ramkumar's change, because he sent it out first ;-)

thanks,
jirka

[tip:perf/urgent] perf tools: Pick up libdw without explicit LIBDW_DIR

[tip-bot for Ramkumar Ramachandra]

Commit-ID:  2c529e4e6aab405aa52e8627cbd691ed28b56a0b
Gitweb:     http://git.kernel.org/tip/2c529e4e6aab405aa52e8627cbd691ed28b56a0b
Author:     Ramkumar Ramachandra <artagnon@gmail.com>
AuthorDate: Wed, 26 Mar 2014 18:44:05 -0400
Committer:  Jiri Olsa <jolsa@redhat.com>
CommitDate: Mon, 14 Apr 2014 12:55:17 +0200

perf tools: Pick up libdw without explicit LIBDW_DIR

The Makefile logic sets FEATURE_CHECKS_CFLAGS-libdw-dwarf-unwind and
FEATURE_CHECKS_LDFLAGS-libdw-dwarf-unwind only if LIBDW_DIR is
defined. This means that under a normal setup,

  $ make NO_LIBUNWIND=1

won't automatically pick up libdw. Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jean Pihet <jean.pihet@linaro.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1395873845-466-1-git-send-email-artagnon@gmail.com
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 tools/perf/config/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 5a3c452..ee21fa9 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -65,10 +65,9 @@ ifndef NO_LIBELF
   ifdef LIBDW_DIR
     LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
     LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
-
-    FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
-    FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
   endif
+  FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
+  FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
 endif
 
 # include ARCH specific config