You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2020/01/29 08:26:18 UTC
[incubator-nuttx] 10/12: Revert "sim: Check __ELF__ for .type/.size
directives"
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch revert-179-osx-sim
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 903cf815cd8f90ba5958aadf5ee0c1f6a19bb312
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Wed Jan 29 09:26:02 2020 +0100
Revert "sim: Check __ELF__ for .type/.size directives"
This reverts commit 69a8b9721c31b78351a18c406275b482c1ae6753.
---
arch/sim/src/sim/up_setjmp32.S | 8 ++++----
arch/sim/src/sim/up_setjmp64.S | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/sim/src/sim/up_setjmp32.S b/arch/sim/src/sim/up_setjmp32.S
index a1b7284..15880cb 100644
--- a/arch/sim/src/sim/up_setjmp32.S
+++ b/arch/sim/src/sim/up_setjmp32.S
@@ -55,7 +55,7 @@
.text
.globl SYMBOL(up_setjmp)
-#ifdef __ELF__
+#ifndef __CYGWIN__
.type SYMBOL(up_setjmp), @function
#endif
SYMBOL(up_setjmp):
@@ -86,11 +86,11 @@ SYMBOL(up_setjmp):
xorl %eax, %eax
ret
-#ifdef __ELF__
+#ifndef __CYGWIN__
.size SYMBOL(up_setjmp), . - SYMBOL(up_setjmp)
#endif
.globl SYMBOL(up_longjmp)
-#ifdef __ELF__
+#ifndef __CYGWIN__
.type SYMBOL(up_longjmp), @function
#endif
SYMBOL(up_longjmp):
@@ -112,7 +112,7 @@ SYMBOL(up_longjmp):
/* Jump to saved PC. */
jmp *%edx
-#ifdef __ELF__
+#ifndef __CYGWIN__
.size SYMBOL(up_longjmp), . - SYMBOL(up_longjmp)
#endif
diff --git a/arch/sim/src/sim/up_setjmp64.S b/arch/sim/src/sim/up_setjmp64.S
index af7449a..92cc866 100644
--- a/arch/sim/src/sim/up_setjmp64.S
+++ b/arch/sim/src/sim/up_setjmp64.S
@@ -91,7 +91,7 @@
.text
.align 4
.globl SYMBOL(up_setjmp)
-#ifdef __ELF__
+#ifndef __CYGWIN__
.type SYMBOL(up_setjmp), @function
#endif
SYMBOL(up_setjmp):
@@ -128,13 +128,13 @@ SYMBOL(up_setjmp):
ret
-#ifdef __ELF__
+#ifndef __CYGWIN__
.size SYMBOL(up_setjmp), . - SYMBOL(up_setjmp)
#endif
.align 4
.globl SYMBOL(up_longjmp)
-#ifdef __ELF__
+#ifndef __CYGWIN__
.type SYMBOL(up_longjmp), @function
#endif
SYMBOL(up_longjmp):
@@ -157,7 +157,7 @@ SYMBOL(up_longjmp):
jmp *JB_RSI(REGS) /* Save 8: rsi */
-#ifdef __ELF__
+#ifndef __CYGWIN__
.size SYMBOL(up_longjmp), . - SYMBOL(up_longjmp)
#endif