3 files changed, 4 insertions, 4 deletions
diff --git a/libpthread/nptl/sysdeps/generic/Makefile.in b/libpthread/nptl/sysdeps/generic/Makefile.in
index 2d2a00d8e..79af336d2 100644
--- a/libpthread/nptl/sysdeps/generic/Makefile.in
+++ b/libpthread/nptl/sysdeps/generic/Makefile.in
@@ -21,7 +21,7 @@ PTHREAD_GENERIC_OUT:=$(top_builddir)libpthread/nptl/sysdeps/generic
 
 LIBC_GENERIC_OBJ:=$(patsubst %.c,$(PTHREAD_GENERIC_OUT)/%.o,$(libc_a_CSRC))
 
-libc-a-y+=$(LIBC_GENERIC_OBJ)
+libc-static-y+=$(LIBC_GENERIC_OBJ)
 
 libc-nomulti-y+=$(LIBC_GENERIC_OBJ)
 
diff --git a/libpthread/nptl/sysdeps/generic/dl-support.c b/libpthread/nptl/sysdeps/generic/dl-support.c
index 4d8ea6f8d..496694ca4 100644
--- a/libpthread/nptl/sysdeps/generic/dl-support.c
+++ b/libpthread/nptl/sysdeps/generic/dl-support.c
@@ -68,6 +68,6 @@ _dl_nothread_init_static_tls (struct link_map *map)
   dtv[map->l_tls_modid].pointer.is_static = true;
 
   /* Initialize the memory.  */
-  memset (__mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
+  memset (mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
 	  '\0', map->l_tls_blocksize - map->l_tls_initimage_size);
 }
diff --git a/libpthread/nptl/sysdeps/generic/libc-tls.c b/libpthread/nptl/sysdeps/generic/libc-tls.c
index 8b662a433..3b58ce21f 100644
--- a/libpthread/nptl/sysdeps/generic/libc-tls.c
+++ b/libpthread/nptl/sysdeps/generic/libc-tls.c
@@ -147,10 +147,10 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign)
      IE-model TLS.  */
 # if TLS_TCB_AT_TP
   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-  tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
+  tlsblock = sbrk (tcb_offset + tcbsize + max_align);
 # elif TLS_DTV_AT_TP
   tcb_offset = roundup (tcbsize, align ?: 1);
-  tlsblock = __sbrk (tcb_offset + memsz + max_align
+  tlsblock = sbrk (tcb_offset + memsz + max_align
 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
   tlsblock += TLS_PRE_TCB_SIZE;
 # else