Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeffe2ab authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to resolve conflict 



Conflicts:
	tools/perf/arch/x86/tests/dwarf-unwind.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 20113199 399f0c22

tools/lib/api/fs/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
char debugfs_mountpoint[PATH_MAX + 1] = "/sys/kernel/debug";



static const char * const debugfs_known_mountpoints[] = {

	"/sys/kernel/debug/",

	"/debug/",

	"/sys/kernel/debug",

	"/debug",

	0,

};

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ $(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H) 
	$(QUIET_CC)$(CC) -o $@ -c -fPIC $(CFLAGS) $(GTK_CFLAGS) $<



$(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS)

	$(QUIET_LINK)$(CC) -o $@ -shared $(ALL_LDFLAGS) $(filter %.o,$^) $(GTK_LIBS)

	$(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS)



$(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \

tools/perf/arch/x86/tests/dwarf-unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static int sample_ustack(struct perf_sample *sample, 


	sp = (unsigned long) regs[PERF_REG_X86_SP];



	map = map_groups__find(thread->mg, MAP__FUNCTION, (u64) sp);

	map = map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);

	if (!map) {

		pr_debug("failed to get stack map\n");

		free(buf);

tools/perf/arch/x86/tests/regs_load.S

+7 −1
Original line number Diff line number Diff line 


#include <linux/linkage.h>



#define AX	 0
@@ -90,3 +89,10 @@ ENTRY(perf_regs_load) 
	ret

ENDPROC(perf_regs_load)

#endif



/*

 * We need to provide note.GNU-stack section, saying that we want

 * NOT executable stack. Otherwise the final linking will assume that

 * the ELF stack should not be restricted at all and set it RWX.

 */

.section .note.GNU-stack,"",@progbits

tools/perf/config/Makefile

+27 −11
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ CFLAGS += -Wall 
CFLAGS += -Wextra

CFLAGS += -std=gnu99



# Enforce a non-executable stack, as we may regress (again) in the future by

# adding assembler files missing the .GNU-stack linker note.

LDFLAGS += -Wl,-z,noexecstack



EXTLIBS = -lelf -lpthread -lrt -lm -ldl



ifneq ($(OUTPUT),)
@@ -194,7 +198,10 @@ VF_FEATURE_TESTS = \ 
	stackprotector-all		\

	timerfd				\

	libunwind-debug-frame		\

	bionic

	bionic				\

	liberty				\

	liberty-z			\

	cplus-demangle



# Set FEATURE_CHECK_(C|LD)FLAGS-all for all CORE_FEATURE_TESTS features.

# If in the future we need per-feature checks/flags for features not
@@ -512,7 +519,21 @@ else 
endif



ifeq ($(feature-libbfd), 1)

  EXTLIBS += -lbfd -lz -liberty

  EXTLIBS += -lbfd



  # call all detections now so we get correct

  # status in VF output

  $(call feature_check,liberty)

  $(call feature_check,liberty-z)

  $(call feature_check,cplus-demangle)



  ifeq ($(feature-liberty), 1)

    EXTLIBS += -liberty

  else

    ifeq ($(feature-liberty-z), 1)

      EXTLIBS += -liberty -lz

    endif

  endif

endif



ifdef NO_DEMANGLE
@@ -523,15 +544,10 @@ else 
    CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

  else

    ifneq ($(feature-libbfd), 1)

      $(call feature_check,liberty)

      ifeq ($(feature-liberty), 1)

        EXTLIBS += -lbfd -liberty

      else

        $(call feature_check,liberty-z)

        ifeq ($(feature-liberty-z), 1)

          EXTLIBS += -lbfd -liberty -lz

        else

          $(call feature_check,cplus-demangle)

      ifneq ($(feature-liberty), 1)

        ifneq ($(feature-liberty-z), 1)

          # we dont have neither HAVE_CPLUS_DEMANGLE_SUPPORT

          # or any of 'bfd iberty z' trinity

          ifeq ($(feature-cplus-demangle), 1)

            EXTLIBS += -liberty

            CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT