Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

2009-06-15 Zoltan Varga <vargaz@gmail.com>

	* CMakeLists.txt: Add mips support.

svn path=/trunk/mono/; revision=136104
  • Loading branch information...
commit 5d0486fb4a910f173f754417ca8f26dcd2a7f42d 1 parent 6acca86
Zoltan Varga authored June 15, 2009

Showing 2 changed files with 46 additions and 35 deletions. Show diff stats Hide diff stats

  1. 77  CMakeLists.txt
  2. 4  ChangeLog
77  CMakeLists.txt
@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 2.6.4)
5 5
 # - It would be nice to have a per-target VERBOSE setting
6 6
 # - or a way to change the setting name to 'V' and the output to CC <src>
7 7
 #   to be similar to the current build output
  8
+# - Add a cache to the manual checks
8 9
 
9 10
 # We use lowercase commands as advocated by the kde cmake coding style
10 11
 
@@ -497,19 +498,22 @@ check_c_source_compiles("
497 498
 void main () {}
498 499
 " GCC)
499 500
 
500  
-ac_msg_checking("for isinf")
501  
-set(compiles)
502  
-check_c_source_compiles("
  501
+if(NOT HAVE_ISINF)
  502
+  ac_msg_checking("for isinf")
  503
+  set(compiles)
  504
+  check_c_source_compiles("
503 505
 #include <math.h>
504 506
 void main () {
505 507
 int f = isinf (1);
506 508
 }
507 509
 " compiles)
508  
-if(compiles)
509  
-  ac_msg_result(yes)
510  
-  ac_define(HAVE_ISINF 1 "isinf available")
511  
-else()
512  
-  ac_msg_result(no)
  510
+  if(compiles)
  511
+	ac_msg_result(yes)
  512
+	ac_define(HAVE_ISINF 1 "isinf available")
  513
+	set(HAVE_ISINF 1 CACHE BOOL "Have the isinf function")
  514
+  else()
  515
+	ac_msg_result(no)
  516
+  endif()
513 517
 endif()
514 518
 
515 519
 # not 64 bit clean in cross-compile
@@ -559,12 +563,16 @@ endif()
559 563
 # A sanity check to catch cases where the package was unpacked
560 564
 # with an ancient tar program (Solaris)
561 565
 #
562  
-ac_msg_checking("integrity of package")
563  
-if(EXISTS ${srcdir}/${mcsdir}/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs)
564  
-  ac_msg_result(ok)
565  
-else()
566  
-  set(errorm "Your mono distribution is incomplete;  if unpacking from a tar file, make sure you use GNU tar;  see http://www.mono-project.com/IncompletePackage for more details")
567  
-  ac_msg_error(${errorm})
  566
+set(solaris-tar-check yes CACHE BOOL "Enable/disable solaris tar check")
  567
+
  568
+if(solaris-tar-check)
  569
+  ac_msg_checking("integrity of package")
  570
+  if(EXISTS ${srcdir}/${mcsdir}/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs)
  571
+	ac_msg_result(ok)
  572
+  else()
  573
+	set(errorm "Your mono distribution is incomplete;  if unpacking from a tar file, make sure you use GNU tar;  see http://www.mono-project.com/IncompletePackage for more details")
  574
+	ac_msg_error(${errorm})
  575
+  endif()
568 576
 endif()
569 577
 
570 578
 set(mcs_topdir ${top_srcdir}/${mcsdir})
@@ -2105,6 +2113,26 @@ elseif(host MATCHES "arm.*-linux.*")
2105 2113
   set(ACCESS_UNALIGNED no)
2106 2114
   set(JIT_SUPPORTED yes)
2107 2115
   set(jit_wanted true)
  2116
+elseif(host MATCHES "mips.*")
  2117
+  set(TARGET MIPS)
  2118
+  set(arch_target mips)
  2119
+  set(ACCESS_UNALIGNED no)
  2120
+  set(JIT_SUPPORTED yes)
  2121
+  set(jit_wanted true)
  2122
+###		ac_msg_checking(for mips n32)
  2123
+###		AC_TRY_COMPILE([], [
  2124
+###		void main () {
  2125
+###		#if _MIPS_SIM != _ABIN32
  2126
+###		#error Not mips n32
  2127
+###		#endif
  2128
+###   		}
  2129
+###		],[
  2130
+###		ac_msg_result(yes)
  2131
+###		set(sizeof_register 8)
  2132
+###		],[
  2133
+###		ac_msg_result(no)
  2134
+###		])
  2135
+###		;;
2108 2136
 else()
2109 2137
   message(FATAL_ERROR "Host ${host} not yet supported by the cmake build.")
2110 2138
 endif()
@@ -2123,27 +2151,6 @@ endif()
2123 2151
 #		set(TARGET MIPS;)
2124 2152
 #		set(ACCESS_UNALIGNED "no")
2125 2153
 #		;;
2126  
-###	mips*)
2127  
-###		set(TARGET MIPS;)
2128  
-###		set(arch_target mips;)
2129  
-###		set(ACCESS_UNALIGNED "no")
2130  
-###		set(JIT_SUPPORTED yes)
2131  
-###		set(jit_wanted true)
2132  
-
2133  
-###		ac_msg_checking(for mips n32)
2134  
-###		AC_TRY_COMPILE([], [
2135  
-###		void main () {
2136  
-###		#if _MIPS_SIM != _ABIN32
2137  
-###		#error Not mips n32
2138  
-###		#endif
2139  
-###   		}
2140  
-###		],[
2141  
-###		ac_msg_result(yes)
2142  
-###		set(sizeof_register 8)
2143  
-###		],[
2144  
-###		ac_msg_result(no)
2145  
-###		])
2146  
-###		;;
2147 2154
 ###	i*86-*-*)
2148 2155
 ###		set(TARGET X86;)
2149 2156
 ###		set(arch_target x86;)
4  ChangeLog
... ...
@@ -1,3 +1,7 @@
  1
+2009-06-15  Zoltan Varga  <vargaz@gmail.com>
  2
+
  3
+	* CMakeLists.txt: Add mips support.
  4
+
1 5
 2009-06-14  Zoltan Varga  <vargaz@gmail.com>
2 6
 
3 7
 	* scripts/CMakeLists.txt: New file.

0 notes on commit 5d0486f

Please sign in to comment.
Something went wrong with that request. Please try again.