Patchwork Fix install-plugin on arm and aarch64

login
register
mail settings
Submitter Jakub Jelinek
Date March 6, 2013, 9:07 a.m.
Message ID <20130306090736.GQ12913@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/225456/
State New
Headers show

Comments

Jakub Jelinek - March 6, 2013, 9:07 a.m.
Hi!

https://bugzilla.redhat.com/show_bug.cgi?id=910926
reports that plugins aren't usable on arm, because arm-cores.def isn't
installed into the plugins directory.  arm-cores.def can't be included in
tm_file list, because we don't want to include it directly, nor in
HeaderInclude in arm.opt (that breaks the build).  rs6000 has similar issue
with its rs6000-builtin.def, and solves this by adding content to TM_H
in Makefile fragment.

Thus, the following patch does the same for arm (and apparently aarch64 has
the same issue).  Ok for trunk?

2013-03-06  Jakub Jelinek  <jakub@redhat.com>

	* config/aarch64/t-aarch64 (TM_H, OPTIONS_H_EXTRA): Add
	aarch64-cores.def.
	* config/arm/t-arm (TM_H, OPTIONS_H_EXTRA): Add arm-cores.def.


	Jakub
[A
Marcus Shawcroft - March 6, 2013, 9:32 a.m.
On 06/03/13 09:07, Jakub Jelinek wrote:
> Hi!
>
> https://bugzilla.redhat.com/show_bug.cgi?id=910926
> reports that plugins aren't usable on arm, because arm-cores.def isn't
> installed into the plugins directory.  arm-cores.def can't be included in
> tm_file list, because we don't want to include it directly, nor in
> HeaderInclude in arm.opt (that breaks the build).  rs6000 has similar issue
> with its rs6000-builtin.def, and solves this by adding content to TM_H
> in Makefile fragment.
>
> Thus, the following patch does the same for arm (and apparently aarch64 has
> the same issue).  Ok for trunk?
>
> 2013-03-06  Jakub Jelinek  <jakub@redhat.com>
>
> 	* config/aarch64/t-aarch64 (TM_H, OPTIONS_H_EXTRA): Add
> 	aarch64-cores.def.
> 	* config/arm/t-arm (TM_H, OPTIONS_H_EXTRA): Add arm-cores.def.
>
> --- gcc/config/aarch64/t-aarch64.jj	2013-02-24 19:44:07.000000000 +0100
> +++ gcc/config/aarch64/t-aarch64	2013-03-06 09:42:31.568042231 +0100
> @@ -18,6 +18,9 @@
>   #  along with GCC; see the file COPYING3.  If not see
>   #  <http://www.gnu.org/licenses/>.
>
> +TM_H += $(srcdir)/config/aarch64/aarch64-cores.def
> +OPTIONS_H_EXTRA += $(srcdir)/config/aarch64/aarch64-cores.def
> +
>   $(srcdir)/config/aarch64/aarch64-tune.md: $(srcdir)/config/aarch64/gentune.sh \
>   	$(srcdir)/config/aarch64/aarch64-cores.def
>   	$(SHELL) $(srcdir)/config/aarch64/gentune.sh \
> --- gcc/config/arm/t-arm.jj	2013-01-11 09:03:13.000000000 +0100
> +++ gcc/config/arm/t-arm	2013-03-06 09:41:09.607528642 +0100
> @@ -18,6 +18,9 @@
>   # along with GCC; see the file COPYING3.  If not see
>   # <http://www.gnu.org/licenses/>.
>
> +TM_H += $(srcdir)/config/arm/arm-cores.def
> +OPTIONS_H_EXTRA += $(srcdir)/config/arm/arm-cores.def
> +
>   # All md files - except for arm.md.
>   # This list should be kept in alphabetical order and updated whenever an md
>   # file is added or removed.
>
> 	Jakub
> [A
>


AArch64 patch is OK.

ARM looks fine but I can't OK that one.


Cheers
/Marcus
Matthias Klose - March 6, 2013, 10:57 a.m.
Am 06.03.2013 17:07, schrieb Jakub Jelinek:
> Hi!
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=910926
> reports that plugins aren't usable on arm, because arm-cores.def isn't
> installed into the plugins directory.  arm-cores.def can't be included in
> tm_file list, because we don't want to include it directly, nor in
> HeaderInclude in arm.opt (that breaks the build).  rs6000 has similar issue
> with its rs6000-builtin.def, and solves this by adding content to TM_H
> in Makefile fragment.
> 
> Thus, the following patch does the same for arm (and apparently aarch64 has
> the same issue).  Ok for trunk?

There is still vxworks-dummy.h, which is not installed, see PR45078. Would the
same approach work?

  Matthias
Jakub Jelinek - March 6, 2013, 11:06 a.m.
On Wed, Mar 06, 2013 at 06:57:03PM +0800, Matthias Klose wrote:
> Am 06.03.2013 17:07, schrieb Jakub Jelinek:
> > https://bugzilla.redhat.com/show_bug.cgi?id=910926
> > reports that plugins aren't usable on arm, because arm-cores.def isn't
> > installed into the plugins directory.  arm-cores.def can't be included in
> > tm_file list, because we don't want to include it directly, nor in
> > HeaderInclude in arm.opt (that breaks the build).  rs6000 has similar issue
> > with its rs6000-builtin.def, and solves this by adding content to TM_H
> > in Makefile fragment.
> > 
> > Thus, the following patch does the same for arm (and apparently aarch64 has
> > the same issue).  Ok for trunk?
> 
> There is still vxworks-dummy.h, which is not installed, see PR45078. Would the
> same approach work?

i386/x86_64 solves that by tm_file="vxworks-dummy.h ${tm_file}" in
config.gcc.  Perhaps arm, mips, sh and sparc should follow that.

	Jakub
Ramana Radhakrishnan - March 6, 2013, 11:04 p.m.
On Wed, Mar 6, 2013 at 9:07 AM, Jakub Jelinek <jakub@redhat.com> wrote:
> Hi!
>
> https://bugzilla.redhat.com/show_bug.cgi?id=910926
> reports that plugins aren't usable on arm, because arm-cores.def isn't
> installed into the plugins directory.  arm-cores.def can't be included in
> tm_file list, because we don't want to include it directly, nor in
> HeaderInclude in arm.opt (that breaks the build).  rs6000 has similar issue
> with its rs6000-builtin.def, and solves this by adding content to TM_H
> in Makefile fragment.
>
> Thus, the following patch does the same for arm (and apparently aarch64 has
> the same issue).  Ok for trunk?
>
> 2013-03-06  Jakub Jelinek  <jakub@redhat.com>
>
>         * config/aarch64/t-aarch64 (TM_H, OPTIONS_H_EXTRA): Add
>         aarch64-cores.def.
>         * config/arm/t-arm (TM_H, OPTIONS_H_EXTRA): Add arm-cores.def.

Ok.

Thanks,
Ramana

>
> --- gcc/config/aarch64/t-aarch64.jj     2013-02-24 19:44:07.000000000 +0100
> +++ gcc/config/aarch64/t-aarch64        2013-03-06 09:42:31.568042231 +0100
> @@ -18,6 +18,9 @@
>  #  along with GCC; see the file COPYING3.  If not see
>  #  <http://www.gnu.org/licenses/>.
>
> +TM_H += $(srcdir)/config/aarch64/aarch64-cores.def
> +OPTIONS_H_EXTRA += $(srcdir)/config/aarch64/aarch64-cores.def
> +
>  $(srcdir)/config/aarch64/aarch64-tune.md: $(srcdir)/config/aarch64/gentune.sh \
>         $(srcdir)/config/aarch64/aarch64-cores.def
>         $(SHELL) $(srcdir)/config/aarch64/gentune.sh \
> --- gcc/config/arm/t-arm.jj     2013-01-11 09:03:13.000000000 +0100
> +++ gcc/config/arm/t-arm        2013-03-06 09:41:09.607528642 +0100
> @@ -18,6 +18,9 @@
>  # along with GCC; see the file COPYING3.  If not see
>  # <http://www.gnu.org/licenses/>.
>
> +TM_H += $(srcdir)/config/arm/arm-cores.def
> +OPTIONS_H_EXTRA += $(srcdir)/config/arm/arm-cores.def
> +
>  # All md files - except for arm.md.
>  # This list should be kept in alphabetical order and updated whenever an md
>  # file is added or removed.
>
>         Jakub
> [A

Patch

--- gcc/config/aarch64/t-aarch64.jj	2013-02-24 19:44:07.000000000 +0100
+++ gcc/config/aarch64/t-aarch64	2013-03-06 09:42:31.568042231 +0100
@@ -18,6 +18,9 @@ 
 #  along with GCC; see the file COPYING3.  If not see
 #  <http://www.gnu.org/licenses/>.
 
+TM_H += $(srcdir)/config/aarch64/aarch64-cores.def
+OPTIONS_H_EXTRA += $(srcdir)/config/aarch64/aarch64-cores.def
+
 $(srcdir)/config/aarch64/aarch64-tune.md: $(srcdir)/config/aarch64/gentune.sh \
 	$(srcdir)/config/aarch64/aarch64-cores.def
 	$(SHELL) $(srcdir)/config/aarch64/gentune.sh \
--- gcc/config/arm/t-arm.jj	2013-01-11 09:03:13.000000000 +0100
+++ gcc/config/arm/t-arm	2013-03-06 09:41:09.607528642 +0100
@@ -18,6 +18,9 @@ 
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
+TM_H += $(srcdir)/config/arm/arm-cores.def
+OPTIONS_H_EXTRA += $(srcdir)/config/arm/arm-cores.def
+
 # All md files - except for arm.md.
 # This list should be kept in alphabetical order and updated whenever an md
 # file is added or removed.