Patchwork Fix install-plugin with vxworks-dummy.h (PR plugins/45078)

login
register
mail settings
Submitter Jakub Jelinek
Date March 6, 2013, 12:44 p.m.
Message ID <20130306124428.GS12913@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/225488/
State New
Headers show

Comments

Jakub Jelinek - March 6, 2013, 12:44 p.m.
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.



	Jakub
Jakub Jelinek - March 8, 2013, 5:23 p.m.
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
Matthias Klose - March 12, 2013, 3:46 p.m.
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

Patch

--- 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"