Mercurial > hg > graal-jvmci-8
comparison make/windows/makefiles/compile.make @ 3833:b1cbb0907b36
7016797: Hotspot: securely/restrictive load dlls and new API for loading system dlls
Summary: Created Windows Dll wrapped to handle jdk6 and jdk7 platform requirements, also provided more restictive Dll search orders for Windows system Dlls.
Reviewed-by: acorn, dcubed, ohair, alanb
author | zgu |
---|---|
date | Fri, 15 Apr 2011 09:34:43 -0400 |
parents | 99bd05619fa4 |
children | 719f7007c8e8 |
comparison
equal
deleted
inserted
replaced
3821:8107273fd204 | 3833:b1cbb0907b36 |
---|---|
79 !ifndef DEFAULT_COMPILER_NAME | 79 !ifndef DEFAULT_COMPILER_NAME |
80 CPP=ARCH_ERROR | 80 CPP=ARCH_ERROR |
81 !endif | 81 !endif |
82 | 82 |
83 CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" | 83 CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" |
84 | |
85 # Must specify this for sharedRuntimeTrig.cpp | 84 # Must specify this for sharedRuntimeTrig.cpp |
86 CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN" | 85 CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN" |
87 | 86 |
88 # Used for platform dispatching | 87 # Used for platform dispatching |
89 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_FAMILY_windows | 88 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_FAMILY_windows |
230 LINK_FLAGS= $(LINK_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ | 229 LINK_FLAGS= $(LINK_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ |
231 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ | 230 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ |
232 uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \ | 231 uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \ |
233 /opt:ICF,8 /map /debug | 232 /opt:ICF,8 /map /debug |
234 | 233 |
234 | |
235 !if $(MSC_VER) >= 1600 | |
236 LINK_FLAGS= $(LINK_FLAGS) psapi.lib | |
237 !endif | |
238 | |
235 # Resource compiler settings | 239 # Resource compiler settings |
236 RC=rc.exe | 240 RC=rc.exe |
237 RC_FLAGS=/D "HS_VER=$(HS_VER)" \ | 241 RC_FLAGS=/D "HS_VER=$(HS_VER)" \ |
238 /D "HS_DOTVER=$(HS_DOTVER)" \ | 242 /D "HS_DOTVER=$(HS_DOTVER)" \ |
239 /D "HS_BUILD_ID=$(HS_BUILD_ID)" \ | 243 /D "HS_BUILD_ID=$(HS_BUILD_ID)" \ |