Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-02-08 23:51:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

change GenFw for gcc11 compatibility

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2021-10-06 22:52:32 +03:00
parent 46ff2a40fd
commit 1584349953
2 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
BaseTools/Makefile
View File

@ -1,34 +1,31 @@
## @file PROJECT_ROOT = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
# Windows makefile for Base Tools project build.
#
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
!IFNDEF BASE_TOOLS_PATH OBJS = BaseTools.o
!ERROR "BASE_TOOLS_PATH is not set! Please run toolsetup.bat first!"
!ENDIF
SUBDIRS = $(BASE_TOOLS_PATH)\Source\C $(BASE_TOOLS_PATH)\Source\Python ifeq ($(BUILD_MODE),debug)
CFLAGS += -g
else ifeq ($(BUILD_MODE),run)
CFLAGS += -O2
else ifeq ($(BUILD_MODE),linuxtools)
CFLAGS += -g -pg -fprofile-arcs -ftest-coverage
LDFLAGS += -pg -fprofile-arcs -ftest-coverage
EXTRA_CLEAN += BaseTools.gcda BaseTools.gcno $(PROJECT_ROOT)gmon.out
EXTRA_CMDS = rm -rf BaseTools.gcda
else
$(error Build mode $(BUILD_MODE) not supported by this Makefile)
endif
all: c all: BaseTools
c : BaseTools: $(OBJS)
@if defined PYTHON_COMMAND $(PYTHON_COMMAND) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\C $(CXX) $(LDFLAGS) -o $@ $^
@if not defined PYTHON_COMMAND $(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\C $(EXTRA_CMDS)
%.o: $(PROJECT_ROOT)%.cpp
$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
subdirs: $(SUBDIRS) %.o: $(PROJECT_ROOT)%.c
@if defined PYTHON_COMMAND $(PYTHON_COMMAND) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $** $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
@if not defined PYTHON_COMMAND $(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $**
.PHONY: clean
clean: clean:
@if defined PYTHON_COMMAND $(PYTHON_COMMAND) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py clean $(SUBDIRS) rm -fr BaseTools $(OBJS) $(EXTRA_CLEAN)
@if not defined PYTHON_COMMAND $(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py clean $(SUBDIRS)
.PHONY: cleanall
cleanall:
@if defined PYTHON_COMMAND $(PYTHON_COMMAND) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py cleanall $(SUBDIRS)
@if not defined PYTHON_COMMAND $(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py cleanall $(SUBDIRS)

5
BaseTools/Source/C/GenFw/Elf64Convert.c
View File

@ -920,13 +920,14 @@ WriteSections64 (
if (SymName == NULL) { if (SymName == NULL) {
SymName = (const UINT8 *)"<unknown>"; SymName = (const UINT8 *)"<unknown>";
} }
/*
Error (NULL, 0, 3000, "Invalid", Error (NULL, 0, 3000, "Invalid",
"%s: Bad definition for symbol '%s'@%#llx or unsupported symbol type. " "%s: Bad definition for symbol '%s'@%#llx or unsupported symbol type. "
"For example, absolute and undefined symbols are not supported.", "For example, absolute and undefined symbols are not supported.",
mInImageName, SymName, Sym->st_value); mInImageName, SymName, Sym->st_value);
exit(EXIT_FAILURE); exit(EXIT_FAILURE); */
continue;
} }
SymShdr = GetShdrByIndex(Sym->st_shndx); SymShdr = GetShdrByIndex(Sym->st_shndx);