Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bingbingbingbing
mono
提交
1bb1cfb5
M
mono
项目概览
bingbingbingbing
/
mono
与 Fork 源项目一致
从无法访问的项目Fork
通知
35
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mono
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1bb1cfb5
编写于
12月 23, 2010
作者:
M
Mantas Puida
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix for iOS simulator 4.2
上级
44963609
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
16 deletion
+25
-16
build_runtime_iphone.sh
build_runtime_iphone.sh
+9
-1
build_runtime_osx.pl
build_runtime_osx.pl
+12
-5
configure.in
configure.in
+2
-1
libgc/darwin_stop_world.c
libgc/darwin_stop_world.c
+1
-1
mono/utils/mono-filemap.c
mono/utils/mono-filemap.c
+0
-7
mono/utils/mono-sigcontext.h
mono/utils/mono-sigcontext.h
+1
-1
未找到文件。
build_runtime_iphone.sh
浏览文件 @
1bb1cfb5
#!/bin/sh
SDK_VERSION
=
4.2
ASPEN_ROOT
=
/Developer/Platforms/iPhoneOS.platform/Developer
ASPEN_SDK
=
$ASPEN_ROOT
/SDKs/iPhoneOS4.2.sdk/
SIMULATOR_ASPEN_ROOT
=
/Developer/Platforms/iPhoneSimulator.platform/Developer
ASPEN_SDK
=
$ASPEN_ROOT
/SDKs/iPhoneOS
${
SDK_VERSION
}
.sdk/
SIMULATOR_ASPEN_SDK
=
$SIMULATOR_ASPEN_ROOT
/SDKs/iPhoneSimulator
${
SDK_VERSION
}
.sdk
ORIG_PATH
=
$PATH
PRFX
=
$PWD
/tmp
...
...
@@ -110,10 +113,15 @@ build_iphone_crosscompiler ()
build_iphone_simulator
()
{
echo
"Building iPhone simulator static lib"
;
export
MACSYSROOT
=
"-isysroot
$SIMULATOR_ASPEN_SDK
"
export
MACSDKOPTIONS
=
"-miphoneos-version-min=3.0
$MACSYSROOT
"
export
CC
=
"
$SIMULATOR_ASPEN_ROOT
/usr/bin/gcc-4.2"
export
CXX
=
"
$SIMULATOR_ASPEN_ROOT
/usr/bin/g++-4.2"
perl build_runtime_osx.pl
-iphone_simulator
=
1
||
exit
1
echo
"Copying iPhone simulator static lib to final destination"
;
mkdir
-p
builds/embedruntimes/iphone
cp
mono/mini/.libs/libmono.a builds/embedruntimes/iphone/libmono-i386.a
unsetenv
}
usage
()
...
...
build_runtime_osx.pl
浏览文件 @
1bb1cfb5
...
...
@@ -70,8 +70,14 @@ if (not $skipbuild)
#we need to manually set the compiler to gcc4, because the 10.4 sdk only shipped with the gcc4 headers
#their setup is a bit broken as they dont autodetect this, but basically the gist is if you want to copmile
#against the 10.4 sdk, you better use gcc4, otherwise things go boink.
$ENV
{
CC
}
=
"
gcc-4.0
";
$ENV
{
CXX
}
=
"
gcc-4.0
";
unless
(
$ENV
{
CC
})
{
$ENV
{
CC
}
=
"
gcc-4.0
";
}
unless
(
$ENV
{
CXX
})
{
$ENV
{
CXX
}
=
"
gcc-4.0
";
}
if
(
$debug
)
{
...
...
@@ -86,8 +92,6 @@ if (not $skipbuild)
$ENV
{
CFLAGS
}
=
"
-DTARGET_IPHONE_SIMULATOR -g -O0
";
$macversion
=
"
10.5
";
$sdkversion
=
"
10.5
";
$ENV
{
CC
}
=
"
gcc-4.2
";
$ENV
{
CXX
}
=
"
gcc-4.2
";
}
#this will fail on a fresh working copy, so don't die on it.
...
...
@@ -108,7 +112,10 @@ if (not $skipbuild)
unshift
(
@autogenparams
,
"
--cache-file=osx.cache
");
unshift
(
@autogenparams
,
"
--disable-mcs-build
");
unshift
(
@autogenparams
,
"
--with-glib=embedded
");
unshift
(
@autogenparams
,
"
--with-macversion=
$macversion
");
if
(
!
$iphone_simulator
)
{
unshift
(
@autogenparams
,
"
--with-macversion=
$macversion
");
}
unshift
(
@autogenparams
,
"
--disable-nls
");
#this removes the dependency on gettext package
# From Massi: I was getting failures in install_name_tool about space
...
...
configure.in
浏览文件 @
1bb1cfb5
...
...
@@ -66,6 +66,7 @@ AC_ARG_WITH([macversion],
[ --with-macversion=<version> Choose minimum macos version],
[], [with_macversion=10.4])
if test -z MACSDKOPTIONS; then
MACSYSROOTBASE="-isysroot /Developer/SDKs"
if [[ "$with_macversion" == "10.4" ]]; then
MACSYSROOT="$MACSYSROOTBASE/MacOSX10.4u.sdk"
...
...
@@ -73,7 +74,7 @@ else
MACSYSROOT="$MACSYSROOTBASE/MacOSX""$with_macversion"".sdk"
fi
MACSDKOPTIONS="-mmacosx-version-min=$with_macversion $MACSYSROOT"
fi
# Thread configuration inspired by sleepycat's db
AC_MSG_CHECKING([host platform characteristics])
...
...
libgc/darwin_stop_world.c
浏览文件 @
1bb1cfb5
...
...
@@ -112,7 +112,7 @@ void GC_push_all_stacks() {
if
(
r
!=
KERN_SUCCESS
)
ABORT
(
"thread_get_state failed"
);
#if defined(I386)
#if
MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
#if
(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) || defined(TARGET_IPHONE_SIMULATOR)
lo
=
state
.
__esp
;
...
...
mono/utils/mono-filemap.c
浏览文件 @
1bb1cfb5
...
...
@@ -31,17 +31,10 @@ mono_file_map_open (const char* name)
guint64
mono_file_map_size
(
MonoFileMap
*
fmap
)
{
#ifdef TARGET_IPHONE_SIMULATOR
struct
stat64
stat_buf
;
if
(
fstat64
(
fileno
((
FILE
*
)
fmap
),
&
stat_buf
)
<
0
)
return
0
;
return
stat_buf
.
st_size
;
#else
struct
stat
stat_buf
;
if
(
fstat
(
fileno
((
FILE
*
)
fmap
),
&
stat_buf
)
<
0
)
return
0
;
return
stat_buf
.
st_size
;
#endif
}
int
...
...
mono/utils/mono-sigcontext.h
浏览文件 @
1bb1cfb5
...
...
@@ -23,7 +23,7 @@
#define UCONTEXT_REG_EDI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_edi)
#define UCONTEXT_REG_EIP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_eip)
#elif defined(__APPLE__)
# if
MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
# if
(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) || defined(TARGET_IPHONE_SIMULATOR)
#define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__eax)
#define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__ebx)
#define UCONTEXT_REG_ECX(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__ecx)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录