Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
acf15259
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
acf15259
编写于
3月 18, 2016
作者:
A
Andy Polyakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Windows build system: get uplink right.
Reviewed-by:
N
Richard Levitte
<
levitte@openssl.org
>
上级
d8292af4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
16 addition
and
34 deletion
+16
-34
Configurations/00-base-templates.conf
Configurations/00-base-templates.conf
+1
-1
Configurations/10-main.conf
Configurations/10-main.conf
+7
-4
crypto/build.info
crypto/build.info
+2
-0
ms/uplink-ia64.pl
ms/uplink-ia64.pl
+5
-0
ms/uplink-x86_64.pl
ms/uplink-x86_64.pl
+1
-1
ms/uplink.c
ms/uplink.c
+0
-28
未找到文件。
Configurations/00-base-templates.conf
浏览文件 @
acf15259
...
...
@@ -125,7 +125,7 @@
template
=>
1
,
apps_aux_src
=>
add
(
"../ms/applink.c"
),
uplink_aux_src
=>
add
(
"../ms/uplink.c"
),
shared_defines
=>
add
(
"OPENSSL_USE_APPLINK"
, {
separator
=>
undef
}
),
defines
=>
add
(
"OPENSSL_USE_APPLINK"
),
},
x86_uplink
=> {
inherit_from
=> [
"uplink_common"
],
...
...
Configurations/10-main.conf
浏览文件 @
acf15259
...
...
@@ -1237,7 +1237,7 @@ sub vc_wince_info {
dso_scheme
=>
"win32"
,
},
"VC-noCE-common"
=> {
inherit_from
=> [
"VC-common"
,
"uplink_common"
],
inherit_from
=> [
"VC-common"
],
cflags
=>
add
(
picker
(
default
=>
"-DUNICODE -D_UNICODE"
,
debug
=>
sub
{
...
...
@@ -1268,7 +1268,8 @@ sub vc_wince_info {
build_scheme
=>
add
(
"VC-W64"
, {
separator
=>
undef
}),
},
"VC-WIN64I"
=> {
inherit_from
=> [
"VC-WIN64-common"
,
asm
(
"ia64_asm"
) ],
inherit_from
=> [
"VC-WIN64-common"
,
asm
(
"ia64_asm"
),
sub
{ $
disabled
{
shared
} ? () :
"ia64_uplink"
} ],
as
=>
"ias"
,
asflags
=>
"-d debug"
,
asoutflag
=>
"-o"
,
...
...
@@ -1277,7 +1278,8 @@ sub vc_wince_info {
perlasm_scheme
=>
"ias"
,
},
"VC-WIN64A"
=> {
inherit_from
=> [
"VC-WIN64-common"
,
asm
(
"x86_64_asm"
) ],
inherit_from
=> [
"VC-WIN64-common"
,
asm
(
"x86_64_asm"
),
sub
{ $
disabled
{
shared
} ? () :
"x86_64_uplink"
} ],
as
=>
sub
{
vc_win64a_info
()->{
as
} },
asflags
=>
sub
{
vc_win64a_info
()->{
asflags
} },
asoutflag
=>
sub
{
vc_win64a_info
()->{
asoutflag
} },
...
...
@@ -1289,7 +1291,8 @@ sub vc_wince_info {
"VC-WIN32"
=> {
# x86 Win32 target defaults to ANSI API, if you want UNICODE,
# configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE'
inherit_from
=> [
"VC-noCE-common"
,
asm
(
"x86_asm"
) ],
inherit_from
=> [
"VC-noCE-common"
,
asm
(
"x86_asm"
),
sub
{ $
disabled
{
shared
} ? () :
"x86_uplink"
} ],
as
=>
sub
{
my
$
ver
=`
nasm
-
v
2
>
NUL
`;
my
$
vew
=`
nasmw
-
v
2
>
NUL
`;
return
$
ver
ge
$
vew
?
"nasm"
:
"nasmw"
},
...
...
crypto/build.info
浏览文件 @
acf15259
...
...
@@ -15,6 +15,8 @@ GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)"
DEPEND[buildinf.h]=../configdata.pm
GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)
GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl $(PERLASM_SCHEME)
GENERATE[uplink-ia64.s]=../ms/uplink-ia64.pl $(PERLASM_SCHEME)
GENERATE[x86cpuid.s]=x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
DEPEND[x86cpuid.s]=perlasm/x86asm.pl
...
...
ms/uplink-ia64.pl
浏览文件 @
acf15259
#!/usr/bin/env perl
$output
=
pop
;
open
STDOUT
,"
>
$output
";
$
0
=~
m/(.*[\/\\])[^\/\\]+$/
;
$dir
=
$
1
;
push
(
@INC
,"
${dir}
.
");
...
...
@@ -48,3 +51,5 @@ for ($i=1;$i<=$N;$i++) { print " data8 \@fptr(lazy$i#)\n"; }
print
<<___;
.size OPENSSL_UplinkTable,.-OPENSSL_UplinkTable#
___
close
STDOUT
;
ms/uplink-x86_64.pl
浏览文件 @
acf15259
#!/usr/bin/env perl
$output
=
shift
;
$output
=
pop
;
$
0
=~
m/(.*[\/\\])[^\/\\]+$/
;
$dir
=
$
1
;
open
OUT
,"
|
\"
$^X
\"
${dir}
../crypto/perlasm/x86_64-xlate.pl
$output
";
*STDOUT
=
*OUT
;
...
...
ms/uplink.c
浏览文件 @
acf15259
...
...
@@ -90,34 +90,6 @@ void OPENSSL_Uplink(volatile void **table, int index)
table
[
index
]
=
func
;
}
#if defined(_MSC_VER) && defined(_M_IX86) && !defined(OPENSSL_NO_INLINE_ASM)
# define LAZY(i) \
__declspec(naked) static void lazy##i (void) { \
_asm push i \
_asm push OFFSET OPENSSL_UplinkTable \
_asm call OPENSSL_Uplink \
_asm add esp,8 \
_asm jmp OPENSSL_UplinkTable+4*i }
# if APPLINK_MAX>25
# error "Add more stubs..."
# endif
/* make some in advance... */
LAZY
(
1
)
LAZY
(
2
)
LAZY
(
3
)
LAZY
(
4
)
LAZY
(
5
)
LAZY
(
6
)
LAZY
(
7
)
LAZY
(
8
)
LAZY
(
9
)
LAZY
(
10
)
LAZY
(
11
)
LAZY
(
12
)
LAZY
(
13
)
LAZY
(
14
)
LAZY
(
15
)
LAZY
(
16
)
LAZY
(
17
)
LAZY
(
18
)
LAZY
(
19
)
LAZY
(
20
)
LAZY
(
21
)
LAZY
(
22
)
LAZY
(
23
)
LAZY
(
24
)
LAZY
(
25
)
void
*
OPENSSL_UplinkTable
[]
=
{
(
void
*
)
APPLINK_MAX
,
lazy1
,
lazy2
,
lazy3
,
lazy4
,
lazy5
,
lazy6
,
lazy7
,
lazy8
,
lazy9
,
lazy10
,
lazy11
,
lazy12
,
lazy13
,
lazy14
,
lazy15
,
lazy16
,
lazy17
,
lazy18
,
lazy19
,
lazy20
,
lazy21
,
lazy22
,
lazy23
,
lazy24
,
lazy25
,
};
#endif
#ifdef SELFTEST
main
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录