| blob | 5d4e950fafbe7e03b62c216215ab593d558fba43 |
1 --- ck-0.5.2/configure.orig 2017-01-19 20:18:43.836138156 +0100
2 +++ ck-0.5.2/configure 2017-01-19 20:28:55.730816846 +0100
3 @@ -195,6 +195,7 @@
4 echo " --memory-model=N Specify memory model (currently tso, pso or rmo)"
5 echo " --vma-bits=N Specify valid number of VMA bits"
6 echo " --platform=N Force the platform type, instead of relying on autodetection"
7 + echo " --bits=N Set 32-bit or 64-bit build on Solaris/illumos"
8 echo " --use-cc-builtins Use the compiler atomic bultin functions, instead of the CK implementation"
9 echo
10 echo "The following options affect regression testing."
11 @@ -235,6 +236,9 @@
12 --enable-rtm)
13 RTM_ENABLE_SET="CK_MD_RTM_ENABLE"
14 ;;
15 + --environment=*)
16 + ENVIRONMENT=$value
17 + ;;
18 --cores=*)
19 CORES=$value
20 ;;
21 @@ -421,16 +425,26 @@
22 "i86pc")
23 RTM_ENABLE="CK_MD_RTM_DISABLE"
24 MM="${MM:-"CK_MD_TSO"}"
25 - if test -z "$ISA"; then ISA=`isainfo -n 2> /dev/null || echo i386` ; fi
26 - case "$ISA" in
27 - "amd64")
28 + if test "x$ENVIRONMENT" = "x"; then
29 + if test -z "$ISA"; then ISA=`isainfo -n 2> /dev/null || echo i386` ; fi
30 + case "$ISA" in
31 + "amd64")
32 + ENVIRONMENT=64
33 + ;;
34 + *)
35 + ENVIRONMENT=32
36 + ;;
37 + esac
38 + fi
39 + case "$ENVIRONMENT" in
40 + "64")
41 RTM_ENABLE=${RTM_ENABLE_SET:-"CK_MD_RTM_DISABLE"}
42 PLATFORM=x86_64
43 - ENVIRONMENT=64
44 ;;
45 - *)
46 + "32")
47 PLATFORM=x86
48 - ENVIRONMENT=32
49 + ;;
50 + *)
51 assert "$PLATFORM $ENVIRONMENT" "$PLATFORM $ENVIRONMENT" "unsupported"
52 ;;
53 esac