Patchwork [RFC] Implementing ifunc target hook

login
register
mail settings
Submitter Alexander Ivchenko
Date April 2, 2013, 2:24 p.m.
Message ID <CACysShj7v9OPewUXgicALNiAzFRJBCOW7hWnEz_7QsL8WVnboA@mail.gmail.com>
Download mbox | patch
Permalink /patch/233015/
State New
Headers show

Comments

Alexander Ivchenko - April 2, 2013, 2:24 p.m.
Yep.. we missed that:

t-linux-android was added here:
  # Add Android userspace support to Linux targets.
  case $target in
    *linux*)
      tm_p_file="${tm_p_file} linux-protos.h"
      tmake_file="${tmake_file} t-linux-android"
      tm_file="$tm_file linux-android.h"
      extra_options="$extra_options linux-android.opt"
      extra_objs="$extra_objs linux-android.o"
      ;;
  esac

and here:

arm*-*-linux-*)                 # ARM GNU/Linux with ELF
        tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h
glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
        case $target in
        arm*b-*-linux*)
            tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
            ;;
        esac
        tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-bpabi
arm/t-linux-eabi t-linux-android"
        tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h arm/arm.h"
        extra_objs="$extra_objs linux-android.o"
        # Define multilib configuration for arm-linux-androideabi.
        case ${target} in
        *-androideabi)
            tmake_file="$tmake_file arm/t-linux-androideabi"
            ;;
        esac



I deleted the second encounter:

        extra_objs="$extra_objs linux-android.o"
        # Define multilib configuration for arm-linux-androideabi.


is it ok?

thanks,
Alexander

2013/4/2 Jakub Jelinek <jakub@redhat.com>:
> On Wed, Mar 27, 2013 at 01:56:48PM +0400, Kirill Yukhin wrote:
>> >
>> > Otherwise OK.
>> >
>> > Thanks,
>>
>> Hi,  chacked into trunk: http://gcc.gnu.org/ml/gcc-cvs/2013-03/msg00785.html
>
> This leads to:
> ../../gcc/config/t-linux-android:22: warning: overriding recipe for target `linux-android.o'
> ../../gcc/config/t-linux-android:22: warning: ignoring old recipe for target `linux-android.o'
> for arm*-linux* target (cross in my case).  t-linux-android is listed twice.
>
>         Jakub
Jakub Jelinek - April 2, 2013, 2:26 p.m.
On Tue, Apr 02, 2013 at 06:24:06PM +0400, Alexander Ivchenko wrote:
> --- a/gcc/ChangeLog
> +++ b/gcc/ChangeLog
> @@ -1,3 +1,7 @@
> +2013-04-02  Alexander Ivchenko  <alexander.ivchenko@intel.com>
> +
> +       * config.gcc (arm*-*-linux-*): Remove duplicate t-linux-android.
> +
>  2013-04-02  Richard Biener  <rguenther@suse.de>
> 
>         PR tree-optimization/56778
> diff --git a/gcc/config.gcc b/gcc/config.gcc
> index e51db91..44ed190 100644
> --- a/gcc/config.gcc
> +++ b/gcc/config.gcc
> @@ -878,7 +878,7 @@ arm*-*-linux-*)                     # ARM GNU/Linux with ELF
>             tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
>             ;;
>         esac
> -       tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-bpabi
> arm/t-linux-eabi t-linux-android"
> +       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"
>         extra_objs="$extra_objs linux-android.o"
>         # Define multilib configuration for arm-linux-androideabi.
> 
> 
> is it ok?

Yes.

	Jakub
Kirill Yukhin - April 2, 2013, 2:33 p.m.
Hi,
>> is it ok?
>
> Yes.

Checked into trunk: http://gcc.gnu.org/ml/gcc-cvs/2013-04/msg00066.html

Thanks, K

Patch

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d18c6e9..0e1d5e4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@ 
+2013-04-02  Alexander Ivchenko  <alexander.ivchenko@intel.com>
+
+       * config.gcc (arm*-*-linux-*): Remove duplicate t-linux-android.
+
 2013-04-02  Richard Biener  <rguenther@suse.de>

        PR tree-optimization/56778
diff --git a/gcc/config.gcc b/gcc/config.gcc
index e51db91..44ed190 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -878,7 +878,7 @@  arm*-*-linux-*)                     # ARM GNU/Linux with ELF
            tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
            ;;
        esac
-       tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-bpabi
arm/t-linux-eabi t-linux-android"
+       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"