diff options
| author | Kir Kolyshkin <kir@openvz.org> | 2017-02-17 04:47:28 +0300 |
|---|---|---|
| committer | Pavel Emelyanov <xemul@virtuozzo.com> | 2017-02-17 13:33:49 +0300 |
| commit | 01e475a6a02d96cf379873e4b8cd619a1f0801c7 (patch) | |
| tree | 51e66c3c0170a88b3278d791c4125e28358553f9 | |
| parent | 17366e2ec1f635a9e29a5681bc206eafaa81d2d7 (diff) | |
Fix Fedora build (undo _FORTIFY_SOURCE for pie)
Recent Fedora releases add -Wp,-D_FORTIFY_SOURCE=2 to rpm builds,
which breaks compiling pie code on some architectures due to its
trying to use (absent) memcpy_chk() instead of usual memcpy().
We must stand strong against FORTIFY_SOURCE in pie code.
No pasaran! Viva la resistance!
NOTE: in tests, FORTIFY_SOURCE is disabled for completely different
reasons (see commit d1a36cc9 for details), so we're not touching it.
[v2: resend the correct (latest) version]
Reported-by: Reported-by: Adrian Reber <adrian@lisas.de>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
| -rw-r--r-- | criu/pie/Makefile | 1 | ||||
| -rw-r--r-- | criu/pie/Makefile.library | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/criu/pie/Makefile b/criu/pie/Makefile index 8d593e226..141c0182b 100644 --- a/criu/pie/Makefile +++ b/criu/pie/Makefile @@ -22,6 +22,7 @@ CFLAGS += -iquote $(SRC_DIR)/criu/include CFLAGS += -iquote $(SRC_DIR)/include CFLAGS += -iquote $(SRC_DIR) CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 +CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0 ifneq ($(filter-out ia32,$(ARCH)),) diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library index 7d6d85992..dce650a51 100644 --- a/criu/pie/Makefile.library +++ b/criu/pie/Makefile.library @@ -50,3 +50,4 @@ else endif ccflags-y += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 +ccflags-y += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0 |