Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18 (774bd861) · Commits · e / devices / android_kernel_fairphone_FP4

Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -309,9 +309,6 @@ CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)

		CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		-fno-strict-aliasing -fno-common
		# Force gcc to behave correct even for buggy distributions
		CFLAGS += $(call cc-option, -fno-stack-protector)

		AFLAGS := -D__ASSEMBLY__

		# Read KERNELRELEASE from include/config/kernel.release (if it exists)
		@@ -486,6 +483,8 @@ else
		CFLAGS += -O2
		endif

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

		ifdef CONFIG_FRAME_POINTER
		CFLAGS += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
		else
		@@ -500,7 +499,8 @@ ifdef CONFIG_DEBUG_INFO
		CFLAGS += -g
		endif

		include $(srctree)/arch/$(ARCH)/Makefile
		# Force gcc to behave correct even for buggy distributions
		CFLAGS += $(call cc-option, -fno-stack-protector)

		# arch Makefile may override CC so keep this after arch Makefile is included
		NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)