1cf16bd739
Update from releases/gcc-13 branch Resolves: #2188499
63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
2022-01-07 Jakub Jelinek <jakub@redhat.com>
|
|
|
|
* Makefile.tpl (GOCFLAGS, GDCFLAGS): Filter out -Wformat-security.
|
|
* Makefile.in: Regenerated.
|
|
|
|
2017-02-25 Jakub Jelinek <jakub@redhat.com>
|
|
|
|
* configure.ac: When adding -Wno-format, also add -Wno-format-security.
|
|
* configure: Regenerated.
|
|
|
|
--- gcc/configure.ac.jj 2017-02-13 12:20:53.000000000 +0100
|
|
+++ gcc/configure.ac 2017-02-25 12:42:32.859175403 +0100
|
|
@@ -570,7 +570,7 @@ AC_ARG_ENABLE(build-format-warnings,
|
|
AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
|
|
[],[enable_build_format_warnings=yes])
|
|
AS_IF([test $enable_build_format_warnings = no],
|
|
- [wf_opt=-Wno-format],[wf_opt=])
|
|
+ [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=])
|
|
ACX_PROG_CXX_WARNING_OPTS(
|
|
m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ],
|
|
[-Wcast-qual $wf_opt])),
|
|
--- gcc/configure.jj 2017-02-13 12:20:52.000000000 +0100
|
|
+++ gcc/configure 2017-02-25 12:42:50.041946391 +0100
|
|
@@ -7077,7 +7077,7 @@ else
|
|
fi
|
|
|
|
if test $enable_build_format_warnings = no; then :
|
|
- wf_opt=-Wno-format
|
|
+ wf_opt="-Wno-format -Wno-format-security"
|
|
else
|
|
wf_opt=
|
|
fi
|
|
--- Makefile.tpl.jj 2021-12-30 15:12:42.188164847 +0100
|
|
+++ Makefile.tpl 2022-01-07 12:06:12.115550714 +0100
|
|
@@ -446,9 +446,9 @@ LDFLAGS = @LDFLAGS@
|
|
LIBCFLAGS = $(CFLAGS)
|
|
CXXFLAGS = @CXXFLAGS@
|
|
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
|
|
-GOCFLAGS = $(CFLAGS)
|
|
-GDCFLAGS = $(CFLAGS)
|
|
-GM2FLAGS = $(CFLAGS)
|
|
+GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
|
|
+GDCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
|
|
+GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS))
|
|
|
|
# Pass additional PGO and LTO compiler options to the PGO build.
|
|
BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
|
|
--- Makefile.in.jj 2021-12-30 15:12:42.188164847 +0100
|
|
+++ Makefile.in 2022-01-07 12:06:27.335334561 +0100
|
|
@@ -443,9 +443,9 @@ LDFLAGS = @LDFLAGS@
|
|
LIBCFLAGS = $(CFLAGS)
|
|
CXXFLAGS = @CXXFLAGS@
|
|
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
|
|
-GOCFLAGS = $(CFLAGS)
|
|
-GDCFLAGS = $(CFLAGS)
|
|
-GM2FLAGS = $(CFLAGS)
|
|
+GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
|
|
+GDCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
|
|
+GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS))
|
|
|
|
# Pass additional PGO and LTO compiler options to the PGO build.
|
|
BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
|