blob: 9441350147e3741bcea31bb64d5d49158af45153 [file] [log] [blame]
Lorenz Brun4b8c7e92024-07-04 13:57:12 +00001From 88112dc534d2179784c26d093f46210320b9d0a1 Mon Sep 17 00:00:00 2001
Lorenz Brun942f5e22022-01-27 15:03:10 +01002From: Lorenz Brun <lorenz@monogon.tech>
Lorenz Brun4b8c7e92024-07-04 13:57:12 +00003Date: Thu, 4 Jul 2024 15:27:25 +0200
Lorenz Brun942f5e22022-01-27 15:03:10 +01004Subject: [PATCH] Disable -Werror as it breaks newer compilers
5
6---
Lorenz Brun4b8c7e92024-07-04 13:57:12 +00007 BaseTools/Conf/tools_def.template | 6 +++---
8 BaseTools/Source/C/Makefiles/header.makefile | 6 +++---
9 2 files changed, 6 insertions(+), 6 deletions(-)
Lorenz Brun942f5e22022-01-27 15:03:10 +010010
11diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000012index c34ecfd557..d18f1afe07 100755
Lorenz Brun942f5e22022-01-27 15:03:10 +010013--- a/BaseTools/Conf/tools_def.template
14+++ b/BaseTools/Conf/tools_def.template
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000015@@ -739,7 +739,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
Lorenz Brun942f5e22022-01-27 15:03:10 +010016 *_*_*_DTCPP_PATH = DEF(DTCPP_BIN)
17 *_*_*_DTC_PATH = DEF(DTC_BIN)
18
19-DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000020+DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common
21 DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie
22 DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -fno-plt -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections
23 DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access
24@@ -848,7 +848,7 @@ DEFINE GCC5_ARM_ASLDLINK_FLAGS = DEF(GCC49_ARM_ASLDLINK_FLAGS)
Lorenz Brun942f5e22022-01-27 15:03:10 +010025 DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
26 DEFINE GCC5_ASLCC_FLAGS = DEF(GCC49_ASLCC_FLAGS) -fno-lto
27
28-DEFINE GCC5_RISCV_ALL_CC_FLAGS = -g -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -msmall-data-limit=0
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000029+DEFINE GCC5_RISCV_ALL_CC_FLAGS = -g -fshort-wchar -fno-strict-aliasing -Wall -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -msmall-data-limit=0
Lorenz Brun942f5e22022-01-27 15:03:10 +010030 DEFINE GCC5_RISCV_ALL_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x40
31 DEFINE GCC5_RISCV_ALL_DLINK_FLAGS = DEF(GCC5_RISCV_ALL_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
32 DEFINE GCC5_RISCV_ALL_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000033@@ -864,7 +864,7 @@ DEFINE GCC5_RISCV64_DLINK_FLAGS = DEF(GCC5_RISCV_ALL_DLINK_FLAGS) -Wl
34 DEFINE GCC5_RISCV64_DLINK2_FLAGS = DEF(GCC5_RISCV_ALL_DLINK2_FLAGS)
35 DEFINE GCC5_RISCV64_ASM_FLAGS = DEF(GCC5_RISCV_ALL_ASM_FLAGS) -march=DEF(GCC5_RISCV64_ARCH) -mcmodel=medany -mabi=lp64
Lorenz Brun942f5e22022-01-27 15:03:10 +010036
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000037-DEFINE GCC5_LOONGARCH64_CC_FLAGS = DEF(GCC_LOONGARCH64_CC_FLAGS) -march=loongarch64 -mno-memcpy -Werror -Wno-maybe-uninitialized -Wno-stringop-overflow -Wno-pointer-to-int-cast -no-pie -fno-stack-protector -mno-explicit-relocs
38+DEFINE GCC5_LOONGARCH64_CC_FLAGS = DEF(GCC_LOONGARCH64_CC_FLAGS) -march=loongarch64 -mno-memcpy -Wno-maybe-uninitialized -Wno-stringop-overflow -Wno-pointer-to-int-cast -no-pie -fno-stack-protector -mno-explicit-relocs
39 DEFINE GCC5_LOONGARCH64_DLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS)
40 DEFINE GCC5_LOONGARCH64_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) -Wl,--defsym=PECOFF_HEADER_SIZE=0x228
41 DEFINE GCC5_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_ASLDLINK_FLAGS) DEF(GCC5_LOONGARCH64_DLINK2_FLAGS)
Lorenz Brun942f5e22022-01-27 15:03:10 +010042diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000043index d369908a09..1bf4caaa53 100644
Lorenz Brun942f5e22022-01-27 15:03:10 +010044--- a/BaseTools/Source/C/Makefiles/header.makefile
45+++ b/BaseTools/Source/C/Makefiles/header.makefile
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000046@@ -92,17 +92,17 @@ BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)
Lorenz Brun942f5e22022-01-27 15:03:10 +010047
48 ifeq ($(DARWIN),Darwin)
49 # assume clang or clang compatible flags on OS X
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000050-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
51+CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall \
Lorenz Brun942f5e22022-01-27 15:03:10 +010052 -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
53 else
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000054 ifneq ($(CLANG),)
55 CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
Lorenz Brun942f5e22022-01-27 15:03:10 +010056--fno-delete-null-pointer-checks -Wall -Werror \
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000057+-fno-delete-null-pointer-checks -Wall \
Lorenz Brun942f5e22022-01-27 15:03:10 +010058 -Wno-deprecated-declarations -Wno-self-assign \
59 -Wno-unused-result -nostdlib -g
60 else
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000061 CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
Lorenz Brun942f5e22022-01-27 15:03:10 +010062--fno-delete-null-pointer-checks -Wall -Werror \
Lorenz Brun4b8c7e92024-07-04 13:57:12 +000063+-fno-delete-null-pointer-checks -Wall \
Lorenz Brun942f5e22022-01-27 15:03:10 +010064 -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \
65 -Wno-unused-result -nostdlib -g
66 endif
Lorenz Brun942f5e22022-01-27 15:03:10 +010067--
Lorenz Brun4b8c7e92024-07-04 13:57:12 +0000682.44.1
Lorenz Brun942f5e22022-01-27 15:03:10 +010069