Convert some users

libc/sysdeps/linux/common/getcwd.c

@@ -2,6 +2,7 @@
 
 #define opendir __opendir
 #define closedir __closedir
+#define readdir __readdir
 
 #include <stdlib.h>
 #include <errno.h>
@@ -66,7 +67,7 @@ static char *search_dir(dev_t this_dev, ino_t this_ino, char *path_buf, int path
 	    goto oops;
 	}
 
-	while ((d = __readdir(dp)) != 0) {
+	while ((d = readdir(dp)) != 0) {
 #ifdef FAST_DIR_SEARCH_POSSIBLE
 		if (slow_search || this_ino == d->d_ino) {
 #endif

libc/sysdeps/linux/common/ssp.c

@@ -71,7 +71,7 @@ static __always_inline void ssp_write(int fd, const char *msg1, const char *msg2
 static __always_inline attribute_noreturn void terminate(void)
 {
 	(void) kill(__getpid(), SSP_SIGTYPE);
-	_exit(127);
+	_exit_internal(127);
 }
 
 void attribute_noreturn __stack_smash_handler(char func[], int damaged __attribute__ ((unused)));