[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#886316: gcc-7: fix typo for N32 conditions in debian/rules2



On Sat, Jan 6, 2018 at 1:13 PM, Matthias Klose <doko@debian.org> wrote:
> On 05.01.2018 14:26, YunQiang Su wrote:
>> Ohhh, you are right.
>>
>> in fact it is a quite simple patch:
>>
>> just in debian/rules2, there are 4 snap
>> $(biarchn32)-$(biarch32) for N32,
>>
>> the $(biarchn32) should be $(biarch64) here.
>
> please attach a proper patch.
>
> I also see in rules2: --with-arch-64=mips64r2

We have new mipsn32r6(el), in fact this patch was tested with gcc-7-cross only,
as the native test is not needed now.

And without this patch, the default ISA will be mips3, beside this, it works.

>
> is this correct, or should that be r6?

So, mipsn32(el) are r2 and mipsn32r6(el) is r6.

>
> again, please attach a (tested) patch, please for gcc-7 and gcc-8.
>

I will clone this bug to gcc-8

>
> thanks, Matthias
>
>> On Thu, Jan 4, 2018 at 8:22 PM, James Cowgill <jcowgill@debian.org> wrote:
>>> Hi,
>>>
>>> On 04/01/18 11:00, YunQiang Su wrote:
>>>> Package: src:gcc-7
>>>> Version: 7.2.0-18
>>>>
>>>> when detect mipsn32 triarch,
>>>> we use ifeq ($(biarchn32)-$(biarch32),yes-yes), but we should use
>>>>       ifeq ($(biarch64)-$(biarch32),yes-yes)
>>>>
>>>
>>> I guess you attached the wrong patch?
>>>
>>> James
>>>
>>
>>
>>
>



-- 
YunQiang Su
--- a/debian/rules2	2018-01-04 02:48:11.005697191 +0000
+++ b/debian/rules2	2018-01-04 02:46:51.940027390 +0000
@@ -593,7 +593,7 @@
 ifneq (,$(findstring mips64el-linux-gnuabin32,$(DEB_TARGET_GNU_TYPE)))
   CONFARGS += --with-madd4=no
   ifeq ($(multilib),yes)
-    ifeq ($(biarchn32)-$(biarch32),yes-yes)
+    ifeq ($(biarch64)-$(biarch32),yes-yes)
       CONFARGS += --enable-targets=all
       CONFARGS += --with-arch-64=mips64r2
       CONFARGS += --with-arch-32=mips32r2 --with-fp-32=xx
@@ -603,7 +603,7 @@
 
 ifneq (,$(findstring mips64-linux-gnuabin32,$(DEB_TARGET_GNU_TYPE)))
   ifeq ($(multilib),yes)
-    ifeq ($(biarchn32)-$(biarch32),yes-yes)
+    ifeq ($(biarch64)-$(biarch32),yes-yes)
       CONFARGS += --enable-targets=all
       CONFARGS += --with-arch-64=mips64r2
       CONFARGS += --with-arch-32=mips32r2 --with-fp-32=xx
@@ -658,7 +658,7 @@
 ifneq (,$(findstring mipsisa64r6el-linux-gnuabin32,$(DEB_TARGET_GNU_TYPE)))
   CONFARGS += --with-mips-plt
   ifeq ($(multilib),yes)
-    ifeq ($(biarchn32)-$(biarch32),yes-yes)
+    ifeq ($(biarch64)-$(biarch32),yes-yes)
       CONFARGS += --enable-targets=all
       CONFARGS += --with-arch-64=mips64r6 --with-tune-64=mips64r6
       CONFARGS += --with-arch-32=mips32r6 --with-tune-32=mips32r6
@@ -669,7 +669,7 @@
 ifneq (,$(findstring mipsisa64r6-linux-gnuabin32,$(DEB_TARGET_GNU_TYPE)))
   CONFARGS += --with-mips-plt
   ifeq ($(multilib),yes)
-    ifeq ($(biarchn32)-$(biarch32),yes-yes)
+    ifeq ($(biarch64)-$(biarch32),yes-yes)
       CONFARGS += --enable-targets=all
       CONFARGS += --with-arch-64=mips64r6 --with-tune-64=mips64r6
       CONFARGS += --with-arch-32=mips32r6 --with-tune-32=mips32r6

Reply to: