diff options
| author | klutzy <klutzytheklutzy@gmail.com> | 2013-08-11 17:56:24 +0900 |
|---|---|---|
| committer | klutzy <klutzytheklutzy@gmail.com> | 2013-08-26 22:14:23 +0900 |
| commit | 5118ef6ff02c650e54fc89318e7183e4e1cd3fa3 (patch) | |
| tree | 9a2653bd40f694665961064bc661978e7c758329 /src/rt | |
| parent | 501eea0842b71f3530c4178e7b50973a728280b6 (diff) | |
| download | rust-5118ef6ff02c650e54fc89318e7183e4e1cd3fa3.tar.gz rust-5118ef6ff02c650e54fc89318e7183e4e1cd3fa3.zip | |
rt: Remove leading underscore on Win64
Win64 convention does not use underscore.
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/arch/x86_64/_context.S | 2 | ||||
| -rw-r--r-- | src/rt/arch/x86_64/ccall.S | 5 | ||||
| -rw-r--r-- | src/rt/arch/x86_64/morestack.S | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/rt/arch/x86_64/_context.S b/src/rt/arch/x86_64/_context.S index f718cac9634..a8af27e3e4f 100644 --- a/src/rt/arch/x86_64/_context.S +++ b/src/rt/arch/x86_64/_context.S @@ -54,7 +54,7 @@ First four arguments: anyhow. */ -#if defined(__APPLE__) || defined(_WIN32) +#if defined(__APPLE__) #define SWAP_REGISTERS _swap_registers #else #define SWAP_REGISTERS swap_registers diff --git a/src/rt/arch/x86_64/ccall.S b/src/rt/arch/x86_64/ccall.S index d4bc37fee95..dbee5bcdc90 100644 --- a/src/rt/arch/x86_64/ccall.S +++ b/src/rt/arch/x86_64/ccall.S @@ -18,10 +18,13 @@ .text -#if defined(__APPLE__) || defined(_WIN32) +#if defined(__APPLE__) .globl ___morestack .private_extern MORESTACK ___morestack: +#elif defined(_WIN32) +.globl __morestack +__morestack: #else .globl __morestack .hidden __morestack diff --git a/src/rt/arch/x86_64/morestack.S b/src/rt/arch/x86_64/morestack.S index 9d16afc0a1b..b718c9121c5 100644 --- a/src/rt/arch/x86_64/morestack.S +++ b/src/rt/arch/x86_64/morestack.S @@ -11,7 +11,7 @@ .text -#if defined(__APPLE__) || defined(_WIN32) +#if defined(__APPLE__) #define UPCALL_NEW_STACK _upcall_new_stack #define UPCALL_DEL_STACK _upcall_del_stack #define MORESTACK ___morestack |