diff options
author | Leif Lindholm <leif.lindholm@linaro.org> | 2019-10-01 13:42:32 +0100 |
---|---|---|
committer | Leif Lindholm <leif.lindholm@linaro.org> | 2019-10-04 11:18:22 +0100 |
commit | 0deca401f018f99e4a948334b098259d156600a7 (patch) | |
tree | d16ba2d24f74f8efa467bd4c71c1c0f9d61c8966 /BaseTools | |
parent | df8f8688b87334a0577ecb2277f3d9488e0de93b (diff) | |
download | edk2-0deca401f018f99e4a948334b098259d156600a7.tar.gz |
BaseTools: strip trailing whitespace
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Diffstat (limited to 'BaseTools')
-rw-r--r-- | BaseTools/Source/C/GNUmakefile | 2 | ||||
-rw-r--r-- | BaseTools/Source/C/Makefiles/app.makefile | 4 | ||||
-rw-r--r-- | BaseTools/Source/C/Makefiles/footer.makefile | 4 | ||||
-rw-r--r-- | BaseTools/Source/C/Makefiles/header.makefile | 8 | ||||
-rw-r--r-- | BaseTools/Source/C/Makefiles/lib.makefile | 2 | ||||
-rw-r--r-- | BaseTools/Source/C/Makefiles/ms.common | 4 | ||||
-rw-r--r-- | BaseTools/Source/C/VfrCompile/GNUmakefile | 6 | ||||
-rw-r--r-- | BaseTools/Source/Python/Ecc/Check.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 2 | ||||
-rw-r--r-- | BaseTools/Source/Python/Makefile | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile index 37bcce519c..df4eb64ea9 100644 --- a/BaseTools/Source/C/GNUmakefile +++ b/BaseTools/Source/C/GNUmakefile @@ -77,7 +77,7 @@ $(SUBDIRS): $(patsubst %,%-clean,$(sort $(SUBDIRS))):
-$(MAKE) -C $(@:-clean=) clean
-$(VFRAUTOGEN): VfrCompile/VfrSyntax.g
+$(VFRAUTOGEN): VfrCompile/VfrSyntax.g
$(MAKE) -C VfrCompile VfrLexer.h
clean: $(patsubst %,%-clean,$(sort $(SUBDIRS)))
diff --git a/BaseTools/Source/C/Makefiles/app.makefile b/BaseTools/Source/C/Makefiles/app.makefile index fcadb4ed21..6a2a8f5e8a 100644 --- a/BaseTools/Source/C/Makefiles/app.makefile +++ b/BaseTools/Source/C/Makefiles/app.makefile @@ -12,9 +12,9 @@ include $(MAKEROOT)/Makefiles/header.makefile APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
.PHONY:all
-all: $(MAKEROOT)/bin $(APPLICATION)
+all: $(MAKEROOT)/bin $(APPLICATION)
-$(APPLICATION): $(OBJECTS)
+$(APPLICATION): $(OBJECTS)
$(LINKER) -o $(APPLICATION) $(BUILD_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
$(OBJECTS): $(MAKEROOT)/Include/Common/BuildVersion.h
diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile index e823246cfb..85c3374224 100644 --- a/BaseTools/Source/C/Makefiles/footer.makefile +++ b/BaseTools/Source/C/Makefiles/footer.makefile @@ -14,10 +14,10 @@ $(MAKEROOT)/libs-$(HOST_ARCH): install: $(MAKEROOT)/libs-$(HOST_ARCH) $(LIBRARY)
cp $(LIBRARY) $(MAKEROOT)/libs-$(HOST_ARCH)
-$(LIBRARY): $(OBJECTS)
+$(LIBRARY): $(OBJECTS)
$(BUILD_AR) crs $@ $^
-%.o : %.c
+%.o : %.c
$(BUILD_CC) -c $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) $< -o $@
%.o : %.cpp
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile index 52cbffcb44..4e9b36d98b 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -61,7 +61,7 @@ else $(error Bad HOST_ARCH)
endif
-INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
+INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
BUILD_CPPFLAGS = $(INCLUDE)
# keep EXTRA_OPTFLAGS last
@@ -82,7 +82,7 @@ BUILD_CXXFLAGS = -Wno-unused-result ifeq ($(HOST_ARCH), IA32)
#
-# Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults
+# Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults
# to x86_64. So make sure tools match uname -m. You can manual have a 64-bit kernal on Snow Leopard
# so only do this is uname -m returns i386.
#
@@ -96,7 +96,7 @@ endif # keep BUILD_OPTFLAGS last
BUILD_CFLAGS += $(BUILD_OPTFLAGS)
BUILD_CXXFLAGS += $(BUILD_OPTFLAGS)
-
+
# keep EXTRA_LDFLAGS last
BUILD_LFLAGS += $(EXTRA_LDFLAGS)
@@ -107,7 +107,7 @@ BUILD_LFLAGS += $(EXTRA_LDFLAGS) all:
$(MAKEROOT)/libs:
- mkdir $(MAKEROOT)/libs
+ mkdir $(MAKEROOT)/libs
$(MAKEROOT)/bin:
mkdir $(MAKEROOT)/bin
diff --git a/BaseTools/Source/C/Makefiles/lib.makefile b/BaseTools/Source/C/Makefiles/lib.makefile index a9965fc628..2577c15380 100644 --- a/BaseTools/Source/C/Makefiles/lib.makefile +++ b/BaseTools/Source/C/Makefiles/lib.makefile @@ -9,6 +9,6 @@ include $(MAKEROOT)/Makefiles/header.makefile LIBRARY = $(MAKEROOT)/libs/lib$(LIBNAME).a
-all: $(MAKEROOT)/libs $(LIBRARY)
+all: $(MAKEROOT)/libs $(LIBRARY)
include $(MAKEROOT)/Makefiles/footer.makefile
diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common index 75c9bb43a3..f5f77fdc0b 100644 --- a/BaseTools/Source/C/Makefiles/ms.common +++ b/BaseTools/Source/C/Makefiles/ms.common @@ -57,6 +57,6 @@ LINKER = $(LD) INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC)
-CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
+CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
+CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile index 8b94c73bbe..42e3d7da02 100644 --- a/BaseTools/Source/C/VfrCompile/GNUmakefile +++ b/BaseTools/Source/C/VfrCompile/GNUmakefile @@ -36,9 +36,9 @@ include $(MAKEROOT)/Makefiles/header.makefile APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
.PHONY:all
-all: $(MAKEROOT)/bin $(APPLICATION)
+all: $(MAKEROOT)/bin $(APPLICATION)
-$(APPLICATION): $(OBJECTS)
+$(APPLICATION): $(OBJECTS)
$(LINKER) -o $(APPLICATION) $(VFR_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
VfrCompiler.o: ../Include/Common/BuildVersion.h
@@ -68,7 +68,7 @@ AParser.o: Pccts/h/AParser.cpp VfrSyntax.o: VfrSyntax.cpp
$(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@
-
+
clean: localClean
localClean:
diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py index 2180818609..b68cecddfd 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -265,7 +265,7 @@ class Check(object): self.FunctionLayoutCheckBody()
self.FunctionLayoutCheckLocalVariable()
self.FunctionLayoutCheckDeprecated()
-
+
# To check if the deprecated functions are used
def FunctionLayoutCheckDeprecated(self):
if EccGlobalData.gConfig.CFunctionLayoutCheckNoDeprecated == '1' or EccGlobalData.gConfig.CFunctionLayoutCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':
diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py index 4d8b2bdee2..b2f3f6a112 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -160,7 +160,7 @@ class GenFdsGlobalVariable: "OUTPUT_DIR":os.path.join(BuildDir, "OUTPUT"),
"DEBUG_DIR":os.path.join(BuildDir, "DEBUG")
}
-
+
BuildRules = {}
for Type in BuildRuleDatabase.FileTypeList:
#first try getting build rule by BuildRuleFamily
diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/Makefile index 0361c5330c..6c3bedbadf 100644 --- a/BaseTools/Source/Python/Makefile +++ b/BaseTools/Source/Python/Makefile @@ -8,6 +8,6 @@ all:
clean:
-cleanall:
+cleanall:
@del /f /q $(BASE_TOOLS_PATH)\Source\Python\*.pyc
|