[Patch 0/4] BaseTools GNU makefile: Update GCC Flags to the specific one with BUILD_ prefix

[Patch 0/4] BaseTools GNU makefile: Update GCC Flags to the specific one with BUILD_ prefix

[Liming Gao]

The following 4 patches clean up the remaining issues in GNU makefile. 
With those changes, all GNU makefiles have been updated. 

Liming Gao (4):
  BaseTools GNU makefile: Add BUILD_CXXFLAGS to align make built-in rule
  BaseTools GNU makefile: remove unused .S rule
  BaseTools VfrCompile GNU makefile: Replace CXX with BUILD_CXX
  BaseTools VfrCompile Pccts: Update GCC Flags to the specific one with
    BUILD_ prefix

 BaseTools/Source/C/Makefiles/footer.makefile       |  5 +----
 BaseTools/Source/C/Makefiles/header.makefile       |  1 +
 BaseTools/Source/C/VfrCompile/GNUmakefile          | 10 +++++-----
 BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile | 13 ++++++++-----
 BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile   | 18 +++++++++++-------
 5 files changed, 26 insertions(+), 21 deletions(-)

-- 
2.8.0.windows.1

[Patch 1/4] BaseTools GNU makefile: Add BUILD_CXXFLAGS to align make built-in rule

[Liming Gao]

GNU make built-in rule to Compiling C++ programs with
‘$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c’.
To align to it, add empty BUILD_CXXFLAGS in cpp rule.

Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/C/Makefiles/footer.makefile | 2 +-
 BaseTools/Source/C/Makefiles/header.makefile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile
index 216ae41..a58bff6 100644
--- a/BaseTools/Source/C/Makefiles/footer.makefile
+++ b/BaseTools/Source/C/Makefiles/footer.makefile
@@ -30,7 +30,7 @@ $(LIBRARY): $(OBJECTS)
 	$(BUILD_AS) -c $(BUILD_ASFLAGS) $< -o $@
 
 %.o : %.cpp
-	$(BUILD_CXX) -c $(BUILD_CPPFLAGS) $< -o $@
+	$(BUILD_CXX) -c $(BUILD_CPPFLAGS) $(BUILD_CXXFLAGS) $< -o $@
 
 .PHONY: clean
 clean:
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 5e79f31..f2041f8 100644
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -52,6 +52,7 @@ else
 BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -nostdlib -c -g
 endif
 BUILD_LFLAGS =
+BUILD_CXXFLAGS =
 
 ifeq ($(ARCH), IA32)
 #
-- 
2.8.0.windows.1

[Patch 2/4] BaseTools GNU makefile: remove unused .S rule

[Liming Gao]

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/C/Makefiles/footer.makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile
index a58bff6..390873b 100644
--- a/BaseTools/Source/C/Makefiles/footer.makefile
+++ b/BaseTools/Source/C/Makefiles/footer.makefile
@@ -26,9 +26,6 @@ $(LIBRARY): $(OBJECTS)
 %.o : %.c 
 	$(BUILD_CC)  -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
 
-%.o : %.S
-	$(BUILD_AS) -c $(BUILD_ASFLAGS) $< -o $@
-
 %.o : %.cpp
 	$(BUILD_CXX) -c $(BUILD_CPPFLAGS) $(BUILD_CXXFLAGS) $< -o $@
 
-- 
2.8.0.windows.1

[Patch 3/4] BaseTools VfrCompile GNU makefile: Replace CXX with BUILD_CXX

[Liming Gao]

The change is missing in VfrComile GNUmakefile.

Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/C/VfrCompile/GNUmakefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
index e2d4321..2ebf3e0 100644
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
@@ -26,7 +26,7 @@ OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexer.o VfrSyn
 
 VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS)
 
-LINKER = $(CXX)
+LINKER = $(BUILD_CXX)
 
 EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h
 
@@ -59,16 +59,16 @@ Pccts/dlg/dlg:
 	BIN_DIR='.' $(MAKE) -C Pccts/dlg
 
 ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp
-	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
+	$(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
 
 DLexerBase.o: Pccts/h/DLexerBase.cpp
-	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
+	$(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
 
 AParser.o: Pccts/h/AParser.cpp
-	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
+	$(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
 
 VfrSyntax.o: VfrSyntax.cpp
-	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
+	$(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
 	
 clean: localClean
 
-- 
2.8.0.windows.1

[Patch 4/4] BaseTools VfrCompile Pccts: Update GCC Flags to the specific one with BUILD_ prefix

[Liming Gao]

This change is also applied to VfrCompile Pccts antlr and dlg tool.

In V2, add the missing C rules.

Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile | 13 ++++++++-----
 BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile   | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
index c49cfd8..8f2cc78 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
@@ -157,20 +157,21 @@ PCCTS_H=../h
 #	$(DLG) -C2 parser.dlg scan.c
 #
 #set.$(OBJ_EXT): $(SET)/set.c
-#	$(CC) $(CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c
+#	$(BUILD_CC) $(BUILD_CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c
 
 
 
 #
 #   UNIX  (default)
 #
-CC?=gcc
+BUILD_CC?=gcc
 COPT=-O
 ANTLR=${BIN_DIR}/antlr
 DLG=${BIN_DIR}/dlg
 OBJ_EXT=o
 OUT_OBJ = -o
-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
+BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
+BUILD_CPPFLAGS=
 #
 # SGI Users, use this CFLAGS
 #
@@ -179,7 +180,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o  \
         globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o
 
 $(BIN_DIR)/antlr : $(OBJ) $(SRC)
-		$(CC) $(CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)
+		$(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)
 
 # what files does PCCTS generate (both ANTLR and DLG)
 PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h
@@ -202,8 +203,10 @@ scan.o : scan.c mode.h tokens.h
 #	$(DLG) -C2 parser.dlg scan.c
 
 set.o : $(SET)/set.c
-	$(CC) $(CFLAGS) -c -o set.o $(SET)/set.c
+	$(BUILD_CC) $(BUILD_CFLAGS) -c -o set.o $(SET)/set.c
 
+%.o : %.c 
+	$(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
 
 #
 # ****** These next targets are common to UNIX and PC world ********
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
index dfcf3ee..b3a34d3 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
@@ -114,18 +114,19 @@ PCCTS_H=../h
 #
 #   UNIX
 #
-CC?=cc
+BUILD_CC?=cc
 COPT=-O
 ANTLR=${BIN_DIR}/antlr
 DLG=${BIN_DIR}/dlg
-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
+BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
+BUILD_CPPFLAGS=
 OBJ_EXT=o
 OUT_OBJ = -o
 OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
         relabel.o automata.o
 
 $(BIN_DIR)/dlg : $(OBJ) $(SRC)
-		$(CC) $(CFLAGS) -o $(BIN_DIR)/dlg $(OBJ)
+		$(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/dlg $(OBJ)
 
 SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
         relabel.c automata.c
@@ -137,16 +138,19 @@ SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
 #	$(DLG) -C2 parser.dlg dlg_a.c
 
 dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h
-	$(CC) $(CFLAGS) -c dlg_p.c
+	$(BUILD_CC) $(BUILD_CFLAGS) -c dlg_p.c
 
 dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h
-	$(CC) $(CFLAGS) -c dlg_a.c
+	$(BUILD_CC) $(BUILD_CFLAGS) -c dlg_a.c
 
 main.$(OBJ_EXT) : main.c dlg.h
-	$(CC) $(CFLAGS) -c main.c
+	$(BUILD_CC) $(BUILD_CFLAGS) -c main.c
 
 set.$(OBJ_EXT) : $(SET)/set.c
-	$(CC) -c $(CFLAGS) $(SET)/set.c
+	$(BUILD_CC) -c $(BUILD_CFLAGS) $(SET)/set.c
+
+%.o : %.c 
+	$(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
 
 lint:
 	lint *.c
-- 
2.8.0.windows.1

Re: [Patch 4/4] BaseTools VfrCompile Pccts: Update GCC Flags to the specific one with BUILD_ prefix

[Mudusuru, Giri P]

Reviewed the series of 4 patches
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>


> -----Original Message-----
> From: Gao, Liming
> Sent: Monday, September 5, 2016 9:00 PM
> To: edk2-devel@lists.01.org
> Cc: Mudusuru, Giri P <giri.p.mudusuru@intel.com>; Zhu, Yonghong
> <yonghong.zhu@intel.com>
> Subject: [Patch 4/4] BaseTools VfrCompile Pccts: Update GCC Flags to the
> specific one with BUILD_ prefix
> 
> This change is also applied to VfrCompile Pccts antlr and dlg tool.
> 
> In V2, add the missing C rules.
> 
> Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile | 13 ++++++++-----
>  BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile   | 18 +++++++++++-------
>  2 files changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
> b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
> index c49cfd8..8f2cc78 100644
> --- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
> +++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
> @@ -157,20 +157,21 @@ PCCTS_H=../h
>  #	$(DLG) -C2 parser.dlg scan.c
>  #
>  #set.$(OBJ_EXT): $(SET)/set.c
> -#	$(CC) $(CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c
> +#	$(BUILD_CC) $(BUILD_CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT)
> $(SET)/set.c
> 
> 
> 
>  #
>  #   UNIX  (default)
>  #
> -CC?=gcc
> +BUILD_CC?=gcc
>  COPT=-O
>  ANTLR=${BIN_DIR}/antlr
>  DLG=${BIN_DIR}/dlg
>  OBJ_EXT=o
>  OUT_OBJ = -o
> -CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -
> DZZLEXBUFSIZE=65536
> +BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -
> DZZLEXBUFSIZE=65536
> +BUILD_CPPFLAGS=
>  #
>  # SGI Users, use this CFLAGS
>  #
> @@ -179,7 +180,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o
> gen.o  \
>          globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o
> fcache.o
> 
>  $(BIN_DIR)/antlr : $(OBJ) $(SRC)
> -		$(CC) $(CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)
> +		$(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)
> 
>  # what files does PCCTS generate (both ANTLR and DLG)
>  PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h
> @@ -202,8 +203,10 @@ scan.o : scan.c mode.h tokens.h
>  #	$(DLG) -C2 parser.dlg scan.c
> 
>  set.o : $(SET)/set.c
> -	$(CC) $(CFLAGS) -c -o set.o $(SET)/set.c
> +	$(BUILD_CC) $(BUILD_CFLAGS) -c -o set.o $(SET)/set.c
> 
> +%.o : %.c
> +	$(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
> 
>  #
>  # ****** These next targets are common to UNIX and PC world ********
> diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
> b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
> index dfcf3ee..b3a34d3 100644
> --- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
> +++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
> @@ -114,18 +114,19 @@ PCCTS_H=../h
>  #
>  #   UNIX
>  #
> -CC?=cc
> +BUILD_CC?=cc
>  COPT=-O
>  ANTLR=${BIN_DIR}/antlr
>  DLG=${BIN_DIR}/dlg
> -CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -
> DZZLEXBUFSIZE=65536
> +BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -
> DZZLEXBUFSIZE=65536
> +BUILD_CPPFLAGS=
>  OBJ_EXT=o
>  OUT_OBJ = -o
>  OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
>          relabel.o automata.o
> 
>  $(BIN_DIR)/dlg : $(OBJ) $(SRC)
> -		$(CC) $(CFLAGS) -o $(BIN_DIR)/dlg $(OBJ)
> +		$(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/dlg $(OBJ)
> 
>  SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
>          relabel.c automata.c
> @@ -137,16 +138,19 @@ SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c
> support.c output.c \
>  #	$(DLG) -C2 parser.dlg dlg_a.c
> 
>  dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h
> -	$(CC) $(CFLAGS) -c dlg_p.c
> +	$(BUILD_CC) $(BUILD_CFLAGS) -c dlg_p.c
> 
>  dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h
> -	$(CC) $(CFLAGS) -c dlg_a.c
> +	$(BUILD_CC) $(BUILD_CFLAGS) -c dlg_a.c
> 
>  main.$(OBJ_EXT) : main.c dlg.h
> -	$(CC) $(CFLAGS) -c main.c
> +	$(BUILD_CC) $(BUILD_CFLAGS) -c main.c
> 
>  set.$(OBJ_EXT) : $(SET)/set.c
> -	$(CC) -c $(CFLAGS) $(SET)/set.c
> +	$(BUILD_CC) -c $(BUILD_CFLAGS) $(SET)/set.c
> +
> +%.o : %.c
> +	$(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
> 
>  lint:
>  	lint *.c
> --
> 2.8.0.windows.1

Re: [Patch 0/4] BaseTools GNU makefile: Update GCC Flags to the specific one with BUILD_ prefix

[Zhu, Yonghong]

Reviewed the series of 4 patches.
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

Best Regards,
Zhu Yonghong


-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming Gao
Sent: Tuesday, September 06, 2016 12:00 PM
To: edk2-devel@lists.01.org
Subject: [edk2] [Patch 0/4] BaseTools GNU makefile: Update GCC Flags to the specific one with BUILD_ prefix

The following 4 patches clean up the remaining issues in GNU makefile. 
With those changes, all GNU makefiles have been updated. 

Liming Gao (4):
  BaseTools GNU makefile: Add BUILD_CXXFLAGS to align make built-in rule
  BaseTools GNU makefile: remove unused .S rule
  BaseTools VfrCompile GNU makefile: Replace CXX with BUILD_CXX
  BaseTools VfrCompile Pccts: Update GCC Flags to the specific one with
    BUILD_ prefix

 BaseTools/Source/C/Makefiles/footer.makefile       |  5 +----
 BaseTools/Source/C/Makefiles/header.makefile       |  1 +
 BaseTools/Source/C/VfrCompile/GNUmakefile          | 10 +++++-----
 BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile | 13 ++++++++-----
 BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile   | 18 +++++++++++-------
 5 files changed, 26 insertions(+), 21 deletions(-)

-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel