unify HOST_CFLAGS and HOSTCFLAGS

The top build system sets up HOSTCFLAGS a bit and exports it, but other
places use HOST_CFLAGS instead.  Unify the two as HOSTCFLAGS so that the
values stay in sync.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/Makefile b/Makefile
index a7ffe2501c923c1c66d71f3bdfb05f23798f8d47..ebdf032b7d129ac4300f6c9807b9137d741cb0de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -429,7 +429,7 @@ $(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h
        @$(XECHO) Generating $@ ; \
        set -e ; \
        : Generate the dependancies ; \
-       $(CC) -x c -DDO_DEPS_ONLY -M $(HOST_CFLAGS) $(CPPFLAGS) \
+       $(CC) -x c -DDO_DEPS_ONLY -M $(HOSTCFLAGS) $(CPPFLAGS) \
                -MQ $(obj)include/autoconf.mk include/common.h > $@
 
 $(obj)include/autoconf.mk: $(obj)include/config.h

diff --git a/board/fads/config.mk b/board/fads/config.mk
index 621b9a24931cd7c5fa70a0b83bf6ee1ea88c1860..61060907eee67afeb66c8f1b6821173d90e6aca3 100644 (file)
--- a/board/fads/config.mk
+++ b/board/fads/config.mk
@@ -30,5 +30,5 @@
 
 TEXT_BASE = 0xFE000000
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/fads
-HOST_CFLAGS += -I$(TOPDIR)/board/fads
+HOSTCFLAGS += -I$(TOPDIR)/board/fads
 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/fads

diff --git a/board/netstar/Makefile b/board/netstar/Makefile
index cb3f7c90327033721e5fd90c301e5309f44ae872..8f35f93d7bccb5b77622eef4740feb95d5fe22c6 100644 (file)
--- a/board/netstar/Makefile
+++ b/board/netstar/Makefile
@@ -42,7 +42,7 @@ LOAD_ADDR = 0x10400000
 LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds
 lnk = $(if $(obj),$(obj),.)
 
-HOST_CFLAGS = -Wall -pedantic -I$(TOPDIR)/include
+HOSTCFLAGS = -Wall -pedantic -I$(TOPDIR)/include
 
 all:   $(obj).depend $(LIB) $(obj)eeprom.srec $(obj)eeprom.bin \
                $(obj)crcek.srec $(obj)crcek.bin $(obj)crcit
@@ -70,13 +70,13 @@ $(obj)crcek.bin:    $(obj)crcek.srec
        $(OBJCOPY) -I srec -O binary $< $@ 2>/dev/null
 
 $(obj)crcit:           $(obj)crcit.o $(obj)crc32.o
-       $(HOSTCC) $(HOST_CFLAGS) -o $@ $^
+       $(HOSTCC) $(HOSTCFLAGS) -o $@ $^
 
 $(obj)crcit.o: crcit.c
-       $(HOSTCC) $(HOST_CFLAGS) -o $@ -c $<
+       $(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
 
 $(obj)crc32.o: $(SRCTREE)/lib_generic/crc32.c
-       $(HOSTCC) $(HOST_CFLAGS) -DUSE_HOSTCC -o $@ -c $<
+       $(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -o $@ -c $<
 
 clean:
        rm -f $(SOBJS) $(OBJS) $(obj)eeprom $(obj)eeprom.srec \

diff --git a/board/spc1920/config.mk b/board/spc1920/config.mk
index e361694faa60dc4d1cb355f8377d75830b53415a..8dacc178fc7997eed10d82c7a021476baccc3448 100644 (file)
--- a/board/spc1920/config.mk
+++ b/board/spc1920/config.mk
@@ -31,5 +31,5 @@
 #TEXT_BASE = 0xFE000000
 TEXT_BASE = 0xFFF00000
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/spc1920
-HOST_CFLAGS += -I$(TOPDIR)/board/spc1920
+HOSTCFLAGS += -I$(TOPDIR)/board/spc1920
 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/spc1920

diff --git a/board/xilinx/ml300/Makefile b/board/xilinx/ml300/Makefile
index 9215d77bb0d890eb5479273854cb9a6c5d1788cb..b8a2d64c4f4406488dd8012e3deb9cbdb85070c4 100644 (file)
--- a/board/xilinx/ml300/Makefile
+++ b/board/xilinx/ml300/Makefile
@@ -30,7 +30,7 @@ endif
 
 INCS           := -I../common -I../xilinx_enet -I../xilinx_iic
 CFLAGS         += $(INCS)
-HOST_CFLAGS    += $(INCS)
+HOSTCFLAGS     += $(INCS)
 
 LIB    = $(obj)lib$(BOARD).a
 

diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile
index b56bb490a222eaa4cb4617372885f9837582e612..4e87e4b5cea68e2cb545aa4e3e60b10db6f6b957 100644 (file)
--- a/board/xilinx/ppc405-generic/Makefile
+++ b/board/xilinx/ppc405-generic/Makefile
@@ -31,7 +31,7 @@ endif
 
 INCS           :=
 CFLAGS         += $(INCS)
-HOST_CFLAGS    += $(INCS)
+HOSTCFLAGS     += $(INCS)
 
 LIB    = $(obj)lib$(BOARD).a
 

diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile
index bf0a6ba4f290696101f44ff40ddb3b1bd98e60f1..11a8f69343c54dd348b8fffe4d5597f905a0e6d2 100644 (file)
--- a/board/xilinx/ppc440-generic/Makefile
+++ b/board/xilinx/ppc440-generic/Makefile
@@ -31,7 +31,7 @@ endif
 
 INCS           :=
 CFLAGS         += $(INCS)
-HOST_CFLAGS    += $(INCS)
+HOSTCFLAGS     += $(INCS)
 
 LIB    = $(obj)lib$(BOARD).a
 

diff --git a/cpu/ixp/npe/Makefile b/cpu/ixp/npe/Makefile
index f4f97bd0d34811d657bae34db7e8c5562b66f1c4..8fefd29eb561da008266ece2539c3920fae3d704 100644 (file)
--- a/cpu/ixp/npe/Makefile
+++ b/cpu/ixp/npe/Makefile
@@ -27,7 +27,7 @@ LIB := $(obj)libnpe.a
 
 LOCAL_CFLAGS  += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
 CFLAGS  += $(LOCAL_CFLAGS)
-HOST_CFLAGS  += $(LOCAL_CFLAGS)
+HOSTCFLAGS  += $(LOCAL_CFLAGS)
 
 COBJS-$(CONFIG_IXP4XX_NPE) := npe.o \
        miiphy.o \

diff --git a/drivers/bios_emulator/Makefile b/drivers/bios_emulator/Makefile
index c73da97b474efa54dc39498758948516f4e4ddc7..dd9c102ba85bba37f6a1b8ca5cb9bab106d28698 100644 (file)
--- a/drivers/bios_emulator/Makefile
+++ b/drivers/bios_emulator/Makefile
@@ -22,7 +22,7 @@ EXTRA_CFLAGS += -I. -I./include -I$(TOPDIR)/include \
        -D__PPC__  -D__BIG_ENDIAN__
 
 CFLAGS += $(EXTRA_CFLAGS)
-HOST_CFLAGS += $(EXTRA_CFLAGS)
+HOSTCFLAGS += $(EXTRA_CFLAGS)
 
 all:   $(LIB)
 

diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile
index f1bc4a7d5c68cb773b75d36beac84e5333d75956..4a3ead3eff2035a71d6e30818d72a5def8b48ae0 100644 (file)
--- a/drivers/net/sk98lin/Makefile
+++ b/drivers/net/sk98lin/Makefile
@@ -90,7 +90,7 @@ endif
 EXTRA_CFLAGS += -I. -DSK_USE_CSUM $(DBGDEF)
 
 CFLAGS += $(EXTRA_CFLAGS)
-HOST_CFLAGS += $(EXTRA_CFLAGS)
+HOSTCFLAGS += $(EXTRA_CFLAGS)
 
 
 all:   $(LIB)

diff --git a/rules.mk b/rules.mk
index a77451bd7f7f439c72a6e8c0b7234c88ce3edff4..6f999dd0b0dcbc3e21d1f6a5649e288beaa4542a 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -29,7 +29,7 @@ $(obj).depend:        $(src)Makefile $(TOPDIR)/config.mk $(SRCS)
                @rm -f $@
                @for f in $(SRCS); do \
                        g=`basename $$f | sed -e 's/\(.*\)\.\w/\1.o/'`; \
-                       $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $(obj)$$g $$f >> $@ ; \
+                       $(CC) -M $(HOSTCFLAGS) $(CPPFLAGS) -MQ $(obj)$$g $$f >> $@ ; \
                done
 
 #########################################################################

diff --git a/tools/Makefile b/tools/Makefile
index 5c764bba9f2c7108e00bcfc6fab08469e066fadf..b5a1e39b02276ae20498aa0709cb111e49612171 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -36,18 +36,18 @@ TOOLSUBDIRS =
 # -multiply_defined suppress option to turn off this error.
 #
 
-HOST_CFLAGS = -Wall
+HOSTCFLAGS = -Wall
 HOST_LDFLAGS =
 
 ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
-HOST_CFLAGS += -traditional-cpp
+HOSTCFLAGS += -traditional-cpp
 HOST_LDFLAGS += -multiply_defined suppress
 else
-HOST_CFLAGS += -pedantic
+HOSTCFLAGS += -pedantic
 endif
 
 ifeq ($(HOSTOS),cygwin)
-HOST_CFLAGS += -ansi
+HOSTCFLAGS += -ansi
 endif
 
 #
@@ -148,7 +148,7 @@ CPPFLAGS   = -idirafter $(SRCTREE)/include \
                -I $(SRCTREE)/tools \
                -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
                -D__KERNEL_STRICT_NAMES
-CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
+CFLAGS     = $(HOSTCFLAGS) $(CPPFLAGS) -O
 
 # No -pedantic switch to avoid libfdt compilation warnings
 FIT_CFLAGS = -Wall $(CPPFLAGS) -O
@@ -227,7 +227,7 @@ else
            $(MAKE) \
                HOSTOS=$(HOSTOS) \
                HOSTARCH=$(HOSTARCH) \
-               HOST_CFLAGS="$(HOST_CFLAGS)" \
+               HOSTCFLAGS="$(HOSTCFLAGS)" \
                HOST_LDFLAGS="$(HOST_LDFLAGS)" \
                -C $$dir || exit 1 ; \
        done

diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile
index c44cc8a555fb02237e6ff6ed8775f53841bd7ea1..0a5687de779bafc43de0619f68aeb107d415acbd 100644 (file)
--- a/tools/gdb/Makefile
+++ b/tools/gdb/Makefile
@@ -38,7 +38,7 @@ BINS  := $(addprefix $(obj),$(BINS))
 # Use native tools and options
 #
 CPPFLAGS   = -I$(BFD_ROOT_DIR)/include
-CFLAGS     = $(HOST_CFLAGS) -O $(CPPFLAGS)
+CFLAGS     = $(HOSTCFLAGS) -O $(CPPFLAGS)
 CC        = $(HOSTCC)
 MAKEDEPEND = makedepend
 

diff --git a/tools/imls/Makefile b/tools/imls/Makefile
index 04ab31a7dd10b93e0d080a491bbb7c66529c720a..59b928cb1ffcf5348a00c7c02f6e2e72212e4582 100644 (file)
--- a/tools/imls/Makefile
+++ b/tools/imls/Makefile
@@ -19,7 +19,7 @@
 
 include $(TOPDIR)/config.mk
 
-HOST_CFLAGS = -Wall -pedantic
+HOSTCFLAGS = -Wall -pedantic
 
 # Generated executable files
 BIN_FILES-y += imls
@@ -57,7 +57,7 @@ CPPFLAGS   = -idirafter $(SRCTREE)/include \
                -I $(SRCTREE)/libfdt \
                -I $(SRCTREE)/tools \
                -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES
-CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
+CFLAGS     = $(HOSTCFLAGS) $(CPPFLAGS) -O
 
 # No -pedantic switch to avoid libfdt compilation warnings
 FIT_CFLAGS = -Wall $(CPPFLAGS) -O