mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
26d89d1eef
This patch reverts back the changes to HOSTCFLAGS and HOSTLDFLAGS When we were building complete binaries to get constants (such as ptrace register layout on stack) from host userspace headers, we needed to make the arch for building HOST binaries match our one: i.e. on a 64bit system compiling 32bit binaries, we compile 32-bit hostprogs and need, say, 32-bit ncurses. Now we can revert that - that avoids problem with, say, menuconfig and ncurses, on a system which can't compile well 32-bit programs. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
38 lines
1,014 B
Text
38 lines
1,014 B
Text
core-y += arch/um/sys-i386/ arch/i386/crypto/
|
|
|
|
TOP_ADDR := $(CONFIG_TOP_ADDR)
|
|
|
|
ifeq ($(CONFIG_MODE_SKAS),y)
|
|
ifneq ($(CONFIG_MODE_TT),y)
|
|
START := 0x8048000
|
|
endif
|
|
endif
|
|
|
|
LDFLAGS += -m elf_i386
|
|
ELF_ARCH := $(SUBARCH)
|
|
ELF_FORMAT := elf32-$(SUBARCH)
|
|
OBJCOPYFLAGS := -O binary -R .note -R .comment -S
|
|
|
|
ifeq ("$(origin SUBARCH)", "command line")
|
|
ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")
|
|
CFLAGS += $(call cc-option,-m32)
|
|
USER_CFLAGS += $(call cc-option,-m32)
|
|
AFLAGS += $(call cc-option,-m32)
|
|
LINK-y += $(call cc-option,-m32)
|
|
UML_OBJCOPYFLAGS += -F $(ELF_FORMAT)
|
|
|
|
export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS
|
|
endif
|
|
endif
|
|
|
|
CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
|
|
|
|
# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
|
|
include $(srctree)/arch/i386/Makefile.cpu
|
|
|
|
# prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
|
|
cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)
|
|
|
|
CFLAGS += $(cflags-y)
|
|
USER_CFLAGS += $(cflags-y)
|
|
|