_s390

Gbp-Pq: Name 10_s390.diff

diff --git a/CONFIG/src/SpewMakeInc.c b/CONFIG/src/SpewMakeInc.c
index a023f9e20b5e9c5a5a0f3aca57d8edcb4ab36266..0be92db5f719a3e39086589555810412104f27ed 100644 (file)
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
@@ -404,7 +404,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 (OS == OSAIX)
       return((ptrbits == 64) ? "-maix64" : "-maix32");
 
@@ -801,8 +801,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 1652e248ead21157cbd57f6b0b89bbefa5c90a1c..d1ae621c2375973ba64466f846dcd164f4bcd765 100644 (file)
--- a/CONFIG/src/probe_comp.c
+++ b/CONFIG/src/probe_comp.c
@@ -598,7 +598,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 (OS == OSAIX)
       return((ptrbits == 64) ? "-maix64" : "-maix32");