Merge branch 'bugfix/raise_r_signature' into 'master'

syscalls: fix arguments and return type for _raise_r

See merge request idf/esp-idf!2897
This commit is contained in:
Ivan Grokhotkov 2018-08-01 14:50:59 +08:00
commit 5452e7848d
2 changed files with 2 additions and 2 deletions

View file

@ -51,7 +51,7 @@ struct syscall_stub_table
int (*_rename_r)(struct _reent *r, const char*, const char*); int (*_rename_r)(struct _reent *r, const char*, const char*);
clock_t (*_times_r)(struct _reent *r, struct tms *); clock_t (*_times_r)(struct _reent *r, struct tms *);
int (*_gettimeofday_r) (struct _reent *r, struct timeval *, void *); int (*_gettimeofday_r) (struct _reent *r, struct timeval *, void *);
void (*_raise_r)(struct _reent *r); void (*_raise_r)(struct _reent *r); /* function signature is incorrect in ROM */
int (*_unlink_r)(struct _reent *r, const char*); int (*_unlink_r)(struct _reent *r, const char*);
int (*_link_r)(struct _reent *r, const char*, const char*); int (*_link_r)(struct _reent *r, const char*, const char*);
int (*_stat_r)(struct _reent *r, const char*, struct stat *); int (*_stat_r)(struct _reent *r, const char*, struct stat *);

View file

@ -68,7 +68,7 @@ int _system_r(struct _reent *r, const char *str)
return -1; return -1;
} }
void _raise_r(struct _reent *r) int _raise_r(struct _reent *r, int sig)
{ {
abort(); abort();
} }