aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-05-10 11:05:24 -0400
committerIngo Molnar <mingo@elte.hu>2011-05-10 11:05:45 -0400
commit932fed4e2e42c3d730c01bb63b1c4f812c533d5b (patch)
tree11b1afac3a40d253cdb905c42901edfaae5e196e /tools
parent57d524154ffe99d27fb55e0e30ddbad9f4c35806 (diff)
parent693d92a1bbc9e42681c42ed190bd42b636ca876f (diff)
Merge commit 'v2.6.39-rc7' into perf/core
Merge reason: pull in the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 91ad5cc95d85..1455413ec7a7 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -43,15 +43,21 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
43 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ 43 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
44 -e s/sh[234].*/sh/ ) 44 -e s/sh[234].*/sh/ )
45 45
46CC = $(CROSS_COMPILE)gcc
47AR = $(CROSS_COMPILE)ar
48
46# Additional ARCH settings for x86 49# Additional ARCH settings for x86
47ifeq ($(ARCH),i386) 50ifeq ($(ARCH),i386)
48 ARCH := x86 51 ARCH := x86
49endif 52endif
50ifeq ($(ARCH),x86_64) 53ifeq ($(ARCH),x86_64)
51 RAW_ARCH := x86_64 54 ARCH := x86
52 ARCH := x86 55 IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
53 ARCH_CFLAGS := -DARCH_X86_64 56 ifeq (${IS_X86_64}, 1)
54 ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S 57 RAW_ARCH := x86_64
58 ARCH_CFLAGS := -DARCH_X86_64
59 ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S
60 endif
55endif 61endif
56 62
57# 63#
@@ -127,8 +133,6 @@ lib = lib
127 133
128export prefix bindir sharedir sysconfdir 134export prefix bindir sharedir sysconfdir
129 135
130CC = $(CROSS_COMPILE)gcc
131AR = $(CROSS_COMPILE)ar
132RM = rm -f 136RM = rm -f
133MKDIR = mkdir 137MKDIR = mkdir
134FIND = find 138FIND = find