From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 16 Oct 2007 18:23:06 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
X-Git-Tag: v2.6.24-rc1~830
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=821f3eff7cdb9d6c7076effabd46c96c322daed1;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
  kbuild: introduce ccflags-y, asflags-y and ldflags-y
  kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
  kbuild: enable use of AFLAGS and CFLAGS on commandline
  kbuild: enable 'make AFLAGS=...' to add additional options to AS
  kbuild: fix AFLAGS use in h8300 and m68knommu
  kbuild: check for wrong use of CFLAGS
  kbuild: enable 'make CFLAGS=...' to add additional options to CC
  kbuild: fix up CFLAGS usage
  kbuild: make modpost detect unterminated device id lists
  kbuild: call export_report from the Makefile
  kbuild: move Kai Germaschewski to CREDITS
  kconfig/menuconfig: distinguish between selected-by-another options and comments
  kconfig: tristate choices with mixed tristate and boolean values
  include/linux/Kbuild: remove duplicate entries
  kbuild: kill backward compatibility checks
  kbuild: kill EXTRA_ARFLAGS
  kbuild: fix documentation in makefiles.txt
  kbuild: call make once for all targets when O=.. is used
  kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
  kbuild: update _shipped files for kconfig syntax cleanup
  ...

Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
---

821f3eff7cdb9d6c7076effabd46c96c322daed1
diff --cc arch/arm/Makefile
index 6c2d539cd2,0d450e757e..35e56c99ad
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -12,11 -12,11 +12,11 @@@
  
  LDFLAGS_vmlinux	:=-p --no-undefined -X
  CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
 -OBJCOPYFLAGS	:=-O binary -R .note -R .comment -S
 +OBJCOPYFLAGS	:=-O binary -R .note -R .note.gnu.build-id -R .comment -S
  GZFLAGS		:=-9
- #CFLAGS		+=-pipe
+ #KBUILD_CFLAGS	+=-pipe
  # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
- CFLAGS		+=$(call cc-option,-marm,)
+ KBUILD_CFLAGS	+=$(call cc-option,-marm,)
  
  # Do not use arch/arm/defconfig - it's always outdated.
  # Select a platform tht is kept up-to-date
diff --cc arch/um/Makefile
index ab22fdeedf,d08d3bc518..82c2ac4804
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@@ -49,15 -58,14 +49,15 @@@ SYS_DIR		:= $(ARCH_DIR)/include/sysdep-
  #
  # These apply to USER_CFLAGS to.
  
- CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\"	\
+ KBUILD_CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\"	\
  	$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap	\
 -	-Din6addr_loopback=kernel_in6addr_loopback
 +	-Din6addr_loopback=kernel_in6addr_loopback \
 +	-Din6addr_any=kernel_in6addr_any
  
- AFLAGS += $(ARCH_INCLUDE)
+ KBUILD_AFLAGS += $(ARCH_INCLUDE)
  
  USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
- 	$(patsubst -I%,,$(CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
+ 	$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
  	-D_FILE_OFFSET_BITS=64
  
  include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
diff --cc arch/um/drivers/Makefile
index 634968150b,0f780dd0d4..d283e7b022
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
@@@ -17,11 -17,9 +17,11 @@@ ubd-objs := ubd_kern.o ubd_user.
  port-objs := port_kern.o port_user.o
  harddog-objs := harddog_kern.o harddog_user.o
  
- LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a)
+ LDFLAGS_pcap.o := -r $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)
  
 -targets := pcap_kern.o pcap_user.o
 +LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
 +
 +targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o
  
  $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
  	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o)