Cho Woong Suk [Thu, 26 Apr 2018 05:22:53 +0000 (14:22 +0900)]
support multiple dll path for plugin
Change-Id: Ia528f3c2daab56c7b03ca4f679028545bf62ce21
JongHeon Choi [Wed, 25 Apr 2018 05:32:51 +0000 (05:32 +0000)]
Merge "change log tag from ERR to INFO for C# log" into tizen
Cho Woong Suk [Wed, 25 Apr 2018 02:28:12 +0000 (11:28 +0900)]
change log tag from ERR to INFO for C# log
Change-Id: I99f14b4972d9c5ed815a62a0e9dd7ce0d7386751
Cho Woong Suk [Wed, 25 Apr 2018 02:28:54 +0000 (11:28 +0900)]
remove media related library from preloading to reduce crash from muse-client
Change-Id: Ib9a2c11df2c9a302202cf338ef92a9af4a54df48
Cho Woong Suk [Mon, 2 Apr 2018 11:25:56 +0000 (20:25 +0900)]
add command to nitool to remove system and app ni
Change-Id: I0b223900bfcdc708706c79920721acaa761a0aa6
Cho Woong Suk [Fri, 23 Feb 2018 02:45:10 +0000 (11:45 +0900)]
to send stdout to dlog, move logging thread creation point
Change-Id: I929a29ce4f92b547eaa74f5bdf95c5c83c202946
(cherry picked from commit
65ee437b4cf72d4e4720f5d9c7c2e1d0a0d28676)
Cho Woong Suk [Thu, 22 Feb 2018 07:45:11 +0000 (16:45 +0900)]
multi-architecture support
Change-Id: Id7e7fc24b6fa35ca547e441a297d5d6325fef41b
(cherry picked from commit
db615b8826eed0fad8ecccd687b0b77d620c8ebf)
Cho Woong Suk [Fri, 2 Feb 2018 02:57:16 +0000 (11:57 +0900)]
support multi-architecture library for lib dir
Change-Id: Id603602bf46d477f3aa57813ad2f7c19e07aad9c
(cherry picked from commit
39ed7656c266b754e71eb430c02ad60a980d869d)
JongHeon Choi [Mon, 5 Feb 2018 05:12:16 +0000 (05:12 +0000)]
Merge "Initialize coreclr in the candidate process and change ON_BOOT value to OFF" into tizen
Cho Woong Suk [Thu, 25 Jan 2018 02:37:48 +0000 (11:37 +0900)]
Initialize coreclr in the candidate process and change ON_BOOT value to OFF
Change-Id: Ia1984c310a59dc7d8d011f73c2dbd64164d8c7d1
(cherry picked from commit
43a03fd7fb4fb983f493fc42599a55950ced466c)
Cho Woong Suk [Wed, 24 Jan 2018 02:13:20 +0000 (11:13 +0900)]
add interval between each crossgen
Change-Id: I9688331704322452cebe0a454ca03cf6bcf6d9e9
(cherry picked from commit
1b1fd307e364a6a6088f0aff31158035b8d6fb85)
woongsuk cho [Tue, 2 Jan 2018 05:24:43 +0000 (05:24 +0000)]
Merge "Add option to enable clang Asan build." into tizen
Cho Woong Suk [Thu, 14 Dec 2017 23:04:23 +0000 (08:04 +0900)]
Remove code related to %caps.
caps is handled by security team.
Change-Id: I8998e71d86dc6436bcd262cde74da1a6a3cfdd76
Cho Woong Suk [Wed, 13 Dec 2017 07:30:12 +0000 (16:30 +0900)]
remove module/function name from stderr log
Change-Id: I48980d8579ed68a54460a795b550e853a80e67c5
chunseok lee [Thu, 14 Dec 2017 07:03:37 +0000 (16:03 +0900)]
Add COMPlus_ZapDisable env variable
This patch is required to enable gdbjit with NI files
Change-Id: Ic470761589480722fcae79720cd0bf6fe1004bbf
Signed-off-by: chunseok lee <chunseok.lee@samsung.com>
(cherry picked from commit
4f26ced1190958c415fadc1356e54ae19920b4ae)
Konstantin Baladurin [Wed, 6 Dec 2017 06:18:22 +0000 (09:18 +0300)]
Add option to enable clang Asan build.
Now we can add '--define "asan_enabled 1"' option for gbs to enable
Asan build.
Change-Id: Iac347386c26e3a72aa1275c312550df809aff003
Cho Woong Suk [Tue, 5 Dec 2017 05:24:53 +0000 (14:24 +0900)]
Coreclr needs original executable dll path not ni file path for dll loading.
ni file searching is automatically done in the inside of coreclr
Change-Id: I14fc7629431a3b082da06189dd2031a61b571afa
Cho Woong Suk [Tue, 28 Nov 2017 05:04:34 +0000 (14:04 +0900)]
redirect stdout and stderr to dlog
Change-Id: I4c5fe9f676e5fa3f5f8009eac910976e933acffd
Cho Woong Suk [Tue, 14 Nov 2017 06:32:31 +0000 (15:32 +0900)]
add exception handling code for null return
Change-Id: I41834f55e6d8d9e33a8d76bead8b281aec2c1a65
Cho Woong Suk [Fri, 3 Nov 2017 04:48:30 +0000 (13:48 +0900)]
add cap_sys_admin and cap_setgid to dotnet-launcher to use candidate process
Change-Id: I5034c7cca0d967708b69f3495d6665a4f49cf847
Cho Woong Suk [Fri, 3 Nov 2017 04:30:12 +0000 (13:30 +0900)]
add dotnet-launcher to files list to remove build error
Change-Id: I88b3dab1dff4a7e30bfe1e6dfaee06b2d8edaf6b
JongHeon Choi [Wed, 19 Jul 2017 05:49:39 +0000 (14:49 +0900)]
Remove caps due to security issue.
Apply caps directly in security-config
Change-Id: I476d6928065762427d360e22518bf8330266808f
Cho Woong Suk [Fri, 8 Sep 2017 02:24:07 +0000 (11:24 +0900)]
bug-patch:support -am option
Change-Id: I3e71bef55eea848e52bf4b417ddcab582b3421f0
Cho Woong Suk [Wed, 23 Aug 2017 06:24:40 +0000 (15:24 +0900)]
check return value of loaderMain to avoid crash
Change-Id: Ib5a740a34c7f8b171fb890dc1f97c51e93ad647d
Cho Woong Suk [Wed, 23 Aug 2017 02:33:23 +0000 (11:33 +0900)]
comment out unused code and change log
Change-Id: I944f7ad3320bd5a15d20332ba1934fc60b162a42
Cho Woong Suk [Thu, 2 Nov 2017 10:10:41 +0000 (19:10 +0900)]
big-fix: add reference dll for NI
Change-Id: Ia974ecd5469ff152204f6cf7c8adaa693b488088
(cherry picked from commit
195453317830e9b517950a6153e078f91f1e7500)
Inhwan Lee [Tue, 17 Oct 2017 01:45:31 +0000 (01:45 +0000)]
Merge "add plugin api to set coreclr info" into tizen
Cho Woong Suk [Tue, 17 Oct 2017 00:20:23 +0000 (09:20 +0900)]
remove unneccessary log to remove warning message
Change-Id: Icc79f0550ce69e266b00f1c95aeb029ea6579807
Cho Woong Suk [Thu, 12 Oct 2017 05:01:10 +0000 (14:01 +0900)]
add plugin api to set coreclr info
Change-Id: I83f76c7cfbb939e6b397150db1675c41e264b7fb
Youngjae Shin [Mon, 25 Sep 2017 07:15:23 +0000 (16:15 +0900)]
fix build warning
Change-Id: I67138414a61ba4594920830b4ad95e3f72b62e23
woongsuk cho [Wed, 13 Sep 2017 02:14:48 +0000 (02:14 +0000)]
Merge "Revert "temporal patch for setting LANG environment value"" into tizen
woongsuk cho [Wed, 13 Sep 2017 01:43:57 +0000 (01:43 +0000)]
Revert "temporal patch for setting LANG environment value"
This reverts commit
c9e5d8e142aa02dfeffe1d31ff819fffd899ae5a.
Change-Id: I0f09e4cedbbd0c1889d59f1d2a98c45261a7a6b8
Inhwan Lee [Thu, 7 Sep 2017 01:45:41 +0000 (01:45 +0000)]
Merge "update launching time measure tool" into tizen
Cho Woong Suk [Thu, 7 Sep 2017 01:43:51 +0000 (10:43 +0900)]
update launching time measure tool
Change-Id: Ie8c1e2ea9cb8d89f8d8ddaf2cf6485f902147a88
Cho Woong Suk [Mon, 4 Sep 2017 23:58:51 +0000 (08:58 +0900)]
bug-fix: to pass argument, change exectuable name to appid
Change-Id: I1873bec7879c97c449060b98c895d8437a3a45f4
(cherry picked from commit
8564ec92b5775026190ed190e81b272324fda4de)
Cho Woong Suk [Mon, 4 Sep 2017 23:58:51 +0000 (08:58 +0900)]
bug-fix: to pass argument, change exectuable name to appid
Change-Id: I1873bec7879c97c449060b98c895d8437a3a45f4
Cho Woong Suk [Wed, 30 Aug 2017 06:25:45 +0000 (15:25 +0900)]
change cmdline to executable path for standalone mode.
after adapting this change, crash dump will be generated with executable name not dotnet-launcher
Change-Id: I1052f2d8740f6d51dff978871252e2cbe10a1d63
JongHeon Choi [Mon, 28 Aug 2017 10:01:38 +0000 (19:01 +0900)]
Add null check
Change-Id: I94bb4d6f6a3b56e71bc25b7f2a9bf5ba6f233b2c
JongHeon Choi [Thu, 24 Aug 2017 07:17:40 +0000 (16:17 +0900)]
Add requires to launchpad
Change-Id: I69d11c13bc633e296833160cb52cf946b57778bf
Cho Woong Suk [Tue, 1 Aug 2017 09:28:14 +0000 (18:28 +0900)]
temporal patch for setting LANG environment value
Change-Id: I0999f2ef62119d9d1d6278d09be915399ba6b0a1
Cho Woong Suk [Wed, 19 Jul 2017 10:47:31 +0000 (19:47 +0900)]
remove getenv
Change-Id: Ia1c1c021ba8d31060643d44bf94aa6928761e957
CHUNSEOK LEE [Wed, 19 Jul 2017 22:36:39 +0000 (07:36 +0900)]
remove Self-Contained Deployment launcher
Change-Id: I88bb4540725a62cbe331225654a55be0dd2702b3
Signed-off-by: CHUNSEOK LEE <chunseok.lee@samsung.com>
JongHeon Choi [Mon, 17 Jul 2017 06:43:31 +0000 (15:43 +0900)]
Revert "Add signal handler"
This reverts commit
9923c6c1a7c00678b59cc15f2047be7e98be553f.
Change-Id: Ie04614e1ca81955149c42d42a98e25579bbeae0f
Cho Woong Suk [Fri, 23 Jun 2017 01:29:44 +0000 (10:29 +0900)]
support launcher plugin
Change-Id: Ie992819b4918e65fd733edec2e46136324c59e0e
Cho Woong Suk [Thu, 15 Jun 2017 07:00:25 +0000 (16:00 +0900)]
update nitool to support coreclr upgrade.
Change-Id: I441626207f77e1de9e6e376668de7bedf064f978
Cho Woong Suk [Fri, 19 May 2017 04:53:50 +0000 (13:53 +0900)]
support reference API directory to support PlatformNotSupport Exception
Change-Id: Ib4e389fcffea849cc2235a42b844e643c2e4b92a
JongHeon Choi [Mon, 15 May 2017 11:12:58 +0000 (20:12 +0900)]
Add cap_mac_admin for dotnet-launcher(Revert patch)
Change-Id: If40f2f7afe7a8c59235fc8a969c74ac90ef9c3e7
JongHeon Choi [Thu, 11 May 2017 05:03:17 +0000 (14:03 +0900)]
Add signal handler
Change-Id: I46bd2e0867261675c3f04352330df9022526cf20
JongHeon Choi [Thu, 27 Apr 2017 04:32:28 +0000 (13:32 +0900)]
Remove the cap_mac_admin for dotnet-launcher
Change-Id: I96ac4601185314edeee80e39bb67a512f1816610
JongHeon Choi [Tue, 25 Apr 2017 23:36:35 +0000 (08:36 +0900)]
crossgen bug fixed
Change-Id: Ia8632e7b66cabbfd2d1c780d85db52462e1db38e
JongHeon Choi [Tue, 25 Apr 2017 08:26:05 +0000 (17:26 +0900)]
Bug fixed for performance_test
Change-Id: I7e3e42defbd9cf25da8d605c2d8dc8cc75267a18
woongsuk cho [Tue, 25 Apr 2017 07:26:20 +0000 (07:26 +0000)]
Merge "set env UNW_ARM_UNWIND_METHOD value on ARM platform" into tizen
Inhwan Lee [Tue, 25 Apr 2017 04:55:35 +0000 (13:55 +0900)]
set env UNW_ARM_UNWIND_METHOD value on ARM platform
Change-Id: Iab10502bc55f5bea33cf553a14838bdb56f6afd2
Inhwan Lee [Tue, 25 Apr 2017 04:10:08 +0000 (13:10 +0900)]
fix standalone crash issue
Change-Id: I62c0a302248bdd0f6a304300f6ba535604acf39d
JongHeon Choi [Wed, 19 Apr 2017 04:23:11 +0000 (13:23 +0900)]
Modify tizen coding style
Change-Id: I454c5c4296d9ab3e18d0ea40db0ca1061de67668
JongHeon Choi [Wed, 19 Apr 2017 01:05:52 +0000 (10:05 +0900)]
Basename bug fixed
Change-Id: Ia291696a444413b531cacaee52308fbb331a5703
JongHeon Choi [Mon, 17 Apr 2017 07:49:55 +0000 (16:49 +0900)]
Use application dll to tpa
Change-Id: I28c09d0e7ffa12f26c5bab0e4f0eba37ccfa9ef0
Jiyoung Yun [Fri, 14 Apr 2017 07:33:58 +0000 (16:33 +0900)]
Change dotnet runtime location
The location is changed to 2.0.0 from 1.0.0
Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
Change-Id: I6bfd32ee89b6f46de9f9e4d2627a1db7ef9b8b96
woongsuk cho [Thu, 13 Apr 2017 01:28:36 +0000 (18:28 -0700)]
Merge "Code style refactorting" into tizen
woongsuk cho [Thu, 13 Apr 2017 01:27:30 +0000 (18:27 -0700)]
Merge "Remove unnecessary executable flag" into tizen
JongHeon Choi [Thu, 13 Apr 2017 00:52:52 +0000 (09:52 +0900)]
Code style refactorting
Change-Id: I5a2eb4db8edcdfa3074212c476fecd7506d11e45
JongHeon Choi [Wed, 12 Apr 2017 09:34:56 +0000 (18:34 +0900)]
[SVACE] Modified to initialize class members
Change-Id: I284e901bec4adc73cd83fc149e469d13a3fb6ee0
Hyungju Lee [Wed, 12 Apr 2017 07:57:06 +0000 (16:57 +0900)]
Remove unnecessary executable flag
Change-Id: I19365bad8aa330455d69ef0cdde6a35a0261fa2c
Signed-off-by: Hyungju Lee <leee.lee@samsung.com>
Cho Woong Suk [Tue, 11 Apr 2017 01:18:16 +0000 (10:18 +0900)]
change smack and owner for generated ni file
Change-Id: Ia4c992b2984fe0b87e77bb06b031c67dcbbb8c9c
JongHeon Choi [Mon, 10 Apr 2017 10:37:33 +0000 (19:37 +0900)]
ExecuteAssembly not permit native image path
Change-Id: I76f11eb94bef7574a4495aec12ac864ed986e84c
JongHeon Choi [Mon, 10 Apr 2017 09:52:51 +0000 (18:52 +0900)]
[Release] dotnet-launcher 1.1.0-1
Change-Id: I8f1e6b57964b86b59a64dea9943f63ae3519bd5d
Cho Woong Suk [Mon, 10 Apr 2017 08:39:15 +0000 (17:39 +0900)]
refactoring launcher
Change-Id: Ic2912985e0bf5e21d823bcf34280bd2aea2f7a54
woongsuk cho [Fri, 7 Apr 2017 05:17:56 +0000 (22:17 -0700)]
Merge "Integrate the log tag with "DOTNET_LAUNCHER"" into tizen
JongHeon Choi [Thu, 30 Mar 2017 04:40:14 +0000 (13:40 +0900)]
Remove the Mono profile
Change-Id: If5ce5c0b76d626cfd38cfe607f20b277909f32db
JongHeon Choi [Thu, 30 Mar 2017 04:58:25 +0000 (13:58 +0900)]
Integrate the log tag with "DOTNET_LAUNCHER"
Change-Id: Ifdfbbbc991f2b554ead66bb28e9c647ae3ddfcca
JongHeon Choi [Wed, 29 Mar 2017 09:53:00 +0000 (18:53 +0900)]
Replace the unmanaged name of native module with the library path
Change-Id: I9e3ec63c9f485c02a97af0d8104c5384c32c0452
Inhwan Lee [Mon, 20 Mar 2017 01:28:03 +0000 (18:28 -0700)]
Merge "find dlls in the app directory first for app NI" into tizen
ideal.lee [Tue, 21 Feb 2017 05:35:47 +0000 (14:35 +0900)]
fix test script with change APP_CORE log
+ apply with 2017-02-23 binary
Change-Id: I3d372c162caa122a001ce637e28f1e88ed44fbbc
Cho Woong Suk [Fri, 17 Mar 2017 06:23:42 +0000 (15:23 +0900)]
find dlls in the app directory first for app NI
Change-Id: Id0e89694d0cb1889938741227bf882b3eb6560d4
JongHeon Choi [Wed, 8 Feb 2017 05:39:43 +0000 (14:39 +0900)]
Bug fix for multiple parameters of nitool
Change-Id: Iddca7fd903e6cb42caed952b803a3f3100497a59
woongsuk cho [Tue, 14 Mar 2017 04:08:27 +0000 (21:08 -0700)]
Merge "Add tool option for check launching memory" into tizen
chunseok lee [Fri, 3 Mar 2017 08:20:33 +0000 (17:20 +0900)]
change lldb path
Change-Id: I234138972d7ccc04c8cfa22a0d7b600a8757f4d5
Signed-off-by: chunseok lee <chunseok.lee@samsung.com>
woongsuk cho [Tue, 7 Mar 2017 10:10:59 +0000 (02:10 -0800)]
Merge "Add Self-Contained Deployment Launcher" into tizen
chunseok lee [Mon, 20 Feb 2017 06:50:30 +0000 (15:50 +0900)]
Add Self-Contained Deployment Launcher
Change-Id: I889de90eb72a645a32eb8110030fdb0496137d43
Signed-off-by: chunseok lee <chunseok.lee@samsung.com>
Inhwan Lee [Mon, 20 Feb 2017 06:40:38 +0000 (15:40 +0900)]
Pass the first argument that name of exe file
in .NET spec, we have to skip file name in the fist argument
ref : https://msdn.microsoft.com/en-us/library/
aa288457(v=vs.71).aspx
Change-Id: If6de1ca6721445ade894c529cb9915db7aaf6084
JongHeon Choi [Sun, 5 Feb 2017 23:31:06 +0000 (15:31 -0800)]
Merge "removre dotnet-launcher from passing argument" into tizen
JongHeon Choi [Fri, 2 Dec 2016 07:09:38 +0000 (16:09 +0900)]
Remove _preload_dir define in spec
Change-Id: I19082e6bfeba83c2c0f5189cf7da2dc8a3c3baad
JongHeon Choi [Sun, 5 Feb 2017 22:33:02 +0000 (07:33 +0900)]
Remove %ix86 from ExcludeArch
Change-Id: Ie0c13da339961683923d959178be7dacae4f2d60
Cho Woong Suk [Thu, 2 Feb 2017 09:39:17 +0000 (18:39 +0900)]
removre dotnet-launcher from passing argument
Change-Id: I016ea00ebe79b9bb498da6eb3259eccd7ba8d48e
JongHeon Choi [Fri, 20 Jan 2017 02:45:16 +0000 (11:45 +0900)]
Fix build error for upgrading toolchain
Change-Id: I847e364abd8c624df156f7e20c8eb0cc3b2843d8
Jiyoung Yun [Wed, 1 Feb 2017 02:16:15 +0000 (11:16 +0900)]
Move the location of .NET modules to %{_datadir}
Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
Change-Id: Ie415798dec69b62b53db734aad048db85f8427f9
Inhwan Lee [Tue, 17 Jan 2017 08:20:10 +0000 (17:20 +0900)]
Implement metadata plugin for appfw
If application has specific metadata,
appfw will call plugin that implemented
Only working for AOT with below metadata
"http://tizen.org/metadata/prefer_dotnet_aot"
Change-Id: I31a13b678ecfff3f430c4fad2656e5f358479cbf
JongHeon Choi [Wed, 4 Jan 2017 02:20:15 +0000 (11:20 +0900)]
Add tool option for check launching memory
Change-Id: Id683972b75950ff031550bd74c3d4003fb41d032
Pawel Andruszkiewicz [Thu, 5 Jan 2017 09:22:46 +0000 (10:22 +0100)]
Use executables when trying to resolve an assembly
Some applications define types referenced from XAML in the executable
files, this commit handles such cases.
Change-Id: I422e7ad1b8d463c8afac663a4eab58cd150c983a
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Inhwan Lee [Mon, 2 Jan 2017 11:48:10 +0000 (20:48 +0900)]
fix performance_test for tizen 3.0 mobile/wearable
appfw change policy about global application.
so performance test enable in various version for dotnet
Change-Id: I70bc78281d2b5718ddd9e55946e0ec54d4911e69
Cho Woong Suk [Mon, 2 Jan 2017 01:41:03 +0000 (10:41 +0900)]
Runtime directory is changed to /opt/usr/share/dotnet because of capacity shortage of rootfs
Change-Id: I0670b00e8b180bed23b4469304067dafb324fe0a
WonYoung Choi [Thu, 22 Dec 2016 04:41:31 +0000 (13:41 +0900)]
Apply dotnet RPM macros
dotnet-build-tools provides RPM macros to support C# build.
Each package doesn't need to define macros itself such as
%dotnet_assembly_path, %_dotnet_build_conf, %dotnet_assembly_files,
and so on.
Change-Id: I36e712984e689b938c5872befe4680044004a8de
JongHeon Choi [Fri, 23 Dec 2016 05:50:36 +0000 (14:50 +0900)]
Modify help message of nitool
Change-Id: Idcfd43cfafc597292ac1007ce6f718d0269e92b3
JongHeon Choi [Fri, 23 Dec 2016 04:58:31 +0000 (13:58 +0900)]
Add '--dll' option of nitool
* Create native image for dll
* ex) nitool --dll /usr/bin/Tizen.Runtime.Coreclr.dll
Change-Id: I9234719f66ae5f75002d132fa8183c4aabaaba4a
woongsuk cho [Tue, 20 Dec 2016 04:05:52 +0000 (20:05 -0800)]
Merge "add test tool for check launching time" into tizen
woongsuk cho [Tue, 20 Dec 2016 04:05:06 +0000 (20:05 -0800)]
Merge "AssemblyLoader should assist in loading all assemblies" into tizen
Inhwan Lee [Thu, 15 Dec 2016 05:27:39 +0000 (14:27 +0900)]
add test tool for check launching time
Change-Id: I4d29972eceb263559135f8ca7c659ffdaefd0c27
Pawel Andruszkiewicz [Fri, 9 Dec 2016 07:52:45 +0000 (08:52 +0100)]
AssemblyLoader should assist in loading all assemblies
The Resolving event from the AssemblyLoadContext is invoked each
time it fails to load an assembly. The default AssemblyLoadContext
is used internally i.e. when Assembly.Load() or Type.GetType(string)
methods are called. Registering for the Resolving event from the
default AssemblyLoadContext helps handling the unresolved
assemblies and fixes XAML-related issues in Xamarin.
TASK=TNET-136
TASK=TCAPI-1863
Change-Id: I0f5f4c2925829eac448a6184a3e19dbde5c1dfc0
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Cho Woong Suk [Fri, 16 Dec 2016 06:10:10 +0000 (15:10 +0900)]
bug-fix: do not pre-create bg and conformant.
Change-Id: I27cc5e44c72656f87eca5ef94f3c722c20254990
JongHeon Choi [Wed, 14 Dec 2016 08:10:14 +0000 (17:10 +0900)]
Exclude arm64 and i586 architecture
Change-Id: I52410a37cdb4dacf5c3789c23d0a0b5211e88a5b