r36395 - in /packages/atlas/trunk/debian/patches: 10_atlconf_1_s390.diff 10_s390.diff 11_build_s390.diff 14_probe_s390.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun Apr 18 17:38:39 2010
New Revision: 36395

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36395
Log:
Simplification of the s390 detection

Added:
    packages/atlas/trunk/debian/patches/10_s390.diff
Removed:
    packages/atlas/trunk/debian/patches/10_atlconf_1_s390.diff
    packages/atlas/trunk/debian/patches/11_build_s390.diff
    packages/atlas/trunk/debian/patches/14_probe_s390.diff

Added: packages/atlas/trunk/debian/patches/10_s390.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/10_s390.diff?rev=36395&op=file
==============================================================================
--- packages/atlas/trunk/debian/patches/10_s390.diff (added)
+++ packages/atlas/trunk/debian/patches/10_s390.diff Sun Apr 18 17:38:39 2010
@@ -1,0 +1,39 @@
+--- CONFIG//include/atlconf.h.orig	2010-04-18 17:25:13.000000000 +0000
++++ CONFIG//include/atlconf.h	2010-04-18 17:25:22.000000000 +0000
+@@ -47,6 +47,14 @@
+ #endif
+ #define MachIsPPC(mach_) \
+    ( (mach_) >= PPCG4 && (mach_) <= PPCG5 )
++#ifdef __s390__
++#define MachIsS390(mach_) \
++  ( __s390__ )
++#else
++#define MachIsS390(mach_) \
++   ( 0 )
++#endif
++
+ 
+ static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
+ static char *f2c_intstr[5] =
+--- CONFIG//src/probe_comp.c.orig	2010-04-18 17:25:35.000000000 +0000
++++ CONFIG//src/probe_comp.c	2010-04-18 17:25:51.000000000 +0000
+@@ -510,6 +510,8 @@
+ 
+    if (MachIsIA64(arch))
+       return(sp);
++   if (MachIsS390(arch))
++      return(sp);
+    if (MachIsMIPS(arch))
+       return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+    if (!CompIsGcc(comp))
+--- CONFIG//src/SpewMakeInc.c.orig	2010-04-18 17:26:01.000000000 +0000
++++ CONFIG//src/SpewMakeInc.c	2010-04-18 17:26:12.000000000 +0000
+@@ -340,6 +340,8 @@
+ 
+    if (MachIsIA64(arch))
+       return(sp);
++   if (MachIsS390(arch))
++      return(sp);
+    if (MachIsMIPS(arch))
+       return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+    if (!CompIsGcc(comp))