From 424f2742e7359b086e33b530ccc9b71fed7516ad Mon Sep 17 00:00:00 2001 From: Debian Science Team Date: Sat, 6 Aug 2016 18:27:27 +0000 Subject: [PATCH] _s390 Gbp-Pq: Name 10_s390.diff --- CONFIG/src/SpewMakeInc.c | 4 +--- CONFIG/src/probe_comp.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CONFIG/src/SpewMakeInc.c b/CONFIG/src/SpewMakeInc.c index a023f9e..0be92db 100644 --- 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 1652e24..d1ae621 100644 --- 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"); -- 2.30.2