Bug#741543: When build for mips64el, the default target is mipsn32el

[Yunqiang Su <wzssyqa@gmail.com>]

s/gnuabin64/gnuabi64/

just a typo.

--- gcc-4.9-4.9-20140322.orig/src/gcc/config.gcc        2014-03-25
11:06:44.935298703 +0000
+++ gcc-4.9-4.9-20140322/src/gcc/config.gcc     2014-03-25
11:07:39.087774543 +0000
@@ -1963,6 +1963,9 @@
        tmake_file="${tmake_file} mips/t-linux64"
        tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
        case ${target} in
+               *gnuabi64*)
+                       tm_defines=$(echo ${tm_defines}| sed
's/MIPS_ABI_DEFAULT=ABI_N32/MIPS_ABI_DEFAULT=ABI_64/g')
+                       ;;
                mips64el-st-linux-gnu)
                        tm_file="${tm_file} mips/st.h"
                        tmake_file="${tmake_file} mips/t-st"

On Tue, Mar 25, 2014 at 7:10 PM, Yunqiang Su <wzssyqa@gmail.com> wrote:
> If we keep N32 as the default ABI, like this
>
> --- gcc-4.9-4.9-20140322.orig/src/gcc/config.gcc        2014-03-25
> 11:06:44.935298703 +0000
> +++ gcc-4.9-4.9-20140322/src/gcc/config.gcc     2014-03-25
> 11:07:39.087774543 +0000
> @@ -1963,6 +1963,9 @@
>         tmake_file="${tmake_file} mips/t-linux64"
>         tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
>         case ${target} in
> +               *gnuabin64*)
> +                       tm_defines=$(echo ${tm_defines}| sed
> 's/MIPS_ABI_DEFAULT=ABI_N32/MIPS_ABI_DEFAULT=ABI_64/g')
> +                       ;;
>                 mips64el-st-linux-gnu)
>                         tm_file="${tm_file} mips/st.h"
>                         tmake_file="${tmake_file} mips/t-st"
>
> Will it be OK to be merged into upstream?
>
> On Sat, Mar 22, 2014 at 4:41 PM, Richard Sandiford
> <rdsandiford@googlemail.com> wrote:
>> Yunqiang Su <wzssyqa@gmail.com> writes:
>>> I think so.
>>>
>>> Richard is the guy for upstream ?
>>
>> Hmm, this still looks multiarch-related to me.  It looks like it's changing
>> the default ABI for mips64-linux-gnu from n32 to n64.  That might be right
>> for a Debian multiarch environment but all upstream mips64-*-linux-gnu
>> configurations need to continue to use n32 as the default.  (The *gnuabin32*
>> stanza is Debian-local.)
>>
>> Thanks,
>> Richard
>>
>>> On Fri, Mar 21, 2014 at 9:59 AM, Matthias Klose <doko@debian.org> wrote:
>>>> Isn't that something unrelated to multiarch, and better should go upstream?
>>>>
>>>>   Matthias
>>>>
>>>> Am 13.03.2014 17:34, schrieb Yunqiang Su:
>>>>>
>>>>> Package: gcc-4.9
>>>>> Version: 4.9-20140303-1
>>>>>
>>>>> Hi, you lost a segment of patch in gcc-multiarch.diff for mips64(el), etc
>>>>>
>>>>> --- gcc-4.9-4.9-20140303.orig/src/gcc/config.gcc        2014-03-13
>>>>> 16:27:17.509523462 +0000
>>>>> +++ gcc-4.9-4.9-20140303/src/gcc/config.gcc     2014-03-13
>>>>> 16:29:31.845902397 +0000
>>>>>
>>>>> @@ -1961,8 +1961,11 @@
>>>>>
>>>>>          tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h
>>>>> glibc-stdint.h ${tm_file} mips/gnu-user.h mips/gnu-user64.h
>>>>> mips/linux64.h mips/linux-common.h"
>>>>>          extra_options="${extra_options} linux-android.opt"
>>>>>          tmake_file="${tmake_file} mips/t-linux64"
>>>>> -       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
>>>>> +       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_64"
>>>>>          case ${target} in
>>>>> +               *gnuabin32*)
>>>>> +                       tm_defines=$(echo ${tm_defines}| sed
>>>>> 's/MIPS_ABI_DEFAULT=ABI_64/MIPS_ABI_DEFAULT=ABI_N32/g')
>>>>> +                       ;;
>>>>>                  mips64el-st-linux-gnu)
>>>>>                          tm_file="${tm_file} mips/st.h"
>>>>>                          tmake_file="${tmake_file} mips/t-st"
>>>>>
>>>>>
>>>>> See the gcc-multiarch.diff in gcc-4.8 for this patch.
>>>>>
>>>>> Thank your very much.
>>>>>
>>>>>
>>>>
>
>
>
> --
> Yunqiang Su



-- 
Yunqiang Su