Changeset 7afec5 in git

Timestamp:

Jun 10, 2008, 5:37:48 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7aae75d5f1a2b06869890ce4c0247d10993a2779

Parents:

5923597adfab618c0db7ef29609416a5726b7fe8

Message:

*hannes: SI_CPU_*


git-svn-id: file:///usr/local/Singular/svn/trunk@10753 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/configure (modified) (2 diffs)
• Singular/configure.in (modified) (2 diffs)
• Singular/mod2.h.in (modified) (2 diffs)
• kernel/mod2.h.in (modified) (2 diffs)

Singular/configure

@@ -567 +567 @@
 echo "configure:568: checking CPU for singular" >&5
 ac_cv_singcpuname=`uname -p`
-if test "$ac_cv_ac_cv_singcpuname" = sparc; then
-  cat >> confdefs.h <<\EOF
-#define SI_CPU_SPARC 1
-EOF
-
-fi
 echo $ac_n "checking uname for singular""... $ac_c" 1>&6
-echo "configure:577: checking uname for singular" >&5
+echo "configure:571: checking uname for singular" >&5
 if eval "test \"`echo '$''{'ac_cv_singuname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -612 +606 @@
 fi
 
+if test "$ac_cv_ac_cv_singcpuname" = sparc; then
+  cat >> confdefs.h <<\EOF
+#define SI_CPU_SPARC 1
+EOF
+
+fi
 if test "$ac_cv_singuname" = x86_64-Linux; then
   cat >> confdefs.h <<\EOF

Singular/configure.in

@@ -10 +10 @@
 AC_MSG_CHECKING(CPU for singular)
 ac_cv_singcpuname=`uname -p`
-if test "$ac_cv_ac_cv_singcpuname" = sparc; then
-  AC_DEFINE(SI_CPU_SPARC)
-fi
 AC_MSG_CHECKING(uname for singular)
 AC_CACHE_VAL(ac_cv_singuname,
@@ -41 +38 @@
 fi
 AC_SUBST(EXEC_EXT)
+if test "$ac_cv_ac_cv_singcpuname" = sparc; then
+  AC_DEFINE(SI_CPU_SPARC)
+fi
 if test "$ac_cv_singuname" = x86_64-Linux; then
   AC_DEFINE(SI_CPU_X86_64)

Singular/mod2.h.in

@@ -6 +6 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.127 2008-04-01 15:58:51 Singular Exp $
+ *  Version: $Id: mod2.h.in,v 1.128 2008-06-10 15:37:36 Singular Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -149 +149 @@
 /* Define to enable plural */
 #undef HAVE_PLURAL
+/* CPU type: i[3456]86: */
+#undef SI_CPU_I386
+/* CPU type: sparc: */
+#undef SI_CPU_SPARC
+/* CPU type: ppc: */
+#undef SI_CPU_PPC
+/* CPU type: IA64: */
+#undef SI_CPU_IA64
+/* CPU type: x86_64: */
+#undef SI_CPU_X86_64
 
 /*******************************************************************

kernel/mod2.h.in

@@ -6 +6 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.18 2008-04-01 15:58:51 Singular Exp $
+ *  Version: $Id: mod2.h.in,v 1.19 2008-06-10 15:37:48 Singular Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -149 +149 @@
 /* Define to enable plural */
 #undef HAVE_PLURAL
+/* CPU type: i[3456]86: */
+#undef SI_CPU_I386
+/* CPU type: sparc: */
+#undef SI_CPU_SPARC
+/* CPU type: ppc: */
+#undef SI_CPU_PPC
+/* CPU type: IA64: */
+#undef SI_CPU_IA64
+/* CPU type: x86_64: */
+#undef SI_CPU_X86_64
 
 /*******************************************************************