Fix Lock API

pspdev · Apr 20, 2024 · a42edf3 · a42edf3
1 parent 2f49416
commit a42edf3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/newlib/configure.host b/newlib/configure.host
@@ -534,7 +534,7 @@ case "${host}" in
   mips*-psp-*)
   	sys_dir=psp
   	posix_dir=posix
-  	newlib_cflags="${newlib_cflags} -DHAVE_NANOSLEEP -DHAVE_RENAME -DHAVE_FCNTL -D_NO_POSIX_SPAWN"
+  	newlib_cflags="${newlib_cflags} -DHAVE_NANOSLEEP -DHAVE_RENAME -DHAVE_FCNTL -D_NO_POSIX_SPAWN -DHAVE_DD_LOCK"
 	;;
   mmix-knuth-mmixware)
 	sys_dir=mmixware

diff --git a/newlib/libc/misc/lock.c b/newlib/libc/misc/lock.c
@@ -81,7 +81,9 @@ subroutines are required for linking multi-threaded applications.
 
 /* dummy lock routines and static locks for single-threaded apps */
 
-#ifndef __SINGLE_THREAD__
+#include <newlib.h>
+
+#if defined(__SINGLE_THREAD__)
 
 #include <sys/lock.h>
 

diff --git a/newlib/libc/sys/psp/sys/dirent.h b/newlib/libc/sys/psp/sys/dirent.h
@@ -8,6 +8,7 @@ typedef struct __dirdesc {
     char *dd_buf;	/* buffer */
     int dd_len;		/* buffer length */
     int dd_size;	/* amount of data in buffer */
+    void *dd_lock;	/* lock */
 } DIR;
 
 # define __dirfd(dp)	((dp)->dd_fd)