Skip to content

Commit

Permalink
Merge pull request #11986 from kaspar030/mips_remove_nomips16
Browse files Browse the repository at this point in the history
cpu/mips32r2: remove nomips16 attribute from _mips_handle_exception
  • Loading branch information
benpicco authored Sep 17, 2019
2 parents 9b4755c + b415588 commit e214dcb
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions cpu/mips32r2_common/thread_arch.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,21 @@ mem_rw(const void *vaddr)
extern int _dsp_save(struct dspctx *ctx);
extern int _dsp_load(struct dspctx *ctx);
#endif

/*
* The nomips16 attribute should not really be needed, it works around a toolchain
* issue in 2016.05-03.
* The official mips toolchain version 2016.05-03 needs this attribute.
* Newer versions (>=2017.10-05) don't. Those started being based on gcc 6,
* thus use that to guard the attribute.
*
* See https://github.com/RIOT-OS/RIOT/pull/11986.
*/
#if __GNUC__ <= 4
void __attribute__((nomips16))
#else
void
#endif

/* note return type from above #ifdef */
_mips_handle_exception(struct gpctx *ctx, int exception)
{
unsigned int syscall_num = 0;
Expand Down

0 comments on commit e214dcb

Please sign in to comment.