|
@@ -185,7 +185,10 @@ ifeq ($(ARCH),i386)
|
|
|
ARCH := x86
|
|
|
endif
|
|
|
ifeq ($(ARCH),x86_64)
|
|
|
+ RAW_ARCH := x86_64
|
|
|
ARCH := x86
|
|
|
+ ARCH_CFLAGS := -DARCH_X86_64
|
|
|
+ ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S
|
|
|
endif
|
|
|
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
|
@@ -375,6 +378,7 @@ LIB_H += util/include/linux/prefetch.h
|
|
|
LIB_H += util/include/linux/rbtree.h
|
|
|
LIB_H += util/include/linux/string.h
|
|
|
LIB_H += util/include/linux/types.h
|
|
|
+LIB_H += util/include/linux/linkage.h
|
|
|
LIB_H += util/include/asm/asm-offsets.h
|
|
|
LIB_H += util/include/asm/bug.h
|
|
|
LIB_H += util/include/asm/byteorder.h
|
|
@@ -383,6 +387,8 @@ LIB_H += util/include/asm/swab.h
|
|
|
LIB_H += util/include/asm/system.h
|
|
|
LIB_H += util/include/asm/uaccess.h
|
|
|
LIB_H += util/include/dwarf-regs.h
|
|
|
+LIB_H += util/include/asm/dwarf2.h
|
|
|
+LIB_H += util/include/asm/cpufeature.h
|
|
|
LIB_H += perf.h
|
|
|
LIB_H += util/cache.h
|
|
|
LIB_H += util/callchain.h
|
|
@@ -417,6 +423,7 @@ LIB_H += util/probe-finder.h
|
|
|
LIB_H += util/probe-event.h
|
|
|
LIB_H += util/pstack.h
|
|
|
LIB_H += util/cpumap.h
|
|
|
+LIB_H += $(ARCH_INCLUDE)
|
|
|
|
|
|
LIB_OBJS += $(OUTPUT)util/abspath.o
|
|
|
LIB_OBJS += $(OUTPUT)util/alias.o
|
|
@@ -472,6 +479,9 @@ BUILTIN_OBJS += $(OUTPUT)builtin-bench.o
|
|
|
# Benchmark modules
|
|
|
BUILTIN_OBJS += $(OUTPUT)bench/sched-messaging.o
|
|
|
BUILTIN_OBJS += $(OUTPUT)bench/sched-pipe.o
|
|
|
+ifeq ($(RAW_ARCH),x86_64)
|
|
|
+BUILTIN_OBJS += $(OUTPUT)bench/mem-memcpy-x86-64-asm.o
|
|
|
+endif
|
|
|
BUILTIN_OBJS += $(OUTPUT)bench/mem-memcpy.o
|
|
|
|
|
|
BUILTIN_OBJS += $(OUTPUT)builtin-diff.o
|
|
@@ -898,6 +908,7 @@ BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
|
|
|
LIB_OBJS += $(COMPAT_OBJS)
|
|
|
|
|
|
ALL_CFLAGS += $(BASIC_CFLAGS)
|
|
|
+ALL_CFLAGS += $(ARCH_CFLAGS)
|
|
|
ALL_LDFLAGS += $(BASIC_LDFLAGS)
|
|
|
|
|
|
export TAR INSTALL DESTDIR SHELL_PATH
|