merged from trunk r2180 through r2188mitza_make

5 files changed, 50 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index bbf94d0b..d1739d0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Sun Mar  2 21:55:48 UTC 2014  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * config/pin_base.mpb:
+
+          Fixed link errors with debug version of Pintool on vc10.
+
+Fri Feb 28 04:12:34 UTC 2014  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * config/pin_base.mpb:
+        * config/pintool.mpb:
+
+          Added support for vc10.
+
+Tue Feb 25 14:17:16 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * templates/bmake.mpd:
+          For bcc32 default to -O1 for optimized builds, not to -O2
+          because testing showed that -O2 causes some problems with
+          TAO tests
+          svn c
+Thu Feb 20 07:55:16 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * templates/bmakecommon.mpt:
+          Improvements for bcc64
+
 Mon Feb 17 11:59:48 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * docs/templates/vc10.txt:
diff --git a/config/pin_base.mpb b/config/pin_base.mpb
index 31003773..dc2220ce 100644
--- a/config/pin_base.mpb
+++ b/config/pin_base.mpb
@@ -10,11 +10,20 @@ project {
 
   macros += BIGARRAY_MULTIPLIER=1 USING_XED
 
+  specific (vc9) {
+    runtime_library = 0
+    compile_flags += /Oy
+
+  }
+
+  specific (vc10) {
+	  runtime_library = MultiThreaded
+    macros += _ITERATOR_DEBUG_LEVEL=0
+  }
+
   specific (prop:windows) {
     macros += TARGET_WINDOWS _SECURE_SCL=0
 
-    compile_flags += /Oy
-    runtime_library = 0
     DisableSpecificWarning += 4530
     IgnoreAllDefaultLibraries = true
 
@@ -59,12 +68,14 @@ feature(ia32) {
   avoids += intel64
 
   specific (prop:windows) {
-    // DO NOT CHANGE ORDER
-    pure_libs += "ntdll-32.lib libxed.lib pin.lib pinvm.lib libcmt.lib libcpmt.lib"
-
     libpaths += $(PIN_ROOT)/ia32/lib \
                 $(PIN_ROOT)/ia32/lib-ext
   }
+
+  specific (prop:windows) {
+    // DO NOT CHANGE ORDER
+    lit_libs += libcpmt libcmt pinvm pin libxed ntdll-32
+  }
 }
 
 feature(intel64) {
@@ -79,6 +90,6 @@ feature(intel64) {
 
   specific (prop:windows) {
     // DO NOT CHANGE ORDER
-    pure_libs += "ntdll-64.lib libxed.lib pin.lib pinvm.lib libcmt.lib libcpmt.lib"
+    lit_libs += libcpmt libcmt pinvm pin libxed ntdll-64
   }
 }
diff --git a/config/pintool.mpb b/config/pintool.mpb
index fbe2a501..9e909b17 100644
--- a/config/pintool.mpb
+++ b/config/pintool.mpb
@@ -1,10 +1,15 @@
 // $Id$
 
 project : pin {
-  specific (prop:windows) {
+  specific (vc9) {
     link_options += /EXPORT:main /ENTRY:Ptrace_DllMainCRTStartup@12
   }
 
+  specific (vc10) {
+	link_options += /EXPORT:main
+    EntryPointSymbol = Ptrace_DllMainCRTStartup@12
+  }
+
   verbatim (make, top) {
     no_hidden_visibility = 1
   }
diff --git a/templates/bmake.mpd b/templates/bmake.mpd
index 536e65ea..adef1e39 100644
--- a/templates/bmake.mpd
+++ b/templates/bmake.mpd
@@ -8,7 +8,7 @@
 <%marker(top)%>
 <%foreach(configurations)%>
 !ifdef <%normalize(uc(configuration))%>
-OCFLAGS32    = <%if(optimize)%>-O2<%else%><%if(debug_prj)%>-v -y -Od -vi- -k<%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%>
+OCFLAGS32    = <%if(optimize)%>-O1<%else%><%if(debug_prj)%>-v -y -Od -vi- -k<%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%>
 OCFLAGS64    = <%if(optimize)%>-O2<%else%><%if(debug_prj)%>-O3 <%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%>
 CFG_DIR      = <%intermediate_dir%>\\
 LIBMODIFIER  = <%if(use_lib_modifier)%><%lib_modifier%><%endif%>
diff --git a/templates/bmakecommon.mpt b/templates/bmakecommon.mpt
index 35e52c02..84214b9c 100644
--- a/templates/bmakecommon.mpt
+++ b/templates/bmakecommon.mpt
@@ -9,7 +9,7 @@ common_libs          = ws2_32$(LIB_EXT)
 common32_libs        = import32$(LIB_EXT) cw32mti$(LIB_EXT)
 common64_libs        = import64$(LIB_EXT) cw64mti$(LIB_EXT)
 common32_flags       = -a8
-common64_flags       =
+common64_flags       = -fdelayed-template-parsing
 unicode_flags        = -WU
 unicode_lib_modifier = u
 unicode_exe_modifier = u