PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* libc/sys/or1k/mlock.c: Fix dependency on libgloss.

This commit is contained in:
Corinna Vinschen 2015-01-22 15:32:51 +00:00
parent 185784962a
commit bdc1799556
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/ChangeLog
View File

@ -1,3 +1,7 @@
2015-01-22 Stefan Wallentowitz <stefan.wallentowitz@tum.de>
* libc/sys/or1k/mlock.c: Fix dependency on libgloss.
2015-01-21 Eric Botcazou <ebotcazou@adacore.com>
* configure.host: Add Visium support.

6
newlib/libc/sys/or1k/mlock.c
View File

@ -16,7 +16,7 @@
*/
#include <reent.h>
#include <or1k-support.h>
#include <stdint.h>
/* Lock calls from different cores, but allows recursive calls from the same
* core. The lock is not only atomic to other cores calling malloc, but also
@ -36,6 +36,8 @@ volatile uint32_t _or1k_malloc_lock_cnt;
// The exception enable restore of the current mutex holder
volatile uint32_t _or1k_malloc_lock_restore;
extern uint32_t or1k_sync_cas(void *address, uint32_t compare, uint32_t swap);
/**
* Recursive lock of the malloc
*/
@ -59,7 +61,7 @@ void __malloc_lock(struct _reent *ptr) {
while (_or1k_malloc_lock != 0) {}
// .. and then try to set it atomically. As this may
// fail, we need to repeat this
} while (or1k_sync_cas(&_or1k_malloc_lock, 0, id) != 0);
} while (or1k_sync_cas((void*) &_or1k_malloc_lock, 0, id) != 0);
}
// Store the TEE and IEE flags for later restore