From 01556b07f7d7432c208a574f7dd7a3f0b1da8225920d971a828010624ffed9d0 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Thu, 27 Apr 2017 09:08:13 +0000
Subject: [PATCH] Accepting request 491446 from
 home:marxin:branches:Base:System

GCC7 fix, the previous PR was not properly tested.

OBS-URL: https://build.opensuse.org/request/show/491446
OBS-URL: https://build.opensuse.org/package/show/Base:System/elfutils?expand=0&rev=93
---
 ...-support-for-EM_PPC64-GNU_ATTRIBUTES.patch | 45 -------------------
 elfutils.changes                              |  7 +++
 elfutils.spec                                 |  2 +-
 3 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/0001-backends-Add-support-for-EM_PPC64-GNU_ATTRIBUTES.patch b/0001-backends-Add-support-for-EM_PPC64-GNU_ATTRIBUTES.patch
index 2173003..2472054 100644
--- a/0001-backends-Add-support-for-EM_PPC64-GNU_ATTRIBUTES.patch
+++ b/0001-backends-Add-support-for-EM_PPC64-GNU_ATTRIBUTES.patch
@@ -43,51 +43,6 @@ index 612c5769..48d7129d 100644
  	  };
  	if (value < sizeof fp_kinds / sizeof fp_kinds[0])
  	  *value_name = fp_kinds[value];
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index d4659cdb..a27e8687 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -317,7 +317,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
- 	     run-aggregate-size.sh testfile-sizes1.o.bz2 testfile-sizes2.o.bz2 \
- 	     testfile-sizes3.o.bz2 \
- 	     run-readelf-A.sh testfileppc32attrs.o.bz2 \
--	     testfilesparc64attrs.o.bz2 \
-+	     testfilesparc64attrs.o.bz2 testfileppc64attrs.o.bz2 \
- 	     testfile-debug-types.bz2 \
- 	     run-getsrc-die.sh run-strptr.sh \
- 	     testfile-x32-core.bz2 testfile-x32.bz2 \
-diff --git a/tests/run-readelf-A.sh b/tests/run-readelf-A.sh
-index 03d511c9..b7432bec 100755
---- a/tests/run-readelf-A.sh
-+++ b/tests/run-readelf-A.sh
-@@ -32,7 +32,12 @@
- #
- # gcc -c testfilesparc64attrs.s
- 
--testfiles testfilearm testfileppc32attrs.o testfilesparc64attrs.o
-+# = testfileppc64attrs.s =
-+# .gnu_attribute 4,3
-+#
-+# gcc -c testfileppc64attrs.s
-+
-+testfiles testfilearm testfileppc32attrs.o testfilesparc64attrs.o testfileppc64attrs.o
- 
- testrun_compare ${abs_top_builddir}/src/readelf -A testfilearm <<\EOF
- 
-@@ -79,4 +84,13 @@ Object attributes section [ 4] '.gnu.attributes' of 21 bytes at offset 0x40:
-       GNU_Sparc_HWCAPS2: fjathplus,adp,mwait,xmont
- EOF
- 
-+testrun_compare ${abs_top_builddir}/src/readelf -A testfileppc64attrs.o <<\EOF
-+
-+Object attributes section [ 4] '.gnu.attributes' of 16 bytes at offset 0x40:
-+  Owner          Size
-+  gnu              15
-+    File:           7
-+      GNU_Power_ABI_FP: Single-precision hard float
-+EOF
-+
- exit 0
 -- 
 2.12.2
 
diff --git a/elfutils.changes b/elfutils.changes
index 9c7947e..0f7a146 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 27 07:43:44 UTC 2017 - mliska@suse.cz
+
+- Add 0001-backends-Add-support-for-EM_PPC64-GNU_ATTRIBUTES.patch
+  unconditionally in the spec file. As we can't support binary diff,
+  a newly added test-case is removed from the patch.
+
 -------------------------------------------------------------------
 Tue Apr 25 14:46:06 UTC 2017 - mliska@suse.cz
 
diff --git a/elfutils.spec b/elfutils.spec
index 0dca3bb..72115df 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -142,8 +142,8 @@ to develop applications that require these.
 %if 0%{?qemu_user_space_build}
 # qemu does not support ptrace
 %patch1 -p1
-%patch2 -p2
 %endif
+%patch2 -p1
 
 %build
 # Change DATE/TIME macros to use last change time of elfutils.changes