diff mbox

Fix installed plugin headers for aarch64, m68k and c6x (PR target/69894, PR target/69895)

Message ID 20160222192610.GP3017@tucnak.redhat.com
State New
Headers show

Commit Message

Jakub Jelinek Feb. 22, 2016, 7:26 p.m. UTC 
Hi!

Matthias filed to PRs about missing *.def files that are needed by plugins,
and my grep found another case (c6x; well, I actually found even the aarch64
issue after seeing the m68k report, then found aarch64 has been already
filed).  The problem is that the HeaderInclude header includes on these
targets some *.def files.  The standard way to tell the Makefiles about
these is OPTIONS_H_EXTRA, which fixes this.

Bootstrapped/regtested on aarch64-linux, Matthias tested it on m68k-linux,
c6x is untested, but obvious.  Ok for trunk?

2016-02-22  Jakub Jelinek  <jakub@redhat.com>

	PR target/69894
	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.


	Jakub

Comments

Jeff Law Feb. 22, 2016, 7:35 p.m. UTC | #1 
On 02/22/2016 12:26 PM, Jakub Jelinek wrote:
> Hi!
>
> Matthias filed to PRs about missing *.def files that are needed by plugins,
> and my grep found another case (c6x; well, I actually found even the aarch64
> issue after seeing the m68k report, then found aarch64 has been already
> filed).  The problem is that the HeaderInclude header includes on these
> targets some *.def files.  The standard way to tell the Makefiles about
> these is OPTIONS_H_EXTRA, which fixes this.
>
> Bootstrapped/regtested on aarch64-linux, Matthias tested it on m68k-linux,
> c6x is untested, but obvious.  Ok for trunk?
>
> 2016-02-22  Jakub Jelinek  <jakub@redhat.com>
>
> 	PR target/69894
> 	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.
OK.
jeff
diff mbox

Patch

--- gcc/config/m68k/t-opts.jj	2011-05-02 18:39:25.000000000 +0200
+++ 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
--- gcc/config/c6x/t-c6x.jj	2016-01-04 14:55:54.000000000 +0100
+++ 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)
 
--- gcc/config/aarch64/t-aarch64.jj	2016-01-04 14:55:56.000000000 +0100
+++ 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