_s390

Gbp-Pq: Name 10_s390.diff

diff --git a/CONFIG/src/SpewMakeInc.c b/CONFIG/src/SpewMakeInc.c
index 8ad3fba9d2061533b9e309efa912447575c9a5f8..7b9822ee1c81a11b17685a581e8dd220f34ce69f 100644 (file)
--- 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 4cdf8d4deaf3043412c4b5de46da2679b1a5a70b..e6c434681d992e1f401049d158da95c3e27e5955 100644 (file)
--- 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))
    {
 /*