Fix v1.6.1-implicit-fallthrough.patch compatibility with gcc < 7.

Use %ldconfig_scriptlets.
This commit is contained in:
Jan Kratochvil 2018-03-02 20:20:51 +01:00
parent 772b58ba8a
commit cfb4b6c9d1
2 changed files with 18 additions and 14 deletions

View File

@ -1,6 +1,6 @@
Name: libipt
Version: 1.6.1
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Intel Processor Trace Decoder Library
License: BSD
URL: https://github.com/01org/processor-trace
@ -14,8 +14,7 @@ The Intel Processor Trace (Intel PT) Decoder Library is Intel's reference
implementation for decoding Intel PT. It can be used as a standalone library
or it can be partially or fully integrated into your tool.
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%package devel
Summary: Header files and libraries for Intel Processor Trace Decoder Library
@ -57,6 +56,10 @@ ctest -V %{?_smp_mflags}
%{_libdir}/%{name}.so
%changelog
* Fri Mar 2 2018 Jan Kratochvil <jan.kratochvil@redhat.com> - 1.6.1-6
- Fix v1.6.1-implicit-fallthrough.patch compatibility with gcc < 7.
- Use %%ldconfig_scriptlets.
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1,19 +1,20 @@
gcc-7.1.1-1.fc27.x86_64
/home/jkratoch/redhat/fedora/libipt/master/processor-trace-1.6.1/libipt/src/pt_block_decoder.c: In function pt_blk_proceed_no_event_cached:
/home/jkratoch/redhat/fedora/libipt/master/processor-trace-1.6.1/libipt/src/pt_block_decoder.c:2282:6: error: this statement may fall through [-Werror=implicit-fallthrough=]
if (bce.isize) {
^
/home/jkratoch/redhat/fedora/libipt/master/processor-trace-1.6.1/libipt/src/pt_block_decoder.c:2328:2: note: here
case ptbq_decode: {
^~~~
commit 3a307bd5add3df34665d1e5cb1b646af55ba9653
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Jun 9 07:27:50 2017 +0200
--- processor-trace-1.6.1-orig/libipt/src/pt_block_decoder.c 2017-05-31 13:30:32.000000000 +0200
+++ processor-trace-1.6.1/libipt/src/pt_block_decoder.c 2017-06-09 07:24:12.644587611 +0200
@@ -2324,6 +2324,7 @@ static int pt_blk_proceed_no_event_cache
libipt: Fix [-Werror=implicit-fallthrough=] with gcc-7.1.1.
diff --git a/libipt/src/pt_block_decoder.c b/libipt/src/pt_block_decoder.c
index 21783a6..91d5bb3 100644
--- a/libipt/src/pt_block_decoder.c
+++ b/libipt/src/pt_block_decoder.c
@@ -2095,6 +2095,9 @@ static int pt_blk_proceed_no_event_cached(struct pt_block_decoder *decoder,
}
/* Fall through to ptbq_decode. */
+#if __GNUC__ >= 7
+ __attribute__ ((fallthrough));
+#endif
case ptbq_decode: {
struct pt_insn_ext iext;