tools/perf: libraries must come after objects
in [Kernel]
|
From: Jan Engelhardt on 10 Feb 2010 19:30 parent b4bdd73ce865213a5653dc424873e8da37e858cc (v2.6.32.7) commit 588424af1a51fa41ea4811200889d6a03219c6fd Author: Jan Engelhardt <jengelh(a)medozas.de> Date: Thu Feb 11 01:20:54 2010 +0100 tools/perf: libraries must come after objects Link order matters, especially now since distributions are using -Wl,--as-needed. Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de> --- tools/perf/Makefile | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 7e190d5..9c688cd 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -201,7 +201,7 @@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wdeclaration-after-statement CFLAGS = $(MBITS) -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -fstack-protector-all -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) -LDFLAGS = -lpthread -lrt -lelf -lm +LDLIBS = -lpthread -lrt -lelf -lm ALL_CFLAGS = $(CFLAGS) ALL_LDFLAGS = $(LDFLAGS) STRIP ?= strip @@ -421,8 +421,8 @@ ifeq ($(uname_S),Darwin) PTHREAD_LIBS = endif -ifeq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y) - ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y) +ifeq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(LDFLAGS) $(LDLIBS) > /dev/null 2>&1 && echo y"), y) + ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(LDFLAGS) $(LDLIBS) > /dev/null 2>&1 && echo y"), y) BASIC_CFLAGS += -DLIBELF_NO_MMAP endif else @@ -432,20 +432,20 @@ endif ifdef NO_DEMANGLE BASIC_CFLAGS += -DNO_DEMANGLE else - has_bfd := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd > /dev/null 2>&1 && echo y") + has_bfd := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(LDFLAGS) $(LDLIBS) -lbfd > /dev/null 2>&1 && echo y") ifeq ($(has_bfd),y) EXTLIBS += -lbfd else - has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty > /dev/null 2>&1 && echo y") + has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(LDFLAGS) $(LDLIBS) -lbfd -liberty > /dev/null 2>&1 && echo y") ifeq ($(has_bfd_iberty),y) EXTLIBS += -lbfd -liberty else - has_bfd_iberty_z := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty -lz > /dev/null 2>&1 && echo y") + has_bfd_iberty_z := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(LDFLAGS) $(LDLIBS) -lbfd -liberty -lz > /dev/null 2>&1 && echo y") ifeq ($(has_bfd_iberty_z),y) EXTLIBS += -lbfd -liberty -lz else - has_cplus_demangle := $(shell sh -c "(echo 'extern char *cplus_demangle(const char *, int);'; echo 'int main(void) { cplus_demangle(0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -liberty > /dev/null 2>&1 && echo y") + has_cplus_demangle := $(shell sh -c "(echo 'extern char *cplus_demangle(const char *, int);'; echo 'int main(void) { cplus_demangle(0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(LDFLAGS) $(LDLIBS) -liberty > /dev/null 2>&1 && echo y") ifeq ($(has_cplus_demangle),y) EXTLIBS += -liberty BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE @@ -677,7 +677,7 @@ prefix_SQ = $(subst ','\'',$(prefix)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) -LIBS = $(PERFLIBS) $(EXTLIBS) +LIBS = $(PERFLIBS) $(LDLIBS) $(EXTLIBS) BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \ $(COMPAT_CFLAGS) -- # Created with git-export-patch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Ingo Molnar on 22 Feb 2010 06:00 * Jan Engelhardt <jengelh(a)medozas.de> wrote: > parent b4bdd73ce865213a5653dc424873e8da37e858cc (v2.6.32.7) > commit 588424af1a51fa41ea4811200889d6a03219c6fd > Author: Jan Engelhardt <jengelh(a)medozas.de> > Date: Thu Feb 11 01:20:54 2010 +0100 > > tools/perf: libraries must come after objects > > Link order matters, especially now since distributions are > using -Wl,--as-needed. > > Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de> > --- > tools/perf/Makefile | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) FYI, this patch doesnt apply to the latest version of perf: patching file tools/perf/Makefile Hunk #1 FAILED at 201. Hunk #2 FAILED at 421. Hunk #3 FAILED at 432. Hunk #4 succeeded at 770 (offset 93 lines). 3 out of 4 hunks FAILED -- rejects in file tools/perf/Makefile you can find the devel tree at: http://people.redhat.com/mingo/tip.git/README Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Jan Engelhardt on 22 Feb 2010 08:40 On Monday 2010-02-22 11:50, Ingo Molnar wrote: >> >> tools/perf: libraries must come after objects >> >> Link order matters, especially now since distributions are >> using -Wl,--as-needed. >> >> Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de> >> --- >> tools/perf/Makefile | 16 ++++++++-------- >> 1 files changed, 8 insertions(+), 8 deletions(-) > >FYI, this patch doesnt apply to the latest version of perf: > > patching file tools/perf/Makefile > Hunk #1 FAILED at 201. > Hunk #2 FAILED at 421. > Hunk #3 FAILED at 432. > Hunk #4 succeeded at 770 (offset 93 lines). > 3 out of 4 hunks FAILED -- rejects in file tools/perf/Makefile > >you can find the devel tree at: > > http://people.redhat.com/mingo/tip.git/README Do happen to have that as a faster git:// too? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Ingo Molnar on 22 Feb 2010 08:50 * Jan Engelhardt <jengelh(a)medozas.de> wrote: > On Monday 2010-02-22 11:50, Ingo Molnar wrote: > >> > >> tools/perf: libraries must come after objects > >> > >> Link order matters, especially now since distributions are > >> using -Wl,--as-needed. > >> > >> Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de> > >> --- > >> tools/perf/Makefile | 16 ++++++++-------- > >> 1 files changed, 8 insertions(+), 8 deletions(-) > > > >FYI, this patch doesnt apply to the latest version of perf: > > > > patching file tools/perf/Makefile > > Hunk #1 FAILED at 201. > > Hunk #2 FAILED at 421. > > Hunk #3 FAILED at 432. > > Hunk #4 succeeded at 770 (offset 93 lines). > > 3 out of 4 hunks FAILED -- rejects in file tools/perf/Makefile > > > >you can find the devel tree at: > > > > http://people.redhat.com/mingo/tip.git/README > > Do happen to have that as a faster git:// too? Yes, the links for the -tip Git tree are in that file. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Peter Zijlstra on 22 Feb 2010 09:20 On Mon, 2010-02-22 at 14:31 +0100, Jan Engelhardt wrote: > > Do happen to have that as a faster git:// too? > git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|
Next
|
Last
Pages: 1 2 Prev: 2.6.33-rc7 problems usb CF Next: X25: Fix x25_create errors for bad protocol and ENOBUFS |