diff options
| author |   Mohammed Hawari <mohammed@hawari.fr> | 2021-01-22 14:30:56 +0100 |
|---|---|---|
| committer |   Neale Ranns <neale@graphiant.com> | 2021-01-28 08:38:21 +0000 |
| commit | b78607b1db72173bffabc950253a3894c032cb5c (patch) | |
| tree | 39458f32b0fa2fceeb75fc7053733b4daf067503 | |
| parent | 27df7979782aafca80ea4c7309284bd48fe021c0 (diff) | |
build: do not _FORTIFY_SOURCE in debug mode
When compiling in -O0, the glibc feature.h ignores _FORTIFY_SOURCE and,
in some distributions, throws a #warning, which fails the build. This
patch removes -D_FORTIFY_SOURCE in all debug configurations.
Change-Id: Ic30229c038353e49ff9419779e082a7083c1ea5f
Type: fix
Signed-off-by: Mohammed Hawari <mohammed@hawari.fr>
| -rw-r--r-- | build-data/platforms/arm32.mk | 4 | ||||
| -rw-r--r-- | build-data/platforms/dpaa.mk | 4 | ||||
| -rw-r--r-- | build-root/Makefile | 6 | ||||
| -rw-r--r-- | docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 |
5 files changed, 10 insertions, 11 deletions
diff --git a/build-data/platforms/arm32.mk b/build-data/platforms/arm32.mk index 815cf9de71f..5d8749e2ff6 100644 --- a/build-data/platforms/arm32.mk +++ b/build-data/platforms/arm32.mk @@ -34,9 +34,9 @@ arm32_dpdk_make_extra_args = "CPU_CFLAGS='-mfloat-abi=hard' \ CONFIG_RTE_MAX_NUMA_NODES=1" -arm32_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -D_FORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ +arm32_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DVLIB_MAX_CPUS=4 -march=armv7-a \ -fstack-protector-all -fPIC -Werror -arm32_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -D_FORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ +arm32_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DVLIB_MAX_CPUS=4 -march=armv7-a \ -fstack-protector-all -fPIC -Werror arm32_TAG_CFLAGS = -g -O2 -D_FORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ diff --git a/build-data/platforms/dpaa.mk b/build-data/platforms/dpaa.mk index dec17472c94..e6f0b232849 100644 --- a/build-data/platforms/dpaa.mk +++ b/build-data/platforms/dpaa.mk @@ -72,9 +72,9 @@ vpp_configure_args_dpaa += $(VPP_CFG_ARGS) endif -dpaa_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -mtls-dialect=trad \ +dpaa_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -fPIC -fstack-protector-all -mtls-dialect=trad \ -march=$(MARCH) -Werror -DCLIB_LOG2_CACHE_LINE_BYTES=6 -I$(OPENSSL_PATH)/include -dpaa_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -fstack-protector-all -D_FORTIFY_SOURCE=2 \ +dpaa_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -fstack-protector-all \ -march=$(MARCH) -Werror -DCLIB_LOG2_CACHE_LINE_BYTES=6 -L$(OPENSSL_PATH)/lib diff --git a/build-root/Makefile b/build-root/Makefile index 6d1fb327dac..d35b7a10aeb 100644 --- a/build-root/Makefile +++ b/build-root/Makefile @@ -243,11 +243,11 @@ TAG_PREFIX = $(if $(TAG),$(TAG)-) tag_var_with_added_space_fn = $(if $($(TAG)_TAG_$(1)),$($(TAG)_TAG_$(1)) ) # TAG=debug for debugging -debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -D_FORTIFY_SOURCE=2 -march=$(MARCH) \ +debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ -fstack-protector-all -fPIC -debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -D_FORTIFY_SOURCE=2 -march=$(MARCH) \ +debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ -fstack-protector-all -fPIC -debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -D_FORTIFY_SOURCE=2 -march=$(MARCH) \ +debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ -fstack-protector-all -fPIC BUILD_PREFIX_package = build-$(TAG_PREFIX) diff --git a/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst b/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst index 034339f405d..84647d04b5a 100644 --- a/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst +++ b/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst @@ -179,11 +179,11 @@ Here are the contents of .../build-data/platforms/vpp.mk: vpp_configure_args_vpp += --disable-lb-plugin endif - vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -D_FORTIFY_SOURCE=2 \ + vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG \ -fstack-protector-all -fPIC -Werror - vpp_debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -D_FORTIFY_SOURCE=2 \ + vpp_debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG \ -fstack-protector-all -fPIC -Werror - vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -D_FORTIFY_SOURCE=2 \ + vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG \ -fstack-protector-all -fPIC -Werror vpp_TAG_CFLAGS = -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b06a4cf871..4d66671edc5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -82,7 +82,6 @@ string(CONCAT CMAKE_C_FLAGS_DEBUG "-O0 " "-DCLIB_DEBUG " "-fstack-protector " - "-D_FORTIFY_SOURCE=2 " "-fno-common " ) |