SLFO-pool/intel-cmt-cat
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main intel-cmt-cat revision bfe56569ecd52bdf95844bbf0bdebc1d

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 15:27:52 +02:00
parent 6d7018e13d
commit 04a396a43d
8 changed files with 402 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
Remove-fcf-protection-full.patch Normal file
View File

@ -0,0 +1,210 @@
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>
diff --git a/examples/c/CAT_MBA/Makefile b/examples/c/CAT_MBA/Makefile
index 6b5ceb7..02adce8 100644
--- a/examples/c/CAT_MBA/Makefile
+++ b/examples/c/CAT_MBA/Makefile
@@ -63,8 +63,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
- -fcf-protection=full
+ -fwrapv
endif
# Build targets and dependencies
diff --git a/examples/c/CMT_MBM/Makefile b/examples/c/CMT_MBM/Makefile
index 650f37e..4090be9 100644
--- a/examples/c/CMT_MBM/Makefile
+++ b/examples/c/CMT_MBM/Makefile
@@ -63,8 +63,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
- -fcf-protection=full
+ -fwrapv
endif
# Build targets and dependencies
diff --git a/examples/c/PSEUDO_LOCK/Makefile b/examples/c/PSEUDO_LOCK/Makefile
index c0cdf66..37e7a60 100644
--- a/examples/c/PSEUDO_LOCK/Makefile
+++ b/examples/c/PSEUDO_LOCK/Makefile
@@ -63,8 +63,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
- -fcf-protection=full
+ -fwrapv
endif
# Build targets and dependencies
diff --git a/lib/Makefile b/lib/Makefile
index d171892..04eecc1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -72,8 +72,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-protector-strong \
- -fcf-protection=full
+ -fstack-protector-strong
endif
# so or static build
diff --git a/pqos/Makefile b/pqos/Makefile
index c1f1c0b..868e81a 100644
--- a/pqos/Makefile
+++ b/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 -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-protector-strong \
- -fcf-protection=full
+ -fstack-protector-strong
endif
ifeq ($(shell uname), FreeBSD)
diff --git a/rdtset/Makefile b/rdtset/Makefile
index 7b34594..36f3343 100644
--- a/rdtset/Makefile
+++ b/rdtset/Makefile
@@ -45,8 +45,7 @@ CFLAGS = -I$(LIBDIR) \
-Wcast-qual -Wundef -Wwrite-strings \
-Wformat -Wformat-security -fstack-protector -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-protector-strong \
- -fcf-protection=full
+ -fstack-protector-strong
endif
# DEBUG build
diff --git a/tools/membw/Makefile b/tools/membw/Makefile
index fbe25ab..4246af9 100644
--- a/tools/membw/Makefile
+++ b/tools/membw/Makefile
@@ -49,8 +49,7 @@ CFLAGS=-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wcast-qual -Wundef -Wwrite-strings \
-Wformat -Wformat-security -fstack-protector -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-protector-strong \
- -fcf-protection=full
+ -fstack-protector-strong
endif
SRCS = $(sort $(wildcard *.c))
diff --git a/unit-test/lib/Makefile b/unit-test/lib/Makefile
index 3bf18a7..b472489 100644
--- a/unit-test/lib/Makefile
+++ b/unit-test/lib/Makefile
@@ -34,8 +34,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-protector-strong \
- -fcf-protection=full
+ -fstack-protector-strong
endif
# common function wrap
diff --git a/unit-test/mock/Makefile b/unit-test/mock/Makefile
index d2ee6e0..aad7603 100644
--- a/unit-test/mock/Makefile
+++ b/unit-test/mock/Makefile
@@ -68,8 +68,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
- -fcf-protection=full
+ -fwrapv
endif
# so or static build
diff --git a/unit-test/output/Makefile b/unit-test/output/Makefile
index 72f7ed5..d4ae752 100644
--- a/unit-test/output/Makefile
+++ b/unit-test/output/Makefile
@@ -65,8 +65,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
- -fcf-protection=full
+ -fwrapv
endif
# so or static build
diff --git a/unit-test/pqos/Makefile b/unit-test/pqos/Makefile
index a980c19..509ee31 100644
--- a/unit-test/pqos/Makefile
+++ b/unit-test/pqos/Makefile
@@ -69,8 +69,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-protector-strong \
- -fcf-protection=full
+ -fstack-protector-strong
endif
CFLAGS += -g -ggdb -O0

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/intel/intel-cmt-cat.git</param>
<param name="changesrevision">14e38408b39d11fc36a41f1dbda0dc26a3a7a349</param></service></servicedata>
<param name="changesrevision">b26b31b0ae6980c5939a421cefe0316cae884626</param></service></servicedata>

