Revert "Revert "Merge branch 'master' of https://github.com/mono/mono""
authorRolf Bjarne Kvinge <rolf@xamarin.com>
Fri, 25 Apr 2014 14:57:01 +0000 (16:57 +0200)
committerRolf Bjarne Kvinge <rolf@xamarin.com>
Fri, 25 Apr 2014 14:57:01 +0000 (16:57 +0200)
commit19f49f93f9ec66cfd54b458796c3b0800d6fb9c3
treef275d6501ba08a02d81df5413cbc321a3c6ae0ad
parentf37e86ff58d7b5a47484e60aded45bf8b98ae918
Revert "Revert "Merge branch 'master' of https://github.com/mono/mono""

This reverts commit 8f09dad4353bb75afebf96ad58d08f7e7f3bf56d.

8f09dad4353bb75afebf96ad58d08f7e7f3bf56d is reverting a merge commit,
which will not do what you think it does. It will revert much more,
so revert the revert to get back the unintentionally reverted commits.

It looks like the next commit (1a15d4ec541eaf20ed78eac53149b1b83e1450fe)
is doing the original intention (reverting 164f9cbec4f79cc013c7b1cf674e70e4573f4b36),
so this revert will leave the tree in a good state, with no pending
reverts.
52 files changed:
acinclude.m4
configure.in
eglib/configure.ac
mcs/class/Mono.CSharp/monotouch.cs
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/StepEventRequest.cs
mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
mcs/class/Mono.Debugger.Soft/Test/dtest.cs
mcs/class/System.Core/System/TimeZoneInfo.cs
mcs/class/System.Core/Test/System/TimeZoneInfoTest.cs
mcs/class/System/System.Net/HttpWebResponse.cs
mono/arch/Makefile.am
mono/arch/arm64/Makefile.am [new file with mode: 0644]
mono/arch/arm64/arm64-codegen.h [new file with mode: 0644]
mono/metadata/domain-internals.h
mono/metadata/mono-config.c
mono/metadata/sgen-archdep.h
mono/metadata/sgen-stw.c
mono/mini/Makefile.am.in
mono/mini/aot-compiler.c
mono/mini/aot-runtime.c
mono/mini/cpu-arm64.md [new file with mode: 0644]
mono/mini/debugger-agent.c
mono/mini/exceptions-arm64.c [new file with mode: 0644]
mono/mini/genmdesc.pl
mono/mini/helpers.c
mono/mini/image-writer.c
mono/mini/method-to-ir.c
mono/mini/mini-arch.h
mono/mini/mini-arm64.c [new file with mode: 0644]
mono/mini/mini-arm64.h [new file with mode: 0644]
mono/mini/mini-codegen.c
mono/mini/mini-gc.c
mono/mini/mini-ops.h
mono/mini/mini-trampolines.c
mono/mini/mini.c
mono/mini/mini.h
mono/mini/tramp-arm64.c [new file with mode: 0644]
mono/mini/unwind.c
mono/tests/Makefile.am
mono/utils/Makefile.am
mono/utils/mach-support-arm.c
mono/utils/mach-support.h
mono/utils/mono-codeman.c
mono/utils/mono-compiler.h
mono/utils/mono-context.c
mono/utils/mono-context.h
mono/utils/mono-hwcap-arm64.c [new file with mode: 0644]
mono/utils/mono-hwcap-arm64.h [new file with mode: 0644]
mono/utils/mono-sigcontext.h
mono/utils/mono-threads-mach-helper.c
mono/utils/mono-threads-mach.c