Changeset 1663 in Sophya for trunk


Ignore:
Timestamp:
Oct 1, 2001, 4:01:35 PM (24 years ago)
Author:
aubourg
Message:

darwin

Location:
trunk/ArchTOIPipe
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ArchTOIPipe/Kernel/Makefile.in

    r1480 r1663  
    4040 ifeq ($(CXX), cxx)
    4141  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
     42  LIBS := $(LIBS) -pthread
    4243 endif
    4344endif
    … …  
    7778libatkern.a: $(FILES)
    7879        $(AR) -cr libatkern.a $(FILES)
     80        ranlib libatkern.a
    7981        ln -f libatkern.a ../libatkern.a
    8082
    … …  
    8486
    8587%: %.o $(FILES)
    86         $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -pthread -o $@ -lm
     88        $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lm
    8789
    8890%.o:$(srcdir)/%.cc
    89         $(COMPILE.cc) -pthread -o $@ $<
     91        $(COMPILE.cc) -o $@ $<
    9092
    9193%.o:$(srcdir)/%.c
    92         $(COMPILE.c) -pthread -o $@ $<
     94        $(COMPILE.c) -o $@ $<
    9395
    9496

  • trunk/ArchTOIPipe/Kernel/toiprocessor.cc

    r1629 r1663  
    22#include "toimanager.h"
    33#include <pthread.h>
     4
     5#ifdef HAVE_VALUES_H
    46#include <values.h>
     7#endif
     8
     9#ifndef MAXINT
     10#define MAXINT 2147483647
     11#endif
     12
     13#ifdef HAVE_STDINT_H
     14#include <stdint.h>
     15#endif
    516
    617#ifdef WITH_SOPHYA
    … …  
    8899
    89100int TOIProcessor::getMaxIn() {
    90   int nIn = inIx.size();
    91   int maxIn = MAXINT;
     101  int_4 nIn = inIx.size();
     102  int_4 maxIn = MAXINT;
    92103  for (int i=0; i<nIn; i++) {
    93104    TOI* toi = inTOIs[i];
    94105    if (toi == NULL) continue;  // Protection - Reza  13/3/2001
    95     int x = toi->getMaxSn();
     106    int_4 x = toi->getMaxSn();
    96107    if (x < maxIn) maxIn = x;
    97108  }

  • trunk/ArchTOIPipe/ProcWSophya/Makefile.in

    r1480 r1663  
    4040 ifeq ($(CXX), cxx)
    4141  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
     42  LIBS := $(LIBS) -pthread
    4243 endif
    4344endif
    … …  
    7677libatsop.a: $(FILES)
    7778        $(AR) -cr libatsop.a $(FILES)
     79        ranlib libatkern.a
    7880        ln -f libatsop.a ../libatsop.a
    7981
    … …  
    8385
    8486%: %.o $(FILES)
    85         $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -pthread -o $@ -lm
     87        $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lm
    8688
    8789%.o:$(srcdir)/%.cc
    88         $(COMPILE.cc) -pthread -o $@ $<
     90        $(COMPILE.cc) -o $@ $<
    8991
    9092%.o:$(srcdir)/%.c
    91         $(COMPILE.c) -pthread -o $@ $<
     93        $(COMPILE.c) -o $@ $<
    9294
    9395

  • trunk/ArchTOIPipe/Processors/Makefile.in

    r1480 r1663  
    4040 ifeq ($(CXX), cxx)
    4141  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
     42  LIBS := $(LIBS) -pthread
    4243 endif
    4344endif
    … …  
    7576libatproc.a: $(FILES)
    7677        $(AR) -cr libatproc.a $(FILES) 
     78        ranlib libatproc.a
    7779        ln -f libatproc.a ../libatproc.a
    7880
    … …  
    8385
    8486%: %.o $(FILES)
    85         $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -pthread -o $@ -lm
     87        $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lm
    8688
    8789%.o:$(srcdir)/%.cc
    88         $(COMPILE.cc) -pthread -o $@ $<
     90        $(COMPILE.cc) -o $@ $<
    8991
    9092%.o:$(srcdir)/%.c
    91         $(COMPILE.c) -pthread -o $@ $<
     93        $(COMPILE.c) -o $@ $<
    9294
    9395

  • trunk/ArchTOIPipe/TestPipes/Makefile.in

    r1480 r1663  
    4040 ifeq ($(CXX), cxx)
    4141  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
     42  LIBS := $(LIBS) -pthread
    4243 endif
    4344endif
    … …  
    8182
    8283%: %.o $(FILES) $(LIBDEPS)
    83         $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -pthread -o $@ -lm
     84        $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lm
    8485
    8586%.o:$(srcdir)/%.cc
    86         $(COMPILE.cc) -pthread -o $@ $<
     87        $(COMPILE.cc) -o $@ $<
    8788
    8889%.o:$(srcdir)/%.c
    89         $(COMPILE.c) -pthread -o $@ $<
     90        $(COMPILE.c) -o $@ $<
    9091
    9192

  • trunk/ArchTOIPipe/conf.h.in

    r1365 r1663  
    1616#undef SIZEOF_LONG
    1717
     18/* The number of bytes in a long long.  */
     19#undef SIZEOF_LONG_LONG
     20
    1821/* The number of bytes in a long double.  */
    1922#undef SIZEOF_LONG_DOUBLE
    … …  
    2427/* Define if you have the m library (-lm).  */
    2528#undef HAVE_LIBM
     29
     30/* Define if you have the values.h header.  */
     31#undef HAVE_VALUES_H
     32
     33
     34

  • trunk/ArchTOIPipe/config.h

    r1477 r1663  
    99#ifndef WITH_SOPHYA
    1010#define NO_SOPHYA
     11
     12#ifdef HAVE_STDINT_H
     13#include <stdint.h>
     14  #define int_4 int4_t
     15  #define int_8 int8_t
     16  #define uint_8 uint8_t
     17#else
    1118#if SIZEOF_SHORT == 4
    1219  #define int_4  short int
    … …  
    1926#if SIZEOF_LONG == 8
    2027  #define int_8 long
     28  #define uint_8 unsigned long
     29#elif SIZEOF_LONG_LONG == 8
     30  #define int_8 long long
     31  #define uint_8 unsigned long long
    2132#else
    22   #error long is not 8 bytes... 
     33  #error no 8-byte long int...
     34#endif
    2335#endif
    2436#endif
    2537
    2638#endif
     39

  • trunk/ArchTOIPipe/configure

    r1477 r1663  
    10281028
    10291029
     1030echo $ac_n "checking size of long long""... $ac_c" 1>&6
     1031echo "configure:1032: checking size of long long" >&5
     1032if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
     1033  echo $ac_n "(cached) $ac_c" 1>&6
     1034else
     1035  if test "$cross_compiling" = yes; then
     1036    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
     1037else
     1038  cat > conftest.$ac_ext <<EOF
     1039#line 1040 "configure"
     1040#include "confdefs.h"
     1041#include <stdio.h>
     1042main()
     1043{
     1044  FILE *f=fopen("conftestval", "w");
     1045  if (!f) exit(1);
     1046  fprintf(f, "%d\n", sizeof(long long));
     1047  exit(0);
     1048}
     1049EOF
     1050if { (eval echo configure:1051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1051then
     1052  ac_cv_sizeof_long_long=`cat conftestval`
     1053else
     1054  echo "configure: failed program was:" >&5
     1055  cat conftest.$ac_ext >&5
     1056  rm -fr conftest*
     1057  ac_cv_sizeof_long_long=0
     1058fi
     1059rm -fr conftest*
     1060fi
     1061
     1062fi
     1063echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
     1064cat >> confdefs.h <<EOF
     1065#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
     1066EOF
     1067
     1068
    10301069echo $ac_n "checking size of float""... $ac_c" 1>&6
    1031 echo "configure:1032: checking size of float" >&5
     1070echo "configure:1071: checking size of float" >&5
    10321071if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
    10331072  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    10371076else
    10381077  cat > conftest.$ac_ext <<EOF
    1039 #line 1040 "configure"
     1078#line 1079 "configure"
    10401079#include "confdefs.h"
    10411080#include <stdio.h>
    … …  
    10481087}
    10491088EOF
    1050 if { (eval echo configure:1051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1089if { (eval echo configure:1090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    10511090then
    10521091  ac_cv_sizeof_float=`cat conftestval`
    … …  
    10681107
    10691108echo $ac_n "checking size of double""... $ac_c" 1>&6
    1070 echo "configure:1071: checking size of double" >&5
     1109echo "configure:1110: checking size of double" >&5
    10711110if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
    10721111  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    10761115else
    10771116  cat > conftest.$ac_ext <<EOF
    1078 #line 1079 "configure"
     1117#line 1118 "configure"
    10791118#include "confdefs.h"
    10801119#include <stdio.h>
    … …  
    10871126}
    10881127EOF
    1089 if { (eval echo configure:1090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1128if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    10901129then
    10911130  ac_cv_sizeof_double=`cat conftestval`
    … …  
    11071146
    11081147echo $ac_n "checking size of long double""... $ac_c" 1>&6
    1109 echo "configure:1110: checking size of long double" >&5
     1148echo "configure:1149: checking size of long double" >&5
    11101149if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
    11111150  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    11151154else
    11161155  cat > conftest.$ac_ext <<EOF
    1117 #line 1118 "configure"
     1156#line 1157 "configure"
    11181157#include "confdefs.h"
    11191158#include <stdio.h>
    … …  
    11261165}
    11271166EOF
    1128 if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1167if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    11291168then
    11301169  ac_cv_sizeof_long_double=`cat conftestval`
    … …  
    11481187
    11491188echo $ac_n "checking "for cfitsio lib"""... $ac_c" 1>&6
    1150 echo "configure:1151: checking "for cfitsio lib"" >&5
     1189echo "configure:1190: checking "for cfitsio lib"" >&5
    11511190MACHDIR=`uname`-$CXX
    11521191if test -f $ARCHBASEREP/$MACHDIR/Libs/libcfitsio.a; then
    … …  
    11731212
    11741213echo $ac_n "checking "for cfitsio includes"""... $ac_c" 1>&6
    1175 echo "configure:1176: checking "for cfitsio includes"" >&5
     1214echo "configure:1215: checking "for cfitsio includes"" >&5
    11761215if test -f $CFITSIODIR/fitsio.h; then
    11771216  cfitsincdir='-I$(CFITSIODIR)'
    … …  
    11851224
    11861225echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
    1187 echo "configure:1188: checking for sin in -lm" >&5
     1226echo "configure:1227: checking for sin in -lm" >&5
    11881227ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
    11891228if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    11931232LIBS="-lm  $LIBS"
    11941233cat > conftest.$ac_ext <<EOF
    1195 #line 1196 "configure"
     1234#line 1235 "configure"
    11961235#include "confdefs.h"
    11971236/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    12041243; return 0; }
    12051244EOF
    1206 if { (eval echo configure:1207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1245if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    12071246  rm -rf conftest*
    12081247  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    12331272
    12341273echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1235 echo "configure:1236: checking how to run the C preprocessor" >&5
     1274echo "configure:1275: checking how to run the C preprocessor" >&5
    12361275# On Suns, sometimes $CPP names a directory.
    12371276if test -n "$CPP" && test -d "$CPP"; then
    … …  
    12481287  # not just through cpp.
    12491288  cat > conftest.$ac_ext <<EOF
    1250 #line 1251 "configure"
     1289#line 1290 "configure"
    12511290#include "confdefs.h"
    12521291#include <assert.h>
    … …  
    12541293EOF
    12551294ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1256 { (eval echo configure:1257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1295{ (eval echo configure:1296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12571296ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12581297if test -z "$ac_err"; then
    … …  
    12651304  CPP="${CC-cc} -E -traditional-cpp"
    12661305  cat > conftest.$ac_ext <<EOF
    1267 #line 1268 "configure"
     1306#line 1307 "configure"
    12681307#include "confdefs.h"
    12691308#include <assert.h>
    … …  
    12711310EOF
    12721311ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1273 { (eval echo configure:1274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1312{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12741313ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12751314if test -z "$ac_err"; then
    … …  
    12821321  CPP="${CC-cc} -nologo -E"
    12831322  cat > conftest.$ac_ext <<EOF
    1284 #line 1285 "configure"
     1323#line 1324 "configure"
    12851324#include "confdefs.h"
    12861325#include <assert.h>
    … …  
    12881327EOF
    12891328ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1290 { (eval echo configure:1291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1329{ (eval echo configure:1330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12911330ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12921331if test -z "$ac_err"; then
    … …  
    13131352
    13141353echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1315 echo "configure:1316: checking for ANSI C header files" >&5
     1354echo "configure:1355: checking for ANSI C header files" >&5
    13161355if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    13171356  echo $ac_n "(cached) $ac_c" 1>&6
    13181357else
    13191358  cat > conftest.$ac_ext <<EOF
    1320 #line 1321 "configure"
     1359#line 1360 "configure"
    13211360#include "confdefs.h"
    13221361#include <stdlib.h>
    … …  
    13261365EOF
    13271366ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1328 { (eval echo configure:1329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1367{ (eval echo configure:1368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13291368ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13301369if test -z "$ac_err"; then
    … …  
    13431382  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    13441383cat > conftest.$ac_ext <<EOF
    1345 #line 1346 "configure"
     1384#line 1385 "configure"
    13461385#include "confdefs.h"
    13471386#include <string.h>
    … …  
    13611400  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    13621401cat > conftest.$ac_ext <<EOF
    1363 #line 1364 "configure"
     1402#line 1403 "configure"
    13641403#include "confdefs.h"
    13651404#include <stdlib.h>
    … …  
    13821421else
    13831422  cat > conftest.$ac_ext <<EOF
    1384 #line 1385 "configure"
     1423#line 1424 "configure"
    13851424#include "confdefs.h"
    13861425#include <ctype.h>
    … …  
    13931432
    13941433EOF
    1395 if { (eval echo configure:1396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1434if { (eval echo configure:1435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    13961435then
    13971436  :
    … …  
    14151454
    14161455fi
     1456
     1457for ac_hdr in values.h
     1458do
     1459ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
     1460echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
     1461echo "configure:1462: checking for $ac_hdr" >&5
     1462if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     1463  echo $ac_n "(cached) $ac_c" 1>&6
     1464else
     1465  cat > conftest.$ac_ext <<EOF
     1466#line 1467 "configure"
     1467#include "confdefs.h"
     1468#include <$ac_hdr>
     1469EOF
     1470ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
     1471{ (eval echo configure:1472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1472ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
     1473if test -z "$ac_err"; then
     1474  rm -rf conftest*
     1475  eval "ac_cv_header_$ac_safe=yes"
     1476else
     1477  echo "$ac_err" >&5
     1478  echo "configure: failed program was:" >&5
     1479  cat conftest.$ac_ext >&5
     1480  rm -rf conftest*
     1481  eval "ac_cv_header_$ac_safe=no"
     1482fi
     1483rm -f conftest*
     1484fi
     1485if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
     1486  echo "$ac_t""yes" 1>&6
     1487    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
     1488  cat >> confdefs.h <<EOF
     1489#define $ac_tr_hdr 1
     1490EOF
     1491 
     1492else
     1493  echo "$ac_t""no" 1>&6
     1494fi
     1495done
    14171496
    14181497

  • trunk/ArchTOIPipe/configure.in

    r1477 r1663  
    2222AC_CHECK_SIZEOF(int)
    2323AC_CHECK_SIZEOF(long)
     24AC_CHECK_SIZEOF(long long)
    2425AC_CHECK_SIZEOF(float)
    2526AC_CHECK_SIZEOF(double)
    … …  
    7071dnl Checks for header files.
    7172AC_HEADER_STDC
     73AC_CHECK_HEADERS(values.h stdint.h)
    7274
    7375outfiles="Makefile kernel/Makefile processors/Makefile pipes/Makefile"
Note: See TracChangeset for help on using the changeset viewer.