forked from pool/intel-cmt-cat
- Move to the new tag/version model, by using yy/mm in the version https://github.com/intel/intel-cmt-cat/issues/264 - Update to version 24.05.12.git+c5f4492: * lib: set errno when buf points to NULL in common.c:pqos_read() * lib: fix variable types in common.c:pqos_read() * llc capture time is increased in testcase test_pqos_cmt_llc_occupancy_cores * appqos_client: update 3rd party dependencies * appqos_client: update axios version * lib: Fix MBR value for non-SNC machines * tests: updated schema * tests: test_pqos_cmt_llc_occupancy_cores testcase is updated * After merging AMD SMBA feature, some unit tests are failed. They are fixed. * appqos_client: override dns-packet and socks package versions * appqos_client: update 'ws' and 'braces' depedency versions * appqos: pipenv 2024.0.1 can fetch pwr-v0.2.2. The word astroid is excluded in codespell. * Release 6.0.0 * appqos: spelling correction * dependabot: exclude version updates * appqos_client: update required node and npm versions * dependabot: update config to ignore major version updates * appqos_client: update core-js to v3.23.3 * appqos_client: update dev dependency versions * Add imediate binding flag to SWIG's Makefile * Add a GCC flag protecting againsh stack clash attacks * Enable strong stack protection for all the compilers * Add a stack protection flag to code examples * lib/cpuinfo: Increase the file descriptors limit to handle more CPUs * add dependabot config * Add warning message in case of detection hybrid architecture * lib: Fix parsing SMBA CLOS information OBS-URL: https://build.opensuse.org/request/show/1207932 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/intel-cmt-cat?expand=0&rev=41
217 lines
7.5 KiB
Diff
217 lines
7.5 KiB
Diff
From: Thomas Renninger <trenn@suse.com>
|
||
Subject: Remove fcf-protection=full
|
||
References:
|
||
Patch-Mainline:
|
||
Git-commit: c06b22050797e630f41250ddee7a7f67eb1f3912
|
||
Git-repo: git@github.com:watologo1/intel-cmt-cat.git.git
|
||
|
||
This option causes grief with at least some gcc versions:
|
||
|
||
built failure ->"cc: error: unrecognized command line option '-fcf-
|
||
protection=full'; did you mean '-fstack-protector-all'?"
|
||
|
||
and some archs (i586):
|
||
|
||
cc1: error: ‘-fcf-protection’ is not compatible with this target
|
||
|
||
According to our gcc maintainer (translated):
|
||
Whatever the reason is that they require gcc version 9..., maybe -fcf-protection,
|
||
but simply throw it out...
|
||
|
||
If there is no urgent reason, better get rid of this one.
|
||
|
||
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
||
|
||
|
||
Signed-off-by: <trenn@suse.com>
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CAT_MBA/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/CAT_MBA/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CAT_MBA/Makefile
|
||
@@ -64,8 +64,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
# Build targets and dependencies
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CMT_MBM/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/CMT_MBM/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CMT_MBM/Makefile
|
||
@@ -64,8 +64,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
# Build targets and dependencies
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/PSEUDO_LOCK/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/PSEUDO_LOCK/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/PSEUDO_LOCK/Makefile
|
||
@@ -64,8 +64,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
# Build targets and dependencies
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/lib/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/lib/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/lib/Makefile
|
||
@@ -72,8 +72,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
# so or static build
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/pqos/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/pqos/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/pqos/Makefile
|
||
@@ -45,8 +45,7 @@ CFLAGS = -I$(LIBDIR) \
|
||
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
|
||
-Wcast-qual -Wundef -Wwrite-strings \
|
||
-Wformat -Wformat-security -fstack-protector-strong -fPIE \
|
||
- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
|
||
- -fcf-protection=full
|
||
+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
|
||
ifneq ($(EXTRA_CFLAGS),)
|
||
CFLAGS += $(EXTRA_CFLAGS)
|
||
endif
|
||
@@ -70,8 +69,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
ifeq ($(shell uname), FreeBSD)
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/rdtset/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/rdtset/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/rdtset/Makefile
|
||
@@ -45,8 +45,7 @@ CFLAGS = -I$(LIBDIR) \
|
||
-Wcast-qual -Wundef -Wwrite-strings \
|
||
-Wformat -Wformat-security -fstack-protector-strong -fPIE \
|
||
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
|
||
- -D_GNU_SOURCE \
|
||
- -fcf-protection=full
|
||
+ -D_GNU_SOURCE
|
||
ifneq ($(EXTRA_CFLAGS),)
|
||
CFLAGS += $(EXTRA_CFLAGS)
|
||
endif
|
||
@@ -70,8 +69,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
# DEBUG build
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/tools/membw/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/tools/membw/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/tools/membw/Makefile
|
||
@@ -49,8 +49,7 @@ CFLAGS=-W -Wall -Wextra -Wstrict-prototy
|
||
-Wcast-qual -Wundef -Wwrite-strings \
|
||
-Wformat -Wformat-security -fstack-protector-strong -fPIE \
|
||
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
|
||
- -Winline -msse4.2 \
|
||
- -fcf-protection=full
|
||
+ -Winline -msse4.2
|
||
|
||
ifeq ($(DEBUG),y)
|
||
CFLAGS += -O0 -g -DDEBUG
|
||
@@ -77,8 +76,7 @@ CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
-fno-expensive-optimizations \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
SRCS = $(sort $(wildcard *.c))
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/lib/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/lib/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/lib/Makefile
|
||
@@ -34,8 +34,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
# common function wrap
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/mock/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/mock/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/mock/Makefile
|
||
@@ -69,8 +69,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
# so or static build
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/output/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/output/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/output/Makefile
|
||
@@ -66,8 +66,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
# so or static build
|
||
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/pqos/Makefile
|
||
===================================================================
|
||
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/pqos/Makefile
|
||
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/pqos/Makefile
|
||
@@ -1,4 +1,4 @@
|
||
-###############################################################################
|
||
+[1;115;0c###############################################################################
|
||
# Makefile script for PQoS library and sample application
|
||
#
|
||
# @par
|
||
@@ -69,8 +69,7 @@ ifeq ($(IS_GCC),1)
|
||
CFLAGS += -fno-strict-overflow \
|
||
-fno-delete-null-pointer-checks \
|
||
-fwrapv \
|
||
- -fstack-clash-protection \
|
||
- -fcf-protection=full
|
||
+ -fstack-clash-protection
|
||
endif
|
||
|
||
CFLAGS += -g -ggdb -O0
|