public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH] Fix install-plugin on arm and aarch64
@ 2013-03-06  9:07 Jakub Jelinek
  2013-03-06  9:32 ` Marcus Shawcroft
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Jakub Jelinek @ 2013-03-06  9:07 UTC (permalink / raw)
  To: Marcus Shawcroft, Richard Earnshaw, Ramana Radhakrishnan; +Cc: gcc-patches

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] Fix install-plugin on arm and aarch64
  2013-03-06  9:07 [PATCH] Fix install-plugin on arm and aarch64 Jakub Jelinek
@ 2013-03-06  9:32 ` Marcus Shawcroft
  2013-03-06 10:57 ` Matthias Klose
  2013-03-06 23:05 ` [PATCH] Fix install-plugin on arm and aarch64 Ramana Radhakrishnan
  2 siblings, 0 replies; 8+ messages in thread
From: Marcus Shawcroft @ 2013-03-06  9:32 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: Richard Earnshaw, Ramana Radhakrishnan, gcc-patches

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


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] Fix install-plugin on arm and aarch64
  2013-03-06  9:07 [PATCH] Fix install-plugin on arm and aarch64 Jakub Jelinek
  2013-03-06  9:32 ` Marcus Shawcroft
@ 2013-03-06 10:57 ` Matthias Klose
  2013-03-06 11:06   ` Jakub Jelinek
  2013-03-06 12:44   ` [PATCH] Fix install-plugin with vxworks-dummy.h (PR plugins/45078) Jakub Jelinek
  2013-03-06 23:05 ` [PATCH] Fix install-plugin on arm and aarch64 Ramana Radhakrishnan
  2 siblings, 2 replies; 8+ messages in thread
From: Matthias Klose @ 2013-03-06 10:57 UTC (permalink / raw)
  To: gcc-patches

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] Fix install-plugin on arm and aarch64
  2013-03-06 10:57 ` Matthias Klose
@ 2013-03-06 11:06   ` Jakub Jelinek
  2013-03-06 12:44   ` [PATCH] Fix install-plugin with vxworks-dummy.h (PR plugins/45078) Jakub Jelinek
  1 sibling, 0 replies; 8+ messages in thread
From: Jakub Jelinek @ 2013-03-06 11:06 UTC (permalink / raw)
  To: Matthias Klose; +Cc: gcc-patches

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] Fix install-plugin with vxworks-dummy.h (PR plugins/45078)
  2013-03-06 10:57 ` Matthias Klose
  2013-03-06 11:06   ` Jakub Jelinek
