1 files changed, 29 insertions, 29 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 09e2ecc4b056..a2e0e1b200c3 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -164,38 +164,38 @@ ifdef NO_LIBELF
  NO_DEMANGLE := 1
  NO_LIBUNWIND := 1
 else
-FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
+  FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
-ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y)
+  ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y)
-  FLAGS_GLIBC=$(CFLAGS) $(LDFLAGS)
+    FLAGS_GLIBC=$(CFLAGS) $(LDFLAGS)
-  ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC),glibc),y)
+    ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC),glibc),y)
-    LIBC_SUPPORT := 1
+      LIBC_SUPPORT := 1
-  endif
+    endif
-  ifeq ($(BIONIC),1)
+    ifeq ($(BIONIC),1)
-    LIBC_SUPPORT := 1
+      LIBC_SUPPORT := 1
-  endif
+    endif
-  ifeq ($(LIBC_SUPPORT),1)
+    ifeq ($(LIBC_SUPPORT),1)
-    msg := $(warning No libelf found, disables 'probe' tool, please install elfutils-libelf-devel/libelf-dev);
+      msg := $(warning No libelf found, disables 'probe' tool, please install elfutils-libelf-devel/libelf-dev);
-    NO_LIBELF := 1
+      NO_LIBELF := 1
-    NO_DWARF := 1
+      NO_DWARF := 1
-    NO_DEMANGLE := 1
+      NO_DEMANGLE := 1
+    else
+      msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static);
+    endif
  else
-    msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static);
+    # for linking with debug library, run like:
-  endif
+    # make DEBUG=1 LIBDW_DIR=/opt/libdw/
-else
+    ifdef LIBDW_DIR
-  # for linking with debug library, run like:
+      LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
-  # make DEBUG=1 LIBDW_DIR=/opt/libdw/
+      LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
-  ifdef LIBDW_DIR
+    endif
-    LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
-    LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
-  endif
-  FLAGS_DWARF=$(CFLAGS) $(LIBDW_CFLAGS) -ldw -lz -lelf $(LIBDW_LDFLAGS) $(LDFLAGS) $(EXTLIBS)
+    FLAGS_DWARF=$(CFLAGS) $(LIBDW_CFLAGS) -ldw -lz -lelf $(LIBDW_LDFLAGS) $(LDFLAGS) $(EXTLIBS)
-  ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y)
+    ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y)
-    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);
+      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
+      NO_DWARF := 1
-  endif # Dwarf support
+    endif # Dwarf support
-endif # SOURCE_LIBELF
+  endif # SOURCE_LIBELF
 endif # NO_LIBELF
 ifndef NO_LIBELF

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 09e2ecc4b056..a2e0e1b200c3 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile
@@ -164,38 +164,38 @@ ifdef NO_LIBELF
164	NO_DEMANGLE := 1	164	NO_DEMANGLE := 1
165	NO_LIBUNWIND := 1	165	NO_LIBUNWIND := 1
166	else	166	else
167	FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)	167	FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
168	ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y)	168	ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y)
169	FLAGS_GLIBC=$(CFLAGS) $(LDFLAGS)	169	FLAGS_GLIBC=$(CFLAGS) $(LDFLAGS)
170	ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC),glibc),y)	170	ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC),glibc),y)
171	LIBC_SUPPORT := 1	171	LIBC_SUPPORT := 1
172	endif	172	endif
173	ifeq ($(BIONIC),1)	173	ifeq ($(BIONIC),1)
174	LIBC_SUPPORT := 1	174	LIBC_SUPPORT := 1
175	endif	175	endif
176	ifeq ($(LIBC_SUPPORT),1)	176	ifeq ($(LIBC_SUPPORT),1)
177	msg := $(warning No libelf found, disables 'probe' tool, please install elfutils-libelf-devel/libelf-dev);	177	msg := $(warning No libelf found, disables 'probe' tool, please install elfutils-libelf-devel/libelf-dev);
178		178
179	NO_LIBELF := 1	179	NO_LIBELF := 1
180	NO_DWARF := 1	180	NO_DWARF := 1
181	NO_DEMANGLE := 1	181	NO_DEMANGLE := 1
		182	else
		183	msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static);
		184	endif
182	else	185	else
183	msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static);	186	# for linking with debug library, run like:
184	endif	187	# make DEBUG=1 LIBDW_DIR=/opt/libdw/
185	else	188	ifdef LIBDW_DIR
186	# for linking with debug library, run like:	189	LIBDW_CFLAGS := -I$(LIBDW_DIR)/include
187	# make DEBUG=1 LIBDW_DIR=/opt/libdw/	190	LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
188	ifdef LIBDW_DIR	191	endif
189	LIBDW_CFLAGS := -I$(LIBDW_DIR)/include
190	LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
191	endif
192		192
193	FLAGS_DWARF=$(CFLAGS) $(LIBDW_CFLAGS) -ldw -lz -lelf $(LIBDW_LDFLAGS) $(LDFLAGS) $(EXTLIBS)	193	FLAGS_DWARF=$(CFLAGS) $(LIBDW_CFLAGS) -ldw -lz -lelf $(LIBDW_LDFLAGS) $(LDFLAGS) $(EXTLIBS)
194	ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y)	194	ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y)
195	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);	195	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);
196	NO_DWARF := 1	196	NO_DWARF := 1
197	endif # Dwarf support	197	endif # Dwarf support
198	endif # SOURCE_LIBELF	198	endif # SOURCE_LIBELF
199	endif # NO_LIBELF	199	endif # NO_LIBELF
200		200
201	ifndef NO_LIBELF	201	ifndef NO_LIBELF