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

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

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent build fixes for certain distro environments, from Arnaldo Carvalho de Melo:

  * Problem on recent gcc on x86-32 related to strict alias issue for
    find_first_bit (Jiri Olsa).

  * OpenSuSE: BFD detection problems related to not explicitely listing all
    required libraries (Andi Kleen)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b6e53f32 b39c2a57

tools/perf/config/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ else 
endif



ifeq ($(feature-libbfd), 1)

  EXTLIBS += -lbfd

  EXTLIBS += -lbfd -lz -liberty

endif



ifdef NO_DEMANGLE

tools/perf/config/feature-checks/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ test-libpython-version.bin: 
	$(BUILD) $(FLAGS_PYTHON_EMBED)



test-libbfd.bin:

	$(BUILD) -DPACKAGE='"perf"' -lbfd -ldl

	$(BUILD) -DPACKAGE='"perf"' -lbfd -lz -liberty -ldl



test-liberty.bin:

	$(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='"perf"' -lbfd -ldl -liberty

tools/perf/util/include/linux/bitops.h

+3 −1
Original line number Diff line number Diff line
@@ -87,13 +87,15 @@ static __always_inline unsigned long __ffs(unsigned long word) 
	return num;

}



typedef const unsigned long __attribute__((__may_alias__)) long_alias_t;



/*

 * Find the first set bit in a memory region.

 */

static inline unsigned long

find_first_bit(const unsigned long *addr, unsigned long size)

{

	const unsigned long *p = addr;

	long_alias_t *p = (long_alias_t *) addr;

	unsigned long result = 0;

	unsigned long tmp;