@ 2013-03-06 12:44   ` Jakub Jelinek
  2013-03-08 17:24     ` Jakub Jelinek
  2013-03-12 15:47     ` Matthias Klose
  1 sibling, 2 replies; 8+ messages in thread
From: Jakub Jelinek @ 2013-03-06 12:44 UTC (permalink / raw)
  To: Matthias Klose; +Cc: gcc-patches

Hi!

On Wed, Mar 06, 2013 at 06:57:03PM +0800, Matthias Klose wrote:
> There is still vxworks-dummy.h, which is not installed, see PR45078. Would the
> same approach work?

Like this?  Untested though, and no access to most of the targets.

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

	PR plugins/45078
	* config.gcc: On arm, mips, sh and sparc add vxworks-dummy.h to
	tm_file.

--- gcc/config.gcc.jj	2013-02-22 17:04:41.000000000 +0100
+++ gcc/config.gcc	2013-03-06 13:38:19.711201446 +0100
@@ -536,6 +536,9 @@ x86_64-*-*)
 	fi
 	tm_file="vxworks-dummy.h ${tm_file}"
 	;;
+arm*-*-* | mips*-*-* | sh*-*-* | sparc*-*-*)
+	tm_file="vxworks-dummy.h ${tm_file}"
+	;;
 esac
 
 # On a.out targets, we need to use collect2.
@@ -861,7 +864,7 @@ arm-wrs-vxworks)
 	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
 	;;
 arm*-*-netbsdelf*)
-	tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h arm/arm.h arm/netbsd-elf.h"
+	tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h ${tm_file} arm/netbsd-elf.h"
 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 	tmake_file="${tmake_file} arm/t-arm"
 	;;
@@ -873,7 +876,7 @@ arm*-*-linux-*)			# ARM GNU/Linux with E
 	    ;;
 	esac
 	tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
-	tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h arm/arm.h"
+	tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h vxworks-dummy.h arm/arm.h"
 	# Define multilib configuration for arm-linux-androideabi.
 	case ${target} in
 	*-androideabi)
@@ -891,7 +894,7 @@ arm*-*-linux-*)			# ARM GNU/Linux with E
 arm*-*-uclinux*eabi*)		# ARM ucLinux
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
 	tmake_file="arm/t-arm arm/t-arm-elf arm/t-bpabi"
-	tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h arm/aout.h arm/arm.h"
+	tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h arm/aout.h vxworks-dummy.h arm/arm.h"
 	# The BPABI long long divmod functions return a 128-bit value in
 	# registers r0-r3.  Correctly modeling that requires the use of
 	# TImode.
@@ -928,7 +931,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*
 	  tmake_file="${tmake_file} arm/t-symbian"
 	  ;;
 	esac
-	tm_file="${tm_file} arm/aout.h arm/arm.h"
+	tm_file="${tm_file} arm/aout.h vxworks-dummy.h arm/arm.h"
 	;;
 avr-*-rtems*)
 	tm_file="elfos.h avr/elf.h avr/avr-arch.h avr/avr.h dbxelf.h avr/rtems.h rtems.h newlib-stdint.h"


	Jakub

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] Fix install-plugin on arm and aarch64
  2013-03-06  9:07 [PATCH] Fix install-plugin on arm and aarch64 Jakub Jelinek
  2013-03-06  9:32 ` Marcus Shawcroft
  2013-03-06 10:57 ` Matthias Klose
@ 2013-03-06 23:05 ` Ramana Radhakrishnan
  2 siblings, 0 replies; 8+ messages in thread
