x86: move i386 and x86_64 Makefiles to arch/x86 (74b469f2) · Commits · 戴 / test

Makefile

+5 −2

Original line number	Diff line number	Diff line
		@@ -196,6 +196,9 @@ CROSS_COMPILE ?=
		UTS_MACHINE := $(ARCH)
		SRCARCH := $(ARCH)

		# for i386 and x86_64 we use SRCARCH equal to x86
		SRCARCH := $(if $(filter x86_64 i386,$(SRCARCH)),x86,$(SRCARCH))

		KCONFIG_CONFIG ?= .config

		# SHELL used by kbuild
		@@ -418,7 +421,7 @@ ifeq ($(config-targets),1)
		# Read arch specific Makefile to set KBUILD_DEFCONFIG as needed.
		# KBUILD_DEFCONFIG may point out an alternative default configuration
		# used for 'make defconfig'
		include $(srctree)/arch/$(ARCH)/Makefile
		include $(srctree)/arch/$(SRCARCH)/Makefile
		export KBUILD_DEFCONFIG

		config %config: scripts_basic outputmakefile FORCE
		@@ -497,7 +500,7 @@ else
		KBUILD_CFLAGS += -O2
		endif

		include $(srctree)/arch/$(ARCH)/Makefile
		include $(srctree)/arch/$(SRCARCH)/Makefile

		ifdef CONFIG_FRAME_POINTER
		KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		# Unified Makefile for i386 and x86_64

		# No need to remake these files
		$(srctree)/arch/x86/Makefile%: ;

		ifeq ($(ARCH),i386)
		include $(srctree)/arch/x86/Makefile_32
		else
		include $(srctree)/arch/x86/Makefile_64
		endif

+2 −5

Original line number	Diff line number	Diff line
		#
		# i386/Makefile
		# i386 Makefile
		#
		# This file is included by the global makefile so that you can add your own
		# architecture-specific flags and dependencies. Remember to do have actions
		@@ -17,9 +17,6 @@
		# 20050320 Kianusch Sayah Karadji <kianusch@sk-tech.net>
		# Added support for GEODE CPU

		# Fill in SRCARCH
		SRCARCH := x86

		# BITS is used as extension for files which are available in a 32 bit
		# and a 64 bit version to simplify shared Makefiles.
		# e.g.: obj-y += foo_$(BITS).o
		@@ -46,7 +43,7 @@ KBUILD_CFLAGS += -pipe -msoft-float -mregparm=3 -freg-struct-return
		KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)

		# CPU-specific tuning. Anything which can be shared with UML should go here.
		include $(srctree)/arch/i386/Makefile.cpu
		include $(srctree)/arch/x86/Makefile_32.cpu

		# temporary until string.h is fixed
		cflags-y += -ffreestanding

+0 −0

File moved.

+1 −4

Original line number	Diff line number	Diff line
		#
		# x86_64/Makefile
		# x86_64 Makefile
		#
		# This file is included by the global makefile so that you can add your own
		# architecture-specific flags and dependencies. Remember to do have actions
		@@ -21,9 +21,6 @@
		#
		# $Id: Makefile,v 1.31 2002/03/22 15:56:07 ak Exp $

		# Fill in SRCARCH
		SRCARCH := x86

		# BITS is used as extension for files which are available in a 32 bit
		# and a 64 bit version to simplify shared Makefiles.
		# e.g.: obj-y += foo_$(BITS).o