Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_hotspot
提交
75d6a065
D
dragonwell8_hotspot
项目概览
openanolis
/
dragonwell8_hotspot
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_hotspot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
75d6a065
编写于
5月 21, 2018
作者:
K
kevinw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8203349: 8u hotspot should recognise later Windows compilers
Reviewed-by: erikj
上级
f47626c1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
70 addition
and
2 deletion
+70
-2
make/windows/makefiles/compile.make
make/windows/makefiles/compile.make
+55
-0
make/windows/makefiles/sanity.make
make/windows/makefiles/sanity.make
+7
-0
make/windows/makefiles/vm.make
make/windows/makefiles/vm.make
+2
-2
src/share/vm/runtime/vm_version.cpp
src/share/vm/runtime/vm_version.cpp
+6
-0
未找到文件。
make/windows/makefiles/compile.make
浏览文件 @
75d6a065
...
...
@@ -147,6 +147,15 @@ COMPILER_NAME=VS2010
!if
"$(MSC_VER)"
==
"1700"
COMPILER_NAME
=
VS2012
!
endif
!if
"$(MSC_VER)"
==
"1800"
COMPILER_NAME
=
VS2013
!
endif
!if
"$(MSC_VER)"
==
"1900"
COMPILER_NAME
=
VS2015
!
endif
!if
"$(MSC_VER)"
==
"1912"
COMPILER_NAME
=
VS2017
!
endif
!
endif
# By default, we do not want to use the debug version of the msvcrt.dll file
...
...
@@ -250,6 +259,52 @@ MT=mt.exe
SAFESEH_FLAG
=
/SAFESEH
!
endif
!if
"$(COMPILER_NAME)"
==
"VS2013"
PRODUCT_OPT_OPTION
=
/O2 /Oy-
FASTDEBUG_OPT_OPTION
=
/O2 /Oy-
DEBUG_OPT_OPTION
=
/Od
GX_OPTION
=
/EHsc
LD_FLAGS
=
/manifest
$(LD_FLAGS)
MP_FLAG
=
/MP
# Manifest Tool - used in VS2005 and later to adjust manifests stored
# as resources inside build artifacts.
!if
"x$(MT)"
==
"x"
MT
=
mt.exe
!
endif
SAFESEH_FLAG
=
/SAFESEH
!
endif
!if
"$(COMPILER_NAME)"
==
"VS2015"
PRODUCT_OPT_OPTION
=
/O2 /Oy-
FASTDEBUG_OPT_OPTION
=
/O2 /Oy-
DEBUG_OPT_OPTION
=
/Od
GX_OPTION
=
/EHsc
LD_FLAGS
=
/manifest
$(LD_FLAGS)
MP_FLAG
=
/MP
# Manifest Tool - used in VS2005 and later to adjust manifests stored
# as resources inside build artifacts.
!if
"x$(MT)"
==
"x"
MT
=
mt.exe
!
endif
SAFESEH_FLAG
=
/SAFESEH
!
endif
!if
"$(COMPILER_NAME)"
==
"VS2017"
PRODUCT_OPT_OPTION
=
/O2 /Oy-
FASTDEBUG_OPT_OPTION
=
/O2 /Oy-
DEBUG_OPT_OPTION
=
/Od
GX_OPTION
=
/EHsc
LD_FLAGS
=
/manifest
$(LD_FLAGS)
MP_FLAG
=
/MP
# Manifest Tool - used in VS2005 and later to adjust manifests stored
# as resources inside build artifacts.
!if
"x$(MT)"
==
"x"
MT
=
mt.exe
!
endif
SAFESEH_FLAG
=
/SAFESEH
!
endif
!if
"$(BUILDARCH)"
==
"i486"
LD_FLAGS
=
$(SAFESEH_FLAG)
$(LD_FLAGS)
!
endif
...
...
make/windows/makefiles/sanity.make
浏览文件 @
75d6a065
...
...
@@ -28,8 +28,15 @@ all: checkCL checkLink
checkCL
:
@
if
"
$(MSC_VER)
"
NEQ
"1310"
if
"
$(MSC_VER)
"
NEQ
"1399"
if
"
$(MSC_VER)
"
NEQ
"1400"
if
"
$(MSC_VER)
"
NEQ
"1500"
if
"
$(MSC_VER)
"
NEQ
"1600"
if
"
$(MSC_VER)
"
NEQ
"1700"
\
if
"
$(MSC_VER)
"
NEQ
"1800"
\
if
"
$(MSC_VER)
"
NEQ
"1900"
\
if
"
$(MSC_VER)
"
NEQ
"1912"
\
echo
***
WARNING
***
unrecognized cl.exe version
$(MSC_VER)
(
$(RAW_MSC_VER)
)
.
Use FORCE_MSC_VER to override automatic detection.
checkLink
:
@
if
"
$(LD_VER)
"
NEQ
"710"
if
"
$(LD_VER)
"
NEQ
"800"
if
"
$(LD_VER)
"
NEQ
"900"
if
"
$(LD_VER)
"
NEQ
"1000"
if
"
$(LD_VER)
"
NEQ
"1100"
\
if
"
$(LD_VER)
"
NEQ
"1200"
\
if
"
$(LD_VER)
"
NEQ
"1300"
\
if
"
$(LD_VER)
"
NEQ
"1400"
\
if
"
$(LD_VER)
"
NEQ
"1412"
\
echo
***
WARNING
***
unrecognized link.exe version
$(LD_VER)
(
$(RAW_LD_VER)
)
.
Use FORCE_LD_VER to override automatic detection.
make/windows/makefiles/vm.make
浏览文件 @
75d6a065
...
...
@@ -128,8 +128,8 @@ CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
!if
"$(USE_PRECOMPILED_HEADER)"
!=
"0"
CXX_USE_PCH
=
/Fp
"vm.pch"
/Yu
"precompiled.hpp"
!if
"$(COMPILER_NAME)"
==
"VS2012"
# VS2012
requires
this object file to be listed:
!if
"$(COMPILER_NAME)"
==
"VS2012"
||
"$(COMPILER_NAME)"
==
"VS2013"
||
"$(COMPILER_NAME)"
==
"VS2015"
||
"$(COMPILER_NAME)"
==
"VS2017"
# VS2012
and later require
this object file to be listed:
LD_FLAGS
=
$(LD_FLAGS)
_build_pch_file.obj
!
endif
!
else
...
...
src/share/vm/runtime/vm_version.cpp
浏览文件 @
75d6a065
...
...
@@ -218,6 +218,12 @@ const char* Abstract_VM_Version::internal_vm_info_string() {
#define HOTSPOT_BUILD_COMPILER "MS VC++ 10.0 (VS2010)"
#elif _MSC_VER == 1700
#define HOTSPOT_BUILD_COMPILER "MS VC++ 11.0 (VS2012)"
#elif _MSC_VER == 1800
#define HOTSPOT_BUILD_COMPILER "MS VC++ 12.0 (VS2013)"
#elif _MSC_VER == 1900
#define HOTSPOT_BUILD_COMPILER "MS VC++ 14.0 (VS2015)"
#elif _MSC_VER == 1912
#define HOTSPOT_BUILD_COMPILER "MS VC++ 15.5 (VS2017)"
#else
#define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录