From: Ramana Radhakrishnan @ 2013-03-06 23:05 UTC (permalink / raw)
  To: Jakub Jelinek
  Cc: Marcus Shawcroft, Richard Earnshaw, Ramana Radhakrishnan, gcc-patches

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] Fix install-plugin with vxworks-dummy.h (PR plugins/45078)
  2013-03-06 12:44   ` [PATCH] Fix install-plugin with vxworks-dummy.h (PR plugins/45078) Jakub Jelinek
@ 2013-03-08 17:24     ` Jakub Jelinek
  2013-03-12 15:47     ` Matthias Klose
  1 sibling, 0 replies; 8+ messages in thread
From: Jakub Jelinek @ 2013-03-08 17:24 UTC (permalink / raw)
  To: Paolo Bonzini, Alexandre Oliva, Matthias Klose; +Cc: gcc-patches

On Wed, Mar 06, 2013 at 01:44:28PM +0100, Jakub Jelinek wrote:
> On Wed, Mar 06, 2013 at 06:57:03PM +0800, Matthias Klose wrote:
> > There is still vxworks-dummy.h, which is not installed, see PR45078. Would the
> > same approach work?
> 
> Like this?  Untested though, and no access to most of the targets.

Now bootstrapped/regtested on armv7hl-linux-gnueabi.  Ok for trunk?

> 2013-03-06  Jakub Jelinek  <jakub@redhat.com>
> 
> 	PR plugins/45078
> 	* config.gcc: On arm, mips, sh and sparc add vxworks-dummy.h to
> 	tm_file.
> 
> --- gcc/config.gcc.jj	2013-02-22 17:04:41.000000000 +0100
> +++ gcc/config.gcc	2013-03-06 13:38:19.711201446 +0100
> @@ -536,6 +536,9 @@ x86_64-*-*)
>  	fi
>  	tm_file="vxworks-dummy.h ${tm_file}"
>  	;;
> +arm*-*-* | mips*-*-* | sh*-*-* | sparc*-*-*)
> +	tm_file="vxworks-dummy.h ${tm_file}"
> +	;;
>  esac
>  
>  # On a.out targets, we need to use collect2.
> @@ -861,7 +864,7 @@ arm-wrs-vxworks)
>  	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
>  	;;
>  arm*-*-netbsdelf*)
> -	tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h arm/arm.h arm/netbsd-elf.h"
> +	tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h ${tm_file} arm/netbsd-elf.h"
>  	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
>  	tmake_file="${tmake_file} arm/t-arm"
>  	;;
> @@ -873,7 +876,7 @@ arm*-*-linux-*)			# ARM GNU/Linux with E
>  	    ;;
>  	esac
>  	tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
> -	tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h arm/arm.h"
> +	tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h vxworks-dummy.h arm/arm.h"
>  	# Define multilib configuration for arm-linux-androideabi.
>  	case ${target} in
>  	*-androideabi)
> @@ -891,7 +894,7 @@ arm*-*-linux-*)			# ARM GNU/Linux with E
>  arm*-*-uclinux*eabi*)		# ARM ucLinux
>  	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
>  	tmake_file="arm/t-arm arm/t-arm-elf arm/t-bpabi"
> -	tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h arm/aout.h arm/arm.h"
> +	tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h arm/aout.h vxworks-dummy.h arm/arm.h"
>  	# The BPABI long long divmod functions return a 128-bit value in
>  	# registers r0-r3.  Correctly modeling that requires the use of
>  	# TImode.
> @@ -928,7 +931,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*
>  	  tmake_file="${tmake_file} arm/t-symbian"
>  	  ;;
>  	esac
> -	tm_file="${tm_file} arm/aout.h arm/arm.h"
> +	tm_file="${tm_file} arm/aout.h vxworks-dummy.h arm/arm.h"
>  	;;
>  avr-*-rtems*)
>  	tm_file="elfos.h avr/elf.h avr/avr-arch.h avr/avr.h dbxelf.h avr/rtems.h rtems.h newlib-stdint.h"
> 

	Jakub

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] Fix install-plugin with vxworks-dummy.h (PR plugins/45078)
  2013-03-06 12:44   ` [PATCH] Fix install-plugin with vxworks-dummy.h (PR plugins/45078) Jakub Jelinek
  2013-03-08 17:24     ` Jakub Jelinek
@ 2013-03-12 15:47     ` Matthias Klose
  1 sibling, 0 replies; 8+ messages in thread
From: Matthias Klose @ 2013-03-12 15:47 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: gcc-patches

Am 06.03.2013 20:44, schrieb Jakub Jelinek:
> Hi!
> 
> On Wed, Mar 06, 2013 at 06:57:03PM +0800, Matthias Klose wrote:
>> There is still vxworks-dummy.h, which is not installed, see PR45078. Would the
>> same approach work?
> 
> Like this?  Untested though, and no access to most of the targets.

looks ok.

using the first chunk as in a patch proposed early, or maybe just applied
locally. works for arm and sparc, sh4 didn't build yet, for mips a tri-arch
build currently fails with

Bootstrap comparison failure!
mips-linux-gnu/64/libstdc++-v3/src/c++98/sstream-inst.o differs
mips-linux-gnu/64/libstdc++-v3/src/c++98/istream-inst.o differs
mips-linux-gnu/64/libstdc++-v3/src/c++98/ostream-inst.o differs
make[4]: *** [compare] Error 1

  Matthias

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2013-03-12 15:47 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-06  9:07 [PATCH] Fix install-plugin on arm and aarch64 Jakub Jelinek
2013-03-06  9:32 ` Marcus Shawcroft
2013-03-06 10:57 ` Matthias Klose
2013-03-06 11:06   ` Jakub Jelinek
2013-03-06 12:44   ` [PATCH] Fix install-plugin with vxworks-dummy.h (PR plugins/45078) Jakub Jelinek
2013-03-08 17:24     ` Jakub Jelinek
2013-03-12 15:47     ` Matthias Klose
2013-03-06 23:05 ` [PATCH] Fix install-plugin on arm and aarch64 Ramana Radhakrishnan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).