From: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
Date: Sat, 24 Jan 2015 22:06:27 +0000 (+0000)
Subject: _s390
X-Git-Tag: archive/raspbian/3.10.3-3+rpi1~2^2^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d8807c27abd4ebe5d97450edb4f6c1a80d6e0719;p=atlas.git

_s390


Gbp-Pq: Name 10_s390.diff
---

diff --git a/CONFIG/src/SpewMakeInc.c b/CONFIG/src/SpewMakeInc.c
index 8ad3fba..7b9822e 100644
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
@@ -394,7 +394,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enum MACHTYPE arch, int ptrbits,
    if (MachIsMIPS(arch))
       return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
    if (MachIsS390(arch))
-      return((ptrbits == 64) ? "-m64" : "-m31");
+      return(sp);
    if (!CompIsGcc(comp))
    {
 /*
@@ -774,8 +774,6 @@ int main(int nargs, char **args)
             fprintf(fpout, "_fbsd");
       }
    }
-   if (MachIsS390(mach))
-      fprintf(fpout, ptrbits == 32 ? "-m31" : "-m64");
    fprintf(fpout, "\n   F77SYSLIB = %s\n", f77lib ? f77lib : "");
    fprintf(fpout, "   BC = $(KC)\n");
    fprintf(fpout, "   NCFLAGS = $(KCFLAGS)\n");
diff --git a/CONFIG/src/probe_comp.c b/CONFIG/src/probe_comp.c
index 4cdf8d4..e6c4346 100644
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
@@ -587,7 +587,7 @@ char *GetPtrbitsFlag(enum OSTYPE OS, enum MACHTYPE arch, int ptrbits,
    if (MachIsMIPS(arch))
       return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
    if (MachIsS390(arch))
-      return((ptrbits == 64) ? "-m64" : "-m31");
+      return(sp);
    if (!CompIsGcc(comp))
    {
 /*