Changeset 41dde6 in git for libpolys/misc/auxiliary.h

Timestamp:

Apr 19, 2011, 3:16:16 PM (12 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

Children:

72b8801dbb1081f0965bc77daff3ec9da62f800a

Parents:

aa450d0e542b7d92cb13033a49556c48bed0fa0b

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-04-19 15:16:16+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:19+01:00

Message:

- moved the definitions of HAVE_MULT_MOD, HAVE_DIV_MOD, and HAVE_GENERIC_ADD to cpu-check.m4
- generate misc/auxiliary.h in configure script

File:

• libpolys/misc/auxiliary.h (modified) (4 diffs)

libpolys/misc/auxiliary.h

@@ +1 @@
+/* misc/auxiliary.h.  Generated from auxiliary.h.in by configure.  */
 /*****************************************************************************\
  * Computer Algebra System SINGULAR    
@@ -19 +20 @@
 
 // ----------------- which parts/extensions of Singular to build
+#ifndef HAVE_RINGS
 #define HAVE_RINGS
+#endif
+
+#ifndef HAVE_PLURAL
 #define HAVE_PLURAL
+#endif
 
 // no factory yet...
+// #ifndef HAVE_FACTORY
 // #define HAVE_FACTORY
-
+// #endif
 
 // ----------------  end of parts/extensions
 // -----------------  configure stuff
 
-/*
-// 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
-// Define sizeof(long)
-#define SIZEOF_LONG 4
-*/
-
 // TODO: the following should go to some config.h... no?
 
 /* Define version as a string */
+#ifndef S_VERSION1
 #define S_VERSION1 "spielwiese"
+#endif
 
 /* Absolute pathname of root directory of Singular source */
+#ifndef S_ROOT_DIR
 #define S_ROOT_DIR ""
+#endif
 
 // ----------------- end of configure stuff
@@ -71 +67 @@
 #endif
 
-#define SIZEOF_LONG (LONG_BIT/CHAR_BIT)
+#define SIZEOF_LONG 8
 // another option for SIZEOF_LONG: use omConfig included in <omalloc/omalloc.h>...
 
@@ -132 +128 @@
 // ---------------- defines which depend on the settings above
 
-#if defined(SI_CPU_I386) || defined(SI_CPU_X86_64)
-  // the following settings seems to be better on i386 and x86_64 processors
-  // define if a*b is with mod instead of tables
-#define HAVE_MULT_MOD
-  // #define HAVE_GENERIC_ADD
-  // #ifdef HAVE_MULT_MOD
-  // #define HAVE_DIV_MOD
-  // #endif
-#elif defined(SI_CPU_IA64)
-  // the following settings seems to be better on itanium processors
-  // #define HAVE_MULT_MOD
-#define HAVE_GENERIC_ADD
-  // #ifdef HAVE_MULT_MOD
-  // #define HAVE_DIV_MOD
-  // #endif
-#elif defined(SI_CPU_SPARC)
-  // #define HAVE_GENERIC_ADD
-#define HAVE_MULT_MOD
-#ifdef HAVE_MULT_MOD
-#define HAVE_DIV_MOD
-#endif
-#elif defined(SI_CPU_PPC)
-  // the following settings seems to be better on ppc processors
-  // testet on: ppc_Linux, 740/750 PowerMac G3, 512k L2 cache
-#define HAVE_MULT_MOD
-  // #ifdef HAVE_MULT_MOD
-  // #define HAVE_DIV_MOD
-  // #endif
-#endif
-
+#ifndef HAVE_MULT_MOD
+#define HAVE_MULT_MOD 1
+#endif
+
+#ifndef HAVE_DIV_MOD
+/* #undef HAVE_DIV_MOD */
+#endif
+
+#ifndef HAVE_GENERIC_ADD
+/* #undef HAVE_GENERIC_ADD */
+#endif
 
 /*******************************************************************