Merge pull request #1916 from c1728p9/fix_gcc

0xc0170 · web-flow · commit 89c1bef1b11c · 2016-06-13T16:17:02.000+02:00
Fix GCC malloc lock
diff --git a/hal/common/retarget.cpp b/hal/common/retarget.cpp
@@ -646,22 +646,22 @@ extern "C" WEAK void __rtos_malloc_unlock( struct _reent *_r ) {}
 extern "C" WEAK void __rtos_env_lock( struct _reent *_r ) {}
 extern "C" WEAK void __rtos_env_unlock( struct _reent *_r ) {}
 
-void __malloc_lock( struct _reent *_r )
+extern "C" void __malloc_lock( struct _reent *_r )
 {
     __rtos_malloc_lock(_r);
 }
 
-void __malloc_unlock( struct _reent *_r )
+extern "C" void __malloc_unlock( struct _reent *_r )
 {
     __rtos_malloc_unlock(_r);
 }
 
-void __env_lock( struct _reent *_r )
+extern "C" void __env_lock( struct _reent *_r )
 {
     __rtos_env_lock(_r);
 }
 
-void __env_unlock( struct _reent *_r )
+extern "C" void __env_unlock( struct _reent *_r )
 {
     __rtos_env_unlock(_r);
 }

Original file line number	Diff line number	Diff line change
`@@ -646,22 +646,22 @@ extern "C" WEAK void __rtos_malloc_unlock( struct _reent *_r ) {}`
`646`	`646`	`extern "C" WEAK void __rtos_env_lock( struct _reent *_r ) {}`
`647`	`647`	`extern "C" WEAK void __rtos_env_unlock( struct _reent *_r ) {}`
`648`	`648`
`649`		`-void __malloc_lock( struct _reent *_r )`
	`649`	`+extern "C" void __malloc_lock( struct _reent *_r )`
`650`	`650`	`{`
`651`	`651`	`__rtos_malloc_lock(_r);`
`652`	`652`	`}`
`653`	`653`
`654`		`-void __malloc_unlock( struct _reent *_r )`
	`654`	`+extern "C" void __malloc_unlock( struct _reent *_r )`
`655`	`655`	`{`
`656`	`656`	`__rtos_malloc_unlock(_r);`
`657`	`657`	`}`
`658`	`658`
`659`		`-void __env_lock( struct _reent *_r )`
	`659`	`+extern "C" void __env_lock( struct _reent *_r )`
`660`	`660`	`{`
`661`	`661`	`__rtos_env_lock(_r);`
`662`	`662`	`}`
`663`	`663`
`664`		`-void __env_unlock( struct _reent *_r )`
	`664`	`+extern "C" void __env_unlock( struct _reent *_r )`
`665`	`665`	`{`
`666`	`666`	`__rtos_env_unlock(_r);`
`667`	`667`	`}`