Skip to contentSkip to conversation

perf tools: Pick up libdw without explicit LIBDW_DIR

PATCH In review Ramkumar Ramachandra 4 participants 5 messages Mar 26, 2014 – Apr 14, 2014 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Cc Jiri Olsa <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/config/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
tools/perf/config/Makefile +2 -3
index c234182..0c043b0 100644
@@ -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
Signature · 1 line
1.9.0.431.g014438b
#1 lore raw
Quoted 2 lines · Ramkumar Ramachandra
 tools/perf/config/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Jiri, any comments?

Ram

Acked-by
#2 lore raw
Quoted 5 lines · Ramkumar Ramachandra
Quoted 2 lines · Ramkumar Ramachandra
 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:

Quoted 7 lines

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

#3 lore raw
Quoted 6 lines · Jean Pihet
Quoted 5 lines · Ramkumar Ramachandra
Quoted 2 lines · Ramkumar Ramachandra
 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

Quoted 7 lines

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:

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

thanks,
jirka

#4 lore raw
In reply to Ramkumar Ramachandra
perf tools: Pick up libdw without explicit LIBDW_DIR
Commit-ID:  2c529e4e6aab405aa52e8627cbd691ed28b56a0b
Gitweb:     http://git.kernel.org/tip/2c529e4e6aab405aa52e8627cbd691ed28b56a0b
Author:     Ramkumar Ramachandra <[email protected]>
AuthorDate: Wed, 26 Mar 2014 18:44:05 -0400
Committer:  Jiri Olsa <[email protected]>
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.

---
 tools/perf/config/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
tools/perf/config/Makefile +2 -3
index 5a3c452..ee21fa9 100644
@@ -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