comparison make/windows/makefiles/compile.make @ 10408:836a62f43af9

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 0380df7c3cd0
children 33c52908bcdb
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
50 # 6655385: For VS2003/2005 we now specify /Oy- (disable frame pointer 50 # 6655385: For VS2003/2005 we now specify /Oy- (disable frame pointer
51 # omission.) This has little to no effect on performance while vastly 51 # omission.) This has little to no effect on performance while vastly
52 # improving the quality of crash log stack traces involving jvm.dll. 52 # improving the quality of crash log stack traces involving jvm.dll.
53 53
54 # These are always used in all compiles 54 # These are always used in all compiles
55 CXX_FLAGS=/nologo /W3 /WX 55 CXX_FLAGS=$(EXTRA_CFLAGS) /nologo /W3 /WX
56 56
57 # Let's add debug information when Full Debug Symbols is enabled 57 # Let's add debug information when Full Debug Symbols is enabled
58 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" 58 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
59 CXX_FLAGS=$(CXX_FLAGS) /Zi 59 CXX_FLAGS=$(CXX_FLAGS) /Zi
60 !endif 60 !endif