From 6547bced933fface8e0f0dde08f0e0fe1777ddf9 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 22 Aug 2007 12:35:41 +0000 Subject: - global whitespace trimming --- toolchain/binutils/binutils.mk | 4 +- toolchain/ccache/ccache.mk | 14 ++-- toolchain/elf2flt/elf2flt/Makefile.in | 4 +- toolchain/external-toolchain/ext-tool.mk | 74 +++++++++++----------- toolchain/gcc/Makefile.in | 2 +- toolchain/gcc/gcc-uclibc-3.x.mk | 16 ++--- toolchain/gcc/gcc-uclibc-4.x.mk | 16 ++--- .../kernel-headers/kernel-headers-new.makefile | 2 +- .../kernel-headers/kernel-headers-old.makefile | 8 +-- toolchain/kernel-headers/kernel-headers.mk | 4 +- toolchain/uClibc/uclibc.mk | 4 +- 11 files changed, 74 insertions(+), 74 deletions(-) (limited to 'toolchain') diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 7d7fa7acb..f62b0c2ba 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -122,7 +122,7 @@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured # Unfortunatey, it isn't configureable. $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld: $(BINUTILS_DIR1)/binutils/objdump $(MAKE) -C $(BINUTILS_DIR1) $(BR2_SYSROOT_STAGING_DESTDIR) install - # tooldir=/usr build_tooldir=/usr install + # tooldir=/usr build_tooldir=/usr install #rm -f $(STAGING_DIR)/usr/bin/{ar,as,ld,nm,objdump,ranlib,strip} binutils: uclibc-configured $(BINUTILS_HOST_PREREQ) $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld @@ -173,7 +173,7 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump tooldir=/usr build_tooldir=/usr \ -C $(BINUTILS_DIR2) install #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -$(STRIP) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 -$(STRIP) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk index 56723d777..93831138d 100644 --- a/toolchain/ccache/ccache.mk +++ b/toolchain/ccache/ccache.mk @@ -66,7 +66,7 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin-ccache/ [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \ - mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin-ccache/ + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin-ccache/ (cd $(STAGING_DIR)/usr/bin; \ ln -fs ccache $(GNU_TARGET_NAME)-c++; \ ln -fs ccache $(GNU_TARGET_NAME)-g++;\ @@ -80,10 +80,10 @@ endif ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY) ccache-clean: - rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc - rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc - rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc - rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc + rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc + rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc + rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc + rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ]; then \ mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \ (cd $(STAGING_DIR)/usr/bin; \ @@ -97,9 +97,9 @@ ccache-clean: fi if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ]; then \ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \ - mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \ + mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \ fi - rm -rf $(STAGING_DIR)/usr/bin-ccache/* + rm -rf $(STAGING_DIR)/usr/bin-ccache/* (cd $(STAGING_DIR)/usr/bin; \ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\ diff --git a/toolchain/elf2flt/elf2flt/Makefile.in b/toolchain/elf2flt/elf2flt/Makefile.in index 2d225d47c..acead9f6f 100644 --- a/toolchain/elf2flt/elf2flt/Makefile.in +++ b/toolchain/elf2flt/elf2flt/Makefile.in @@ -23,7 +23,7 @@ OBJEXT = @OBJEXT@ HOST = @host_alias@ ifneq (,$(findstring mingw32,$(HOST))) - LIBS := $(LIBS) -lws2_32 + LIBS := $(LIBS) -lws2_32 endif # force link order under cygwin to avoid getopts / libiberty clash @@ -36,7 +36,7 @@ CCFLAGS = $(CFLAGS) $(DEFS) $(INCLUDES) LDFILE= elf2flt.ld ifeq ($(strip $(CPU)),e1) SRC_LDFILE= $(CPU)-elf2flt.ld -else +else SRC_LDFILE= elf2flt.ld endif diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk index df1c5c5e7..a8303296f 100644 --- a/toolchain/external-toolchain/ext-tool.mk +++ b/toolchain/external-toolchain/ext-tool.mk @@ -5,43 +5,43 @@ # $2: destination # $2: strip (y|n) default is to strip # -copy_toolchain_lib_root = \ - LIB="$(strip $1)"; \ - DST="$(strip $2)"; \ - STRIP="$(strip $3)"; \ - \ - LIB_DIR=`$(TARGET_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ - \ - if test -z "$${LIB_DIR}"; then \ - echo "copy_toolchain_lib_root: lib=$${LIB} not found"; \ - exit -1; \ - fi; \ - \ - LIB="$(strip $1)"; \ - for FILE in `find $${LIB_DIR} -maxdepth 1 -type l -name "$${LIB}*"`; do \ - LIB=`basename $${FILE}`; \ - while test \! -z "$${LIB}"; do \ - echo "copy_toolchain_lib_root lib=$${LIB} dst=$${DST}"; \ - rm -fr $(TARGET_DIR)$${DST}/$${LIB}; \ - mkdir -p $(TARGET_DIR)$${DST}; \ - if test -h $${LIB_DIR}/$${LIB}; then \ - cp -d $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/; \ - elif test -f $${LIB_DIR}/$${LIB}; then \ - cp $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/$${LIB}; \ - case "$${STRIP}" in \ - (0 | n | no) \ -;; \ - (*) \ - $(TARGET_CROSS)strip "$(TARGET_DIR)$${DST}/$${LIB}"; \ -;; \ - esac; \ - else \ - exit -1; \ - fi; \ - LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ - done; \ - done; \ - \ +copy_toolchain_lib_root = \ + LIB="$(strip $1)"; \ + DST="$(strip $2)"; \ + STRIP="$(strip $3)"; \ + \ + LIB_DIR=`$(TARGET_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ + \ + if test -z "$${LIB_DIR}"; then \ + echo "copy_toolchain_lib_root: lib=$${LIB} not found"; \ + exit -1; \ + fi; \ + \ + LIB="$(strip $1)"; \ + for FILE in `find $${LIB_DIR} -maxdepth 1 -type l -name "$${LIB}*"`; do \ + LIB=`basename $${FILE}`; \ + while test \! -z "$${LIB}"; do \ + echo "copy_toolchain_lib_root lib=$${LIB} dst=$${DST}"; \ + rm -fr $(TARGET_DIR)$${DST}/$${LIB}; \ + mkdir -p $(TARGET_DIR)$${DST}; \ + if test -h $${LIB_DIR}/$${LIB}; then \ + cp -d $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/; \ + elif test -f $${LIB_DIR}/$${LIB}; then \ + cp $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/$${LIB}; \ + case "$${STRIP}" in \ + (0 | n | no) \ +;; \ + (*) \ + $(TARGET_CROSS)strip "$(TARGET_DIR)$${DST}/$${LIB}"; \ +;; \ + esac; \ + else \ + exit -1; \ + fi; \ + LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ + done; \ + done; \ + \ echo -n uclibc: dependencies $(TARGET_DIR)/lib/$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C))) diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in index b087eb22c..2ff11624e 100644 --- a/toolchain/gcc/Makefile.in +++ b/toolchain/gcc/Makefile.in @@ -1,6 +1,6 @@ # gcc has a bunch of options that need to be shared with # both gcc-uclibc-2.95.mk and gcc-uclibc-3.x.mk, and are -# use by other packages... So include them in this file +# use by other packages... So include them in this file # and arrange to include it soon after invoking make from # the top level. diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index b365dbc60..92995f845 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -145,9 +145,9 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch # Note: The soft float situation has improved considerably with gcc 3.4.x. # We can dispense with the custom spec files, as well as libfloat for the arm case. - # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x + # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x # which needs to be integrated so we can kill of libfloat for good, except for - # anyone (?) who might still be using gcc 2.95. mjn3 + # anyone (?) who might still be using gcc 2.95. mjn3 ifeq ($(BR2_SOFT_FLOAT),y) ifeq ("$(strip $(ARCH))","arm") toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional @@ -210,21 +210,21 @@ gcc_initial-dirclean: ############################################################# # -# second pass compiler build. Build the compiler targeting +# second pass compiler build. Build the compiler targeting # the newly built shared uClibc library. # ############################################################# # # Sigh... I had to rework things because using --with-gxx-include-dir -# causes issues with include dir search order for g++. This seems to +# causes issues with include dir search order for g++. This seems to # have something to do with "path translations" and possibly doesn't -# affect gcc-target. However, I haven't tested gcc-target yet so no -# guarantees. mjn3 +# affect gcc-target. However, I haven't tested gcc-target yet so no +# guarantees. mjn3 comma:=, GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) mkdir -p $(GCC_BUILD_DIR2) - # Important! Required for limits.h to be fixed. + # Important! Required for limits.h to be fixed. ln -snf ../include $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include #-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib #ln -snf ../lib/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib @@ -444,7 +444,7 @@ endif # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # Work around problem of missing syslimits.h if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index eea12895e..07c42b1ae 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -155,9 +155,9 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked # Note: The soft float situation has improved considerably with gcc 3.4.x. # We can dispense with the custom spec files, as well as libfloat for the arm case. - # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x + # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x # which needs to be integrated so we can kill of libfloat for good, except for - # anyone (?) who might still be using gcc 2.95. mjn3 + # anyone (?) who might still be using gcc 2.95. mjn3 ifeq ($(BR2_SOFT_FLOAT),y) ifeq ("$(strip $(ARCH))","arm") toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional @@ -228,21 +228,21 @@ gcc_initial-dirclean: ############################################################# # -# second pass compiler build. Build the compiler targeting +# second pass compiler build. Build the compiler targeting # the newly built shared uClibc library. # ############################################################# # # Sigh... I had to rework things because using --with-gxx-include-dir -# causes issues with include dir search order for g++. This seems to +# causes issues with include dir search order for g++. This seems to # have something to do with "path translations" and possibly doesn't -# affect gcc-target. However, I haven't tested gcc-target yet so no -# guarantees. mjn3 +# affect gcc-target. However, I haven't tested gcc-target yet so no +# guarantees. mjn3 GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) mkdir -p $(GCC_BUILD_DIR2) - # Important! Required for limits.h to be fixed. + # Important! Required for limits.h to be fixed. ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include #-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib #ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib @@ -465,7 +465,7 @@ endif # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # Work around problem of missing syslimits.h if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile index e1cc429bd..6d3bb7573 100644 --- a/toolchain/kernel-headers/kernel-headers-new.makefile +++ b/toolchain/kernel-headers/kernel-headers-new.makefile @@ -50,7 +50,7 @@ endif ifeq ($(LINUX_HEADERS_IS_KERNEL),y) # Need to redefine KERNEL_HEADERS_PATCH_DIR if you want -# board specific kernel headers +# board specific kernel headers KERNEL_HEADERS_PATCH_DIR:=toolchain/kernel-headers/empty $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) diff --git a/toolchain/kernel-headers/kernel-headers-old.makefile b/toolchain/kernel-headers/kernel-headers-old.makefile index b510ac793..f9db79070 100644 --- a/toolchain/kernel-headers/kernel-headers-old.makefile +++ b/toolchain/kernel-headers/kernel-headers-old.makefile @@ -1,8 +1,8 @@ ############################################################# # -# Setup the kernel headers. I include a generic package of +# Setup the kernel headers. I include a generic package of # kernel headers here, so you shouldn't need to include your -# own. Be aware these kernel headers _will_ get blown away +# own. Be aware these kernel headers _will_ get blown away # by a 'make clean' so don't put anything sacred in here... # ############################################################# @@ -133,7 +133,7 @@ $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched $(LINUX_HEADERS_DIR)/Makefile; \ /bin/echo -e "KERNELRELEASE=\$$(VERSION).\$$(PATCHLEVEL).\$$(SUBLEVEL)\$$(EXTRAVERSION)" >> \ $(LINUX_HEADERS_DIR)/Makefile; \ - fi; + fi @if [ "$(ARCH)" = "powerpc" ];then \ (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-ppc$(NOMMU) asm;) \ elif [ "$(ARCH)" = "mips" ];then \ @@ -177,7 +177,7 @@ $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched else \ (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-$(ARCH)$(NOMMU) asm;) \ fi - touch $(LINUX_HEADERS_DIR)/include/linux/autoconf.h; + touch $(LINUX_HEADERS_DIR)/include/linux/autoconf.h touch $(LINUX_HEADERS_DIR)/.configured endif diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 6dc024a1a..92eaf1558 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -1,8 +1,8 @@ ############################################################# # -# Setup the kernel headers. I include a generic package of +# Setup the kernel headers. I include a generic package of # kernel headers here, so you shouldn't need to include your -# own. Be aware these kernel headers _will_ get blown away +# own. Be aware these kernel headers _will_ get blown away # by a 'make clean' so don't put anything sacred in here... # ############################################################# diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 83577d33d..aa267016e 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -268,7 +268,7 @@ ifeq ($(BR2_x86_i686),y) endif endif -$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig +$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig cp -f $(UCLIBC_DIR)/.oldconfig $(UCLIBC_DIR)/.config mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib @@ -356,7 +356,7 @@ else fi; \ fi endif - # Build the host utils. Need to add an install target... + # Build the host utils. Need to add an install target... $(MAKE1) -C $(UCLIBC_DIR)/utils \ PREFIX=$(STAGING_DIR) \ HOSTCC="$(HOSTCC)" \ -- cgit v1.2.3