From ee76c740f458feab8bc89b9dcb0b892682a9695c Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 15 Sep 2013 17:09:21 +0000 Subject: [PATCH] [CPPRT] Add support for x64 svn path=/trunk/; revision=60140 --- reactos/lib/sdk/cpprt/CMakeLists.txt | 6 +++++- reactos/lib/sdk/cpprt/amd64/cpprt.s | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 reactos/lib/sdk/cpprt/amd64/cpprt.s diff --git a/reactos/lib/sdk/cpprt/CMakeLists.txt b/reactos/lib/sdk/cpprt/CMakeLists.txt index fad1e39d393..9cb6ce5eedd 100644 --- a/reactos/lib/sdk/cpprt/CMakeLists.txt +++ b/reactos/lib/sdk/cpprt/CMakeLists.txt @@ -5,5 +5,9 @@ list(APPEND SOURCE ehvec.cpp typeinfo.cpp) -add_asm_files(cpprt_asm i386/cpprt.s) +if(ARCH STREQUAL "i386") + add_asm_files(cpprt_asm i386/cpprt.s) +elseif(ARCH STREQUAL "amd64") + add_asm_files(cpprt_asm amd64/cpprt.s) +endif() add_library(cpprt ${SOURCE} ${cpprt_asm}) diff --git a/reactos/lib/sdk/cpprt/amd64/cpprt.s b/reactos/lib/sdk/cpprt/amd64/cpprt.s new file mode 100644 index 00000000000..ae741c57869 --- /dev/null +++ b/reactos/lib/sdk/cpprt/amd64/cpprt.s @@ -0,0 +1,16 @@ +#include + +.code + +MACRO(DEFINE_ALIAS, alias, orig, type) +EXTERN &orig:&type +ALIAS <&alias> = <&orig> +ENDM + +; void __cdecl `eh vector constructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *),void (__cdecl*)(void *)) +DEFINE_ALIAS ??_L@YAXPEAX_KHP6AX0@Z2@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPEAX_KHP6AX0@Z2@Z + +; void __cdecl `eh vector destructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *)) +DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z + +END