From 4cfb7b21a88f0ae32d97ea4cbb0c7419b88f397d Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Wed, 12 Oct 2022 12:44:03 -0400 Subject: [PATCH] Revert "treewide: add -fcf-protection=full to CFLAGS" This reverts commit 215aedf1fdff58c62fe596284948590965acc85c. --- dlm_controld/Makefile | 2 +- dlm_tool/Makefile | 2 +- fence/Makefile | 2 +- libdlm/Makefile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index ec8c360cc853..9cf7152f60ab 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -43,7 +43,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ - -fstack-clash-protection -fcf-protection=full + -fstack-clash-protection BIN_CFLAGS += $(CFLAGS) -fPIE -DPIE BIN_CFLAGS += -I../include -I../libdlm diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile index 57629c731771..1c3d61d5c860 100644 --- a/dlm_tool/Makefile +++ b/dlm_tool/Makefile @@ -15,7 +15,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ - -fstack-clash-protection -fcf-protection=full + -fstack-clash-protection CFLAGS += -fPIE -DPIE CFLAGS += -I../include -I../libdlm -I../dlm_controld diff --git a/fence/Makefile b/fence/Makefile index 446f4eaac9f9..ee4dfb886d4c 100644 --- a/fence/Makefile +++ b/fence/Makefile @@ -15,7 +15,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ - -fstack-clash-protection -fcf-protection=full + -fstack-clash-protection CFLAGS += -fPIE -DPIE CFLAGS += -I../include diff --git a/libdlm/Makefile b/libdlm/Makefile index 823fdaa94073..5069ccf1f7f9 100644 --- a/libdlm/Makefile +++ b/libdlm/Makefile @@ -80,8 +80,8 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ -fdiagnostics-show-option \ -fPIC -LIB_CFLAGS += $(CFLAGS) -D_REENTRANT -fcf-protection=full -LLT_CFLAGS += $(CFLAGS) -fcf-protection=full +LIB_CFLAGS += $(CFLAGS) -D_REENTRANT +LLT_CFLAGS += $(CFLAGS) LIB_LDFLAGS += $(LDFLAGS) -lpthread -Wl,-z,now LLT_LDFLAGS += $(LDFLAGS) -Wl,-z,now -- 2.7.5