git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cris: use asm-generic/scatterlist.h
[safe/jmp/linux-2.6]
/
arch
/
um
/
Makefile-x86_64
diff --git
a/arch/um/Makefile-x86_64
b/arch/um/Makefile-x86_64
index
08d6b73
..
a9cd7e7
100644
(file)
--- a/
arch/um/Makefile-x86_64
+++ b/
arch/um/Makefile-x86_64
@@
-1,32
+1,26
@@
# Copyright 2003 - 2004 Pathscale, Inc
# Released under the GPL
# Copyright 2003 - 2004 Pathscale, Inc
# Released under the GPL
-
SUBARCH_LIBS := arch/um/sys-x86_64
/
+
core-y += arch/um/sys-x86_64/ arch/x86/crypto
/
START := 0x60000000
START := 0x60000000
-CFLAGS += -U__$(SUBARCH)__ -fno-builtin
-ARCH_USER_CFLAGS := -D__x86_64__
+_extra_flags_ = -fno-builtin -m64
-ELF_ARCH := i386:x86-64
-ELF_FORMAT := elf64-x86-64
-
-SYS_UTIL_DIR := $(ARCH_DIR)/sys-x86_64/util
-SYS_DIR := $(ARCH_DIR)/include/sysdep-x86_64
-
-SYS_HEADERS = $(SYS_DIR)/sc.h $(SYS_DIR)/thread.h
+KBUILD_CFLAGS += $(_extra_flags_)
-prepare: $(SYS_HEADERS)
+CHECKFLAGS += -m64 -D__x86_64__
+KBUILD_AFLAGS += -m64
+LDFLAGS += -m elf_x86_64
+KBUILD_CPPFLAGS += -m64
-$(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc
- $(call filechk,gen_header)
-
-$(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread
- $(call filechk,gen_header)
+ELF_ARCH := i386:x86-64
+ELF_FORMAT := elf64-x86-64
+HEADER_ARCH := x86
-$(SYS_UTIL_DIR)/mk_sc: scripts_basic $(ARCH_DIR)/user-offsets.h FORCE
- $(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
+# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
-$(SYS_UTIL_DIR)/mk_thread: scripts_basic $(ARCH_SYMLINKS) $(GEN_HEADERS) FORCE
- $(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
+LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
+LINK-y += -m64
-CLEAN_FILES += $(SYS_HEADERS)
+# Do unit-at-a-time unconditionally on x86_64, following the host
+KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)