Skip to content

Fix an inverted logic in the following commit. #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Jan 29, 2020
Merged

Fix an inverted logic in the following commit. #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arch/sim/src/sim/up_setjmp32.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
# define SYMBOL(s) _##s
#else
#ifdef __ELF__
# define SYMBOL(s) _##s
#else
# define SYMBOL(s) s
#else
# define SYMBOL(s) _##s
#endif
#endif

Copy link
Contributor

@xiaoxiang781216 xiaoxiang781216 Jan 29, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about:

#ifdef __ELF__
# define SYMBOL(s) s
#else
# define SYMBOL(s) _##s
#endif

Like you change:

#ifdef __ELF__
	.type	SYMBOL(up_setjmp), @function
#endif

Also for up_setjmp64.S

Copy link
Contributor Author

@yamt yamt Jan 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you mean to merge CYGWIN block?
CYGWIN seems to use _ prefix for 32-bit but not for 64-bit.
so I feel it's better to keep it separate.

Copy link
Contributor

@xiaoxiang781216 xiaoxiang781216 Jan 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the separation is better.

Expand Down