[gcc-6] 87/401: - Replace local plugin header fix with fix for PR target/69895

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 2845ce9d2f8d1d6fd6ae93ee53c581bebea6bee0
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Feb 22 08:40:53 2016 +0000

     - Replace local plugin header fix with fix for PR target/69895
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8684 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/pr69895.diff  | 42 ++++++++++++++++++++++++++++++++++++++++++
 debian/rules.d/binary-gcc.mk | 10 ----------
 debian/rules.patch           |  1 +
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/debian/patches/pr69895.diff b/debian/patches/pr69895.diff
new file mode 100644
index 0000000..e26c73b
--- /dev/null
+++ b/debian/patches/pr69895.diff
@@ -0,0 +1,42 @@
+# DP: Fix PR target/69895, installation of plugin headers.
+
+2016-02-22  Jakub Jelinek  <jakub at redhat.com>
+
+	PR target/69895
+	* config/m68k/t-opts (OPTIONS_H_EXTRA): Add m68k-microarchs.def
+	and m68k-devices.def.
+	* config/c6x/t-c6x (OPTIONS_H_EXTRA): Add c6x-isas.def.
+	* config/aarch64/t-aarch64 (OPTIONS_H_EXTRA): Add aarch64-arches.def.
+
+--- a/src/gcc/config/m68k/t-opts.jj	2011-05-02 18:39:25.000000000 +0200
++++ a/src/gcc/config/m68k/t-opts	2016-02-22 09:21:44.420267750 +0100
+@@ -1,3 +1,6 @@
++OPTIONS_H_EXTRA += $(srcdir)/config/m68k/m68k-microarchs.def \
++		   $(srcdir)/config/m68k/m68k-devices.def
++
+ $(srcdir)/config/m68k/m68k-tables.opt: $(srcdir)/config/m68k/genopt.sh \
+   $(srcdir)/config/m68k/m68k-devices.def $(srcdir)/config/m68k/m68k-isas.def \
+   $(srcdir)/config/m68k/m68k-microarchs.def
+--- a/src/gcc/config/c6x/t-c6x.jj	2016-01-04 14:55:54.000000000 +0100
++++ a/src/gcc/config/c6x/t-c6x	2016-02-22 09:25:56.272819642 +0100
+@@ -23,6 +23,8 @@ MD_INCLUDES= 	$(srcdir)/config/c6x/const
+ 		$(srcdir)/config/c6x/c6x-mult.md \
+ 		$(srcdir)/config/c6x/c6x-sched.md
+ 
++OPTIONS_H_EXTRA += $(srcdir)/config/c6x/c6x-isas.def
++
+ s-config s-conditions s-flags s-codes s-constants s-emit s-recog s-preds \
+ 	s-opinit s-extract s-peep s-attr s-attrtab s-output: $(MD_INCLUDES)
+ 
+--- a/src/gcc/config/aarch64/t-aarch64.jj	2016-01-04 14:55:56.000000000 +0100
++++ a/src/gcc/config/aarch64/t-aarch64	2016-02-22 09:30:03.656432719 +0100
+@@ -19,7 +19,8 @@
+ #  <http://www.gnu.org/licenses/>.
+ 
+ TM_H += $(srcdir)/config/aarch64/aarch64-cores.def
+-OPTIONS_H_EXTRA += $(srcdir)/config/aarch64/aarch64-cores.def
++OPTIONS_H_EXTRA += $(srcdir)/config/aarch64/aarch64-cores.def \
++		   $(srcdir)/config/aarch64/aarch64-arches.def
+ 
+ $(srcdir)/config/aarch64/aarch64-tune.md: $(srcdir)/config/aarch64/gentune.sh \
+ 	$(srcdir)/config/aarch64/aarch64-cores.def
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index 9452114..af190c0 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -221,16 +221,6 @@ $(binary_stamp)-gcc-plugindev: $(install_dependencies)
 		$(gcc_lib_dir)/plugin/gtype.state \
 		$(gcc_lexec_dir)/plugin/gengtype
 
-# files missing in upstream installation
-ifeq ($(DEB_TARGET_ARCH),m68k)
-	cp -p $(srcdir)/gcc/config/m68k/m68k-microarchs.def \
-		$(d_pld)/$(gcc_lib_dir)/plugin/include/config/m68k/.
-endif
-ifeq ($(DEB_TARGET_ARCH),arm64)
-	cp -p $(srcdir)/gcc/config/aarch64/aarch64-arches.def \
-		$(d_pld)/$(gcc_lib_dir)/plugin/include/config/aarch64/.
-endif
-
 	debian/dh_doclink -p$(p_pld) $(p_xbase)
 	debian/dh_rmemptydirs -p$(p_pld)
 	dh_strip -p$(p_pld)
diff --git a/debian/rules.patch b/debian/rules.patch
index 03805da..0f96080 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -81,6 +81,7 @@ debian_patches += \
 	pr67590 \
 	ada-gnattools-ldflags \
 	libjit-ldflags \
+	pr69895 \
 
 # this is still needed on powerpc, e.g. firefox and insighttoolkit4 will ftbfs.
 ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git