BIN
intel-cmt-cat-5.0.0.10.git+b26b31b.obscpio (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
intel-cmt-cat-5.0.0.6.git+14e3840.obscpio (Stored with Git LFS)
View File

Binary file not shown.

19
intel-cmt-cat.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Mar 12 09:43:42 UTC 2024 - trenn@suse.de
- Update to version 5.0.0.10.git+b26b31b:
* Pinned-Dependencies are modified
* appqos_client: update ip package version
* appqos_client: update version to 1.1.1
* Add compiler version checkings during build process
- Remove problematic fcf-protection gcc flag
We currently build 32 bit flavors with -march=i586 where this
compiler flag is not supported. Also some build envs still have gcc
versions not supporting this feature. Unfortunately mainline seem not
to be willing to remove the flag:
https://github.com/intel/intel-cmt-cat/pull/267
A Remove-fcf-protection-full.patch
- Remove gcc version check in general, if the tool is compiling it's expected
to work, if extra flags unkown to the compiler are used the build will fail.
A remove_gcc_check
-------------------------------------------------------------------
Mon Feb 12 08:11:04 UTC 2024 - trenn@suse.de

6
intel-cmt-cat.obsinfo
View File

@ -1,4 +1,4 @@
name: intel-cmt-cat
version: 5.0.0.6.git+14e3840
mtime: 1706615869
commit: 14e38408b39d11fc36a41f1dbda0dc26a3a7a349
version: 5.0.0.10.git+b26b31b
mtime: 1709650933
commit: b26b31b0ae6980c5939a421cefe0316cae884626

4
intel-cmt-cat.spec
View File

@ -22,7 +22,7 @@
%define libpqosMajor 5
%global make_flags EXTRA_CFLAGS="%{optflags}" SHARED=y PREFIX=%{buildroot}/%{_prefix} MAN_DIR=%{buildroot}/%{_mandir}/man8 LIB_INSTALL_DIR=%{buildroot}%{_libdir}/
Name: intel-cmt-cat
Version: 5.0.0.6.git+14e3840
Version: 5.0.0.10.git+b26b31b
Release: 0
Summary: Command line interface to CMT, MBM, CAT and CDP technologies
License: BSD-3-Clause
@ -31,6 +31,8 @@ URL: https://github.com/01org/%{name}
Source0: %{name}-%{version}.tar.xz
#Source0: https://github.com/intel/intel-cmt-cat/archive/v%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz
Patch1: fix-bad-env-shebang.patch
Patch2: Remove-fcf-protection-full.patch
Patch3: remove_gcc_check
BuildRequires: doxygen
ExclusiveArch: x86_64 %{ix86}

163
remove_gcc_check Normal file
View File

@ -0,0 +1,163 @@
Index: intel-cmt-cat/Makefile
===================================================================
--- intel-cmt-cat.orig/Makefile
+++ intel-cmt-cat/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
-include pre-build.mk
-
# XXX: modify as desired
PREFIX ?= /usr/local
export PREFIX
Index: intel-cmt-cat/examples/c/CAT_MBA/Makefile
===================================================================
--- intel-cmt-cat.orig/examples/c/CAT_MBA/Makefile
+++ intel-cmt-cat/examples/c/CAT_MBA/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
-include ../../../pre-build.mk
-
LIBDIR ?= ../../../lib
CFLAGS =-I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
Index: intel-cmt-cat/examples/c/CMT_MBM/Makefile
===================================================================
--- intel-cmt-cat.orig/examples/c/CMT_MBM/Makefile
+++ intel-cmt-cat/examples/c/CMT_MBM/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
-include ../../../pre-build.mk
-
LIBDIR ?= ../../../lib
CFLAGS =-I$(LIBDIR) -pthread \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
Index: intel-cmt-cat/examples/c/PSEUDO_LOCK/Makefile
===================================================================
--- intel-cmt-cat.orig/examples/c/PSEUDO_LOCK/Makefile
+++ intel-cmt-cat/examples/c/PSEUDO_LOCK/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
-include ../../../pre-build.mk
-
LIBDIR ?= ../../../lib
LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lrt -lpthread
Index: intel-cmt-cat/lib/Makefile
===================================================================
--- intel-cmt-cat.orig/lib/Makefile
+++ intel-cmt-cat/lib/Makefile
@@ -33,8 +33,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
###############################################################################
-include ../pre-build.mk
-
LIB = libpqos
VERSION = 5.0.0
SO_VERSION = 5
Index: intel-cmt-cat/pqos/Makefile
===================================================================
--- intel-cmt-cat.orig/pqos/Makefile
+++ intel-cmt-cat/pqos/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
-include ../pre-build.mk
-
OBJDIR = obj
LIBDIR ?= ../lib
LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
Index: intel-cmt-cat/rdtset/Makefile
===================================================================
--- intel-cmt-cat.orig/rdtset/Makefile
+++ intel-cmt-cat/rdtset/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
-include ../pre-build.mk
-
LIBDIR ?= ../lib
LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lpthread
Index: intel-cmt-cat/tools/membw/Makefile
===================================================================
--- intel-cmt-cat.orig/tools/membw/Makefile
+++ intel-cmt-cat/tools/membw/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
-include ../../pre-build.mk
-
APP = membw
MAN = membw.8
Index: intel-cmt-cat/unit-test/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/Makefile
+++ intel-cmt-cat/unit-test/Makefile
@@ -1,5 +1,3 @@
-include ../pre-build.mk
-
LIB_DIR=$(CURDIR)/../lib
.PHONY: run style clean
Index: intel-cmt-cat/unit-test/lib/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/lib/Makefile
+++ intel-cmt-cat/unit-test/lib/Makefile
@@ -1,5 +1,3 @@
-include ../../pre-build.mk
-
LIB_DIR = ../../lib
OBJ_DIR = ./obj
BIN_DIR = ./bin
Index: intel-cmt-cat/unit-test/mock/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/mock/Makefile
+++ intel-cmt-cat/unit-test/mock/Makefile
@@ -34,8 +34,6 @@
###############################################################################
-include ../../pre-build.mk
-
LIB_DIR = ../../lib
LIB = libpqosmock
Index: intel-cmt-cat/unit-test/output/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/output/Makefile
+++ intel-cmt-cat/unit-test/output/Makefile
@@ -33,8 +33,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
###############################################################################
-include ../../pre-build.mk
-
LIB = libgraboutput
SHARED ?= y
LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
Index: intel-cmt-cat/unit-test/pqos/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/pqos/Makefile
+++ intel-cmt-cat/unit-test/pqos/Makefile
@@ -33,8 +33,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
###############################################################################
-include ../../pre-build.mk
-
PQOS_DIR = ../../pqos
LIB_DIR = ../../lib
OBJ_DIR = ./obj