[uclibc-ng-devel] uClibc-ng - small C library for embedded systems branch master updated. 4c3023bc803012656cf45749960282351efc8020

wbx wbx at helium.waldemar-brodkorb.de
Tue Sep 23 13:46:00 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "uClibc-ng - small C library for embedded systems".

The branch, master has been updated
       via  4c3023bc803012656cf45749960282351efc8020 (commit)
      from  51f9b66d2fee1c7c1088b548751ac64131220b6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4c3023bc803012656cf45749960282351efc8020
Author: Waldemar Brodkorb <wbx at openadk.org>
Date:   Sat Sep 20 22:36:23 2014 +0200

    xtensa: add support for NPTL
    
    Changes from:
    https://github.com/foss-xtensa/uClibc/commits/xtensa_nptl
    
    Author: Chris Zankel <chris at zankel.net>
    Author: Baruch Siach <baruch at tkos.co.il>

-----------------------------------------------------------------------

Summary of changes:
 include/elf.h                                      |    5 +-
 include/link.h                                     |    2 +
 ldso/include/dl-hash.h                             |    2 +
 ldso/include/inline-hashtab.h                      |  265 +++++++++++++++++++
 ldso/include/ldsodefs.h                            |    7 +-
 ldso/include/tlsdeschtab.h                         |  119 +++++++++
 ldso/ldso/dl-tls.c                                 |   29 ++-
 ldso/ldso/fdpic/dl-inlines.h                       |  270 +-------------------
 ldso/ldso/xtensa/dl-debug.h                        |   77 ++----
 ldso/ldso/xtensa/dl-startup.h                      |    2 +-
 ldso/ldso/xtensa/dl-sysdep.h                       |    9 +-
 ldso/ldso/xtensa/dl-tlsdesc.S                      |   96 +++++++
 ldso/ldso/xtensa/elfinterp.c                       |   51 +++-
 libc/sysdeps/linux/xtensa/Makefile.arch            |    5 +-
 libc/sysdeps/linux/xtensa/clone.S                  |  101 ++++----
 libc/sysdeps/linux/xtensa/fork.c                   |    8 +-
 libc/sysdeps/linux/xtensa/jmpbuf-unwind.h          |   38 ++-
 libc/sysdeps/linux/{c6x => xtensa}/sys/ptrace.h    |   41 ++-
 libc/sysdeps/linux/xtensa/sysdep.h                 |   39 +--
 libc/sysdeps/linux/xtensa/vfork.S                  |  104 ++++----
 .../nptl/sysdeps/unix/sysv/linux/lowlevellock.c    |    2 -
 .../sysdeps/unix/sysv/linux/xtensa/Makefile.arch   |   15 ++
 .../sysv/linux/{arm => xtensa}/bits/pthreadtypes.h |   12 +-
 .../sysv/linux/{metag => xtensa}/bits/semaphore.h  |    2 +-
 .../nptl/sysdeps/unix/sysv/linux/xtensa/clone.S    |    3 +
 .../sysv/linux/{metag => xtensa}/createthread.c    |    7 +-
 .../unix/sysv/linux/{i386 => xtensa}/fork.c        |    3 +-
 .../unix/sysv/linux/{arm => xtensa}/lowlevellock.c |   12 +-
 .../unix/sysv/linux/{arm => xtensa}/lowlevellock.h |   20 +-
 .../sysv/linux/xtensa}/pt-initfini.c               |    6 +
 .../sysv/linux/{alpha => xtensa}/pthread_once.c    |   29 +--
 .../sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h |  108 ++++++++
 .../nptl/sysdeps/unix/sysv/linux/xtensa/vfork.S    |   59 +++++
 libpthread/nptl/sysdeps/xtensa/Makefile.arch       |   40 +++
 libpthread/nptl/sysdeps/{metag => xtensa}/dl-tls.h |   35 ++-
 .../nptl/sysdeps/{arm => xtensa}/jmpbuf-unwind.h   |    4 +-
 libpthread/nptl/sysdeps/{arm => xtensa}/libc-tls.c |    4 +-
 .../nptl/sysdeps/xtensa/pthread_spin_lock.S        |   25 +-
 .../metag/fork.c => xtensa/pthread_spin_trylock.S} |   29 ++-
 .../nptl/sysdeps/{metag => xtensa}/pthreaddef.h    |    9 +-
 .../nptl/sysdeps/{arc => xtensa}/tcb-offsets.sym   |    7 +-
 libpthread/nptl/sysdeps/{arm => xtensa}/tls.h      |   47 ++--
 libpthread/nptl/sysdeps/xtensa/tlsdesc.sym         |   10 +
 43 files changed, 1165 insertions(+), 593 deletions(-)
 create mode 100644 ldso/include/inline-hashtab.h
 create mode 100644 ldso/include/tlsdeschtab.h
 create mode 100644 ldso/ldso/xtensa/dl-tlsdesc.S
 copy libc/sysdeps/linux/{c6x => xtensa}/sys/ptrace.h (84%)
 create mode 100644 libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/Makefile.arch
 copy libpthread/nptl/sysdeps/unix/sysv/linux/{arm => xtensa}/bits/pthreadtypes.h (94%)
 copy libpthread/nptl/sysdeps/unix/sysv/linux/{metag => xtensa}/bits/semaphore.h (94%)
 create mode 100644 libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/clone.S
 copy libpthread/nptl/sysdeps/unix/sysv/linux/{metag => xtensa}/createthread.c (85%)
 copy libpthread/nptl/sysdeps/unix/sysv/linux/{i386 => xtensa}/fork.c (89%)
 copy libpthread/nptl/sysdeps/unix/sysv/linux/{arm => xtensa}/lowlevellock.c (92%)
 copy libpthread/nptl/sysdeps/unix/sysv/linux/{arm => xtensa}/lowlevellock.h (93%)
 copy libpthread/nptl/sysdeps/{pthread => unix/sysv/linux/xtensa}/pt-initfini.c (94%)
 copy libpthread/nptl/sysdeps/unix/sysv/linux/{alpha => xtensa}/pthread_once.c (80%)
 create mode 100644 libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h
 create mode 100644 libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/vfork.S
 create mode 100644 libpthread/nptl/sysdeps/xtensa/Makefile.arch
 copy libpthread/nptl/sysdeps/{metag => xtensa}/dl-tls.h (55%)
 copy libpthread/nptl/sysdeps/{arm => xtensa}/jmpbuf-unwind.h (89%)
 copy libpthread/nptl/sysdeps/{arm => xtensa}/libc-tls.c (88%)
 copy libc/sysdeps/linux/metag/bits/stackinfo.h => libpthread/nptl/sysdeps/xtensa/pthread_spin_lock.S (72%)
 copy libpthread/nptl/sysdeps/{unix/sysv/linux/metag/fork.c => xtensa/pthread_spin_trylock.S} (72%)
 copy libpthread/nptl/sysdeps/{metag => xtensa}/pthreaddef.h (91%)
 copy libpthread/nptl/sysdeps/{arc => xtensa}/tcb-offsets.sym (54%)
 copy libpthread/nptl/sysdeps/{arm => xtensa}/tls.h (80%)
 create mode 100644 libpthread/nptl/sysdeps/xtensa/tlsdesc.sym

diff --git a/include/elf.h b/include/elf.h
index 1979209..fc60864 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -3072,8 +3072,11 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_XTENSA_SLOT12_ALT	47
 #define R_XTENSA_SLOT13_ALT	48
 #define R_XTENSA_SLOT14_ALT	49
+#define R_XTENSA_TLSDESC_FN	50
+#define R_XTENSA_TLSDESC_ARG	51
+#define R_XTENSA_TLS_TPOFF	53
 /* Keep this the last entry.  */
-#define R_XTENSA_NUM		50
+#define R_XTENSA_NUM		54
 
 /* C6X specific relocs */
 #define R_C6000_NONE		0
diff --git a/include/link.h b/include/link.h
index 147b793..67bc800 100644
--- a/include/link.h
+++ b/include/link.h
@@ -132,6 +132,8 @@ struct link_map
     size_t l_tls_modid;
     /* Nonzero if _dl_init_static_tls should be called for this module */
     unsigned int l_need_tls_init:1;
+    /* Address of TLS descriptor hash table.  */
+    void *l_tlsdesc_table;
 #endif
 #endif
   };
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h
index e1e3e3f..18f21ae 100644
--- a/ldso/include/dl-hash.h
+++ b/ldso/include/dl-hash.h
@@ -70,6 +70,8 @@ struct elf_resolve {
   size_t l_tls_modid;
   /* Nonzero if _dl_init_static_tls should be called for this module */
   unsigned int l_need_tls_init:1;
+  /* Address of TLS descriptor hash table.  */
+  void *l_tlsdesc_table;
 #endif
 
   ElfW(Addr) mapaddr;
diff --git a/ldso/include/inline-hashtab.h b/ldso/include/inline-hashtab.h
new file mode 100644
index 0000000..4a48120
--- /dev/null
+++ b/ldso/include/inline-hashtab.h
@@ -0,0 +1,265 @@
+/*
+ * The hashcode handling code below is heavily inspired in libiberty's
+ * hashtab code, but with most adaptation points and support for
+ * deleting elements removed.
+ *
+ * Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ * Contributed by Vladimir Makarov (vmakarov at cygnus.com).
+ */
+
+#ifndef INLINE_HASHTAB_H
+# define INLINE_HASHTAB_H 1
+
+static __always_inline unsigned long
+higher_prime_number(unsigned long n)
+{
+	/* These are primes that are near, but slightly smaller than, a power of two. */
+	static const unsigned long primes[] = {
+		7,
+		13,
+		31,
+		61,
+		127,
+		251,
+		509,
+		1021,
+		2039,
+		4093,
+		8191,
+		16381,
+		32749,
+		65521,
+		131071,
+		262139,
+		524287,
+		1048573,
+		2097143,
+		4194301,
+		8388593,
+		16777213,
+		33554393,
+		67108859,
+		134217689,
+		268435399,
+		536870909,
+		1073741789,
+		/* 4294967291 */
+		((unsigned long) 2147483647) + ((unsigned long) 2147483644),
+	};
+	const unsigned long *low = &primes[0];
+	const unsigned long *high = &primes[ARRAY_SIZE(primes)];
+
+	while (low != high) {
+		const unsigned long *mid = low + (high - low) / 2;
+		if (n > *mid)
+			low = mid + 1;
+		else
+			high = mid;
+	}
+
+#if 0
+	/* If we've run out of primes, abort.  */
+	if (n > *low) {
+		fprintf(stderr, "Cannot find prime bigger than %lu\n", n);
+		abort();
+	}
+#endif
+
+	return *low;
+}
+
+struct funcdesc_ht
+{
+	/* Table itself */
+	void **entries;
+
+	/* Current size (in entries) of the hash table */
+	size_t size;
+
+	/* Current number of elements */
+	size_t n_elements;
+};
+
+static __always_inline struct funcdesc_ht *
+htab_create(void)
+{
+	struct funcdesc_ht *ht = _dl_malloc(sizeof(*ht));
+	size_t ent_size;
+
+	if (!ht)
+		return NULL;
+	ht->size = 3;
+	ent_size = sizeof(void *) * ht->size;
+	ht->entries = _dl_malloc(ent_size);
+	if (!ht->entries)
+		return NULL;
+
+	ht->n_elements = 0;
+	_dl_memset(ht->entries, 0, ent_size);
+
+	return ht;
+}
+
+/*
+ * This is only called from _dl_loadaddr_unmap, so it's safe to call
+ * _dl_free().  See the discussion below.
+ */
+static __always_inline void
+htab_delete(struct funcdesc_ht *htab)
+{
+	size_t i;
+
+	for (i = htab->size - 1; i >= 0; i--)
+		if (htab->entries[i])
+			_dl_free(htab->entries[i]);
+
+	_dl_free(htab->entries);
+	_dl_free(htab);
+}
+
+/*
+ * Similar to htab_find_slot, but without several unwanted side effects:
+ *  - Does not call htab->eq_f when it finds an existing entry.
+ *  - Does not change the count of elements/searches/collisions in the
+ *    hash table.
+ * This function also assumes there are no deleted entries in the table.
+ * HASH is the hash value for the element to be inserted.
+ */
+static __always_inline void **
+find_empty_slot_for_expand(struct funcdesc_ht *htab, int hash)
+{
+	size_t size = htab->size;
+	unsigned int index = hash % size;
+	void **slot = htab->entries + index;
+	int hash2;
+
+	if (!*slot)
+		return slot;
+
+	hash2 = 1 + hash % (size - 2);
+	for (;;) {
+		index += hash2;
+		if (index >= size)
+			index -= size;
+
+		slot = htab->entries + index;
+		if (!*slot)
+			return slot;
+	}
+}
+
+/*
+ * The following function changes size of memory allocated for the
+ * entries and repeatedly inserts the table elements.  The occupancy
+ * of the table after the call will be about 50%.  Naturally the hash
+ * table must already exist.  Remember also that the place of the
+ * table entries is changed.  If memory allocation failures are allowed,
+ * this function will return zero, indicating that the table could not be
+ * expanded.  If all goes well, it will return a non-zero value.
+ */
+static __always_inline int
+htab_expand(struct funcdesc_ht *htab, int (*hash_fn) (void *))
+{
+	void **oentries;
+	void **olimit;
+	void **p;
+	void **nentries;
+	size_t nsize;
+
+	oentries = htab->entries;
+	olimit = oentries + htab->size;
+
+	/*
+	 * Resize only when table after removal of unused elements is either
+	 * too full or too empty.
+	 */
+	if (htab->n_elements * 2 > htab->size)
+		nsize = higher_prime_number(htab->n_elements * 2);
+	else
+		nsize = htab->size;
+
+	nentries = _dl_malloc(sizeof(*nentries) * nsize);
+	_dl_memset(nentries, 0, sizeof(*nentries) * nsize);
+	if (nentries == NULL)
+		return 0;
+	htab->entries = nentries;
+	htab->size = nsize;
+
+	p = oentries;
+	do {
+		if (*p)
+			*find_empty_slot_for_expand(htab, hash_fn(*p)) = *p;
+		p++;
+	} while (p < olimit);
+
+#if 0
+	/*
+	 * We can't tell whether this was allocated by the _dl_malloc()
+	 * built into ld.so or malloc() in the main executable or libc,
+	 * and calling free() for something that wasn't malloc()ed could
+	 * do Very Bad Things (TM).  Take the conservative approach
+	 * here, potentially wasting as much memory as actually used by
+	 * the hash table, even if multiple growths occur.  That's not
+	 * so bad as to require some overengineered solution that would
+	 * enable us to keep track of how it was allocated.
+	 */
+	_dl_free(oentries);
+#endif
+	return 1;
+}
+
+/*
+ * This function searches for a hash table slot containing an entry
+ * equal to the given element.  To delete an entry, call this with
+ * INSERT = 0, then call htab_clear_slot on the slot returned (possibly
+ * after doing some checks).  To insert an entry, call this with
+ * INSERT = 1, then write the value you want into the returned slot.
+ * When inserting an entry, NULL may be returned if memory allocation
+ * fails.
+ */
+static __always_inline void **
+htab_find_slot(struct funcdesc_ht *htab, void *ptr, int insert,
+	       int (*hash_fn)(void *), int (*eq_fn)(void *, void *))
+{
+	unsigned int index;
+	int hash, hash2;
+	size_t size;
+	void **entry;
+
+	if (htab->size * 3 <= htab->n_elements * 4 &&
+	    htab_expand(htab, hash_fn) == 0)
+		return NULL;
+
+	hash = hash_fn(ptr);
+
+	size = htab->size;
+	index = hash % size;
+
+	entry = &htab->entries[index];
+	if (!*entry)
+		goto empty_entry;
+	else if (eq_fn(*entry, ptr))
+		return entry;
+
+	hash2 = 1 + hash % (size - 2);
+	for (;;) {
+		index += hash2;
+		if (index >= size)
+			index -= size;
+
+		entry = &htab->entries[index];
+		if (!*entry)
+			goto empty_entry;
+		else if (eq_fn(*entry, ptr))
+			return entry;
+	}
+
+ empty_entry:
+	if (!insert)
+		return NULL;
+
+	htab->n_elements++;
+	return entry;
+}
+
+#endif
diff --git a/ldso/include/ldsodefs.h b/ldso/include/ldsodefs.h
index 4063d00..f17ac0c 100644
--- a/ldso/include/ldsodefs.h
+++ b/ldso/include/ldsodefs.h
@@ -62,13 +62,18 @@ extern void _dl_get_tls_static_info (size_t *sizep, size_t *alignp)
 
 extern void _dl_allocate_static_tls (struct link_map *map)
      internal_function attribute_hidden;
+extern int _dl_try_allocate_static_tls (struct link_map* map)
+     internal_function attribute_hidden;
 
 /* Taken from glibc/elf/dl-reloc.c */
 #define CHECK_STATIC_TLS(sym_map)											\
 	do {																	\
-		if (unlikely((sym_map)->l_tls_offset == NO_TLS_OFFSET))	\
+		if (__builtin_expect ((sym_map)->l_tls_offset == NO_TLS_OFFSET, 0))	\
 			_dl_allocate_static_tls (sym_map);								\
 	} while (0)
+#define TRY_STATIC_TLS(sym_map)												\
+	(__builtin_expect ((sym_map)->l_tls_offset != NO_TLS_OFFSET, 1)			\
+		 || _dl_try_allocate_static_tls (sym_map) == 0)
 
 /* These are internal entry points to the two halves of _dl_allocate_tls,
    only used within rtld.c itself at startup time.  */
diff --git a/ldso/include/tlsdeschtab.h b/ldso/include/tlsdeschtab.h
new file mode 100644
index 0000000..86baea1
--- /dev/null
+++ b/ldso/include/tlsdeschtab.h
@@ -0,0 +1,119 @@
+/* Hash table for TLS descriptors.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Alexandre Oliva  <aoliva at redhat.com>
+
+   uClibc port by Baruch Siach <baruch at tkos.co.il>
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef TLSDESCHTAB_H
+# define TLSDESCHTAB_H 1
+
+# ifdef SHARED
+
+#  include <inline-hashtab.h>
+
+inline static int
+hash_tlsdesc (void *p)
+{
+  struct tlsdesc_dynamic_arg *td = p;
+
+  /* We know all entries are for the same module, so ti_offset is the
+     only distinguishing entry.  */
+  return td->tlsinfo.ti_offset;
+}
+
+inline static int
+eq_tlsdesc (void *p, void *q)
+{
+  struct tlsdesc_dynamic_arg *tdp = p, *tdq = q;
+
+  return tdp->tlsinfo.ti_offset == tdq->tlsinfo.ti_offset;
+}
+
+inline static int
+map_generation (struct link_map *map)
+{
+  size_t idx = map->l_tls_modid;
+  struct dtv_slotinfo_list *listp = GL(dl_tls_dtv_slotinfo_list);
+
+  /* Find the place in the dtv slotinfo list.  */
+  do
+    {
+      /* Does it fit in the array of this list element?  */
+      if (idx < listp->len)
+	{
+	  /* We should never get here for a module in static TLS, so
+	     we can assume that, if the generation count is zero, we
+	     still haven't determined the generation count for this
+	     module.  */
+	  if (listp->slotinfo[idx].gen)
+	    return listp->slotinfo[idx].gen;
+	  else
+	    break;
+	}
+      idx -= listp->len;
+      listp = listp->next;
+    }
+  while (listp != NULL);
+
+  /* If we get to this point, the module still hasn't been assigned an
+     entry in the dtv slotinfo data structures, and it will when we're
+     done with relocations.  At that point, the module will get a
+     generation number that is one past the current generation, so
+     return exactly that.  */
+  return GL(dl_tls_generation) + 1;
+}
+
+void *
+internal_function
+_dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset)
+{
+  struct funcdesc_ht *ht;
+  void **entry;
+  struct tlsdesc_dynamic_arg *td, test;
+
+  ht = map->l_tlsdesc_table;
+  if (! ht)
+    {
+      ht = htab_create ();
+      if (! ht)
+	  return 0;
+      map->l_tlsdesc_table = ht;
+    }
+
+  test.tlsinfo.ti_module = map->l_tls_modid;
+  test.tlsinfo.ti_offset = ti_offset;
+  entry = htab_find_slot (ht, &test, 1, hash_tlsdesc, eq_tlsdesc);
+  if (*entry)
+    {
+      td = *entry;
+      return td;
+    }
+
+  *entry = td = _dl_malloc (sizeof (struct tlsdesc_dynamic_arg));
+  /* This may be higher than the map's generation, but it doesn't
+     matter much.  Worst case, we'll have one extra DTV update per
+     thread.  */
+  td->gen_count = map_generation (map);
+  td->tlsinfo = test.tlsinfo;
+
+  return td;
+}
+
+# endif /* SHARED */
+
+#endif
diff --git a/ldso/ldso/dl-tls.c b/ldso/ldso/dl-tls.c
index 6679693..5d6d3b9 100644
--- a/ldso/ldso/dl-tls.c
+++ b/ldso/ldso/dl-tls.c
@@ -100,20 +100,16 @@ _dl_realloc (void * __ptr, size_t __size)
  * the static TLS area already allocated for each running thread.  If this
  * object's TLS segment is too big to fit, we fail.  If it fits,
  * we set MAP->l_tls_offset and return.
- * This function intentionally does not return any value but signals error
- * directly, as static TLS should be rare and code handling it should
- * not be inlined as much as possible.
  */
-void
-internal_function __attribute_noinline__
-_dl_allocate_static_tls (struct link_map *map)
+int
+internal_function
+_dl_try_allocate_static_tls (struct link_map* map)
 {
 	/* If the alignment requirements are too high fail.  */
 	if (map->l_tls_align > _dl_tls_static_align)
 	{
 fail:
-		_dl_dprintf(2, "cannot allocate memory in static TLS block");
-		_dl_exit(30);
+		return -1;
 	}
 
 # ifdef TLS_TCB_AT_TP
@@ -169,6 +165,23 @@ fail:
 	}
 	else
 		map->l_need_tls_init = 1;
+
+	return 0;
+}
+
+/*
+ * This function intentionally does not return any value but signals error
+ * directly, as static TLS should be rare and code handling it should
+ * not be inlined as much as possible.
+ */
+void
+internal_function __attribute_noinline__
+_dl_allocate_static_tls (struct link_map *map)
+{
+	if (_dl_try_allocate_static_tls (map)) {
+		_dl_dprintf(2, "cannot allocate memory in static TLS block");
+		_dl_exit(30);
+	}
 }
 
 #ifdef SHARED
diff --git a/ldso/ldso/fdpic/dl-inlines.h b/ldso/ldso/fdpic/dl-inlines.h
index 14a4916..ebbd033 100644
--- a/ldso/ldso/fdpic/dl-inlines.h
+++ b/ldso/ldso/fdpic/dl-inlines.h
@@ -5,6 +5,8 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
+#include <inline-hashtab.h>
+
 /* Initialize a DL_LOADADDR_TYPE given a got pointer and a complete load map. */
 static __always_inline void
 __dl_init_loadaddr_map(struct elf32_fdpic_loadaddr *loadaddr, Elf32_Addr dl_boot_got_pointer,
@@ -143,269 +145,18 @@ __dl_addr_in_loadaddr(void *p, struct elf32_fdpic_loadaddr loadaddr)
 	return 0;
 }
 
-/*
- * The hashcode handling code below is heavily inspired in libiberty's
- * hashtab code, but with most adaptation points and support for
- * deleting elements removed.
- *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
- * Contributed by Vladimir Makarov (vmakarov at cygnus.com).
- */
-static __always_inline unsigned long
-higher_prime_number(unsigned long n)
-{
-	/* These are primes that are near, but slightly smaller than, a power of two. */
-	static const unsigned long primes[] = {
-		7,
-		13,
-		31,
-		61,
-		127,
-		251,
-		509,
-		1021,
-		2039,
-		4093,
-		8191,
-		16381,
-		32749,
-		65521,
-		131071,
-		262139,
-		524287,
-		1048573,
-		2097143,
-		4194301,
-		8388593,
-		16777213,
-		33554393,
-		67108859,
-		134217689,
-		268435399,
-		536870909,
-		1073741789,
-		/* 4294967291 */
-		((unsigned long) 2147483647) + ((unsigned long) 2147483644),
-	};
-	const unsigned long *low = &primes[0];
-	const unsigned long *high = &primes[ARRAY_SIZE(primes)];
-
-	while (low != high) {
-		const unsigned long *mid = low + (high - low) / 2;
-		if (n > *mid)
-			low = mid + 1;
-		else
-			high = mid;
-	}
-
-#if 0
-	/* If we've run out of primes, abort.  */
-	if (n > *low) {
-		fprintf(stderr, "Cannot find prime bigger than %lu\n", n);
-		abort();
-	}
-#endif
-
-	return *low;
-}
-
-struct funcdesc_ht
-{
-	/* Table itself */
-	struct funcdesc_value **entries;
-
-	/* Current size (in entries) of the hash table */
-	size_t size;
-
-	/* Current number of elements */
-	size_t n_elements;
-};
-
-static __always_inline int
-hash_pointer(const void *p)
+static int
+hash_pointer(void *p)
 {
 	return (int) ((long)p >> 3);
 }
 
-static __always_inline struct funcdesc_ht *
-htab_create(void)
-{
-	struct funcdesc_ht *ht = _dl_malloc(sizeof(*ht));
-	size_t ent_size;
-
-	if (!ht)
-		return NULL;
-	ht->size = 3;
-	ent_size = sizeof(struct funcdesc_ht_value *) * ht->size;
-	ht->entries = _dl_malloc(ent_size);
-	if (!ht->entries)
-		return NULL;
-
-	ht->n_elements = 0;
-	_dl_memset(ht->entries, 0, ent_size);
-
-	return ht;
-}
-
-/*
- * This is only called from _dl_loadaddr_unmap, so it's safe to call
- * _dl_free().  See the discussion below.
- */
-static __always_inline void
-htab_delete(struct funcdesc_ht *htab)
+static int
+eq_pointer(void *p, void *q)
 {
-	size_t i;
-
-	for (i = htab->size - 1; i >= 0; i--)
-		if (htab->entries[i])
-			_dl_free(htab->entries[i]);
-
-	_dl_free(htab->entries);
-	_dl_free(htab);
-}
-
-/*
- * Similar to htab_find_slot, but without several unwanted side effects:
- *  - Does not call htab->eq_f when it finds an existing entry.
- *  - Does not change the count of elements/searches/collisions in the
- *    hash table.
- * This function also assumes there are no deleted entries in the table.
- * HASH is the hash value for the element to be inserted.
- */
-static __always_inline struct funcdesc_value **
-find_empty_slot_for_expand(struct funcdesc_ht *htab, int hash)
-{
-	size_t size = htab->size;
-	unsigned int index = hash % size;
-	struct funcdesc_value **slot = htab->entries + index;
-	int hash2;
-
-	if (!*slot)
-		return slot;
-
-	hash2 = 1 + hash % (size - 2);
-	for (;;) {
-		index += hash2;
-		if (index >= size)
-			index -= size;
-
-		slot = htab->entries + index;
-		if (!*slot)
-			return slot;
-	}
-}
-
-/*
- * The following function changes size of memory allocated for the
- * entries and repeatedly inserts the table elements.  The occupancy
- * of the table after the call will be about 50%.  Naturally the hash
- * table must already exist.  Remember also that the place of the
- * table entries is changed.  If memory allocation failures are allowed,
- * this function will return zero, indicating that the table could not be
- * expanded.  If all goes well, it will return a non-zero value.
- */
-static __always_inline int
-htab_expand(struct funcdesc_ht *htab)
-{
-	struct funcdesc_value **oentries;
-	struct funcdesc_value **olimit;
-	struct funcdesc_value **p;
-	struct funcdesc_value **nentries;
-	size_t nsize;
-
-	oentries = htab->entries;
-	olimit = oentries + htab->size;
-
-	/*
-	 * Resize only when table after removal of unused elements is either
-	 * too full or too empty.
-	 */
-	if (htab->n_elements * 2 > htab->size)
-		nsize = higher_prime_number(htab->n_elements * 2);
-	else
-		nsize = htab->size;
-
-	nentries = _dl_malloc(sizeof(*nentries) * nsize);
-	_dl_memset(nentries, 0, sizeof(*nentries) * nsize);
-	if (nentries == NULL)
-		return 0;
-	htab->entries = nentries;
-	htab->size = nsize;
-
-	p = oentries;
-	do {
-		if (*p)
-			*find_empty_slot_for_expand(htab, hash_pointer((*p)->entry_point)) = *p;
-		p++;
-	} while (p < olimit);
-
-#if 0
-	/*
-	 * We can't tell whether this was allocated by the _dl_malloc()
-	 * built into ld.so or malloc() in the main executable or libc,
-	 * and calling free() for something that wasn't malloc()ed could
-	 * do Very Bad Things (TM).  Take the conservative approach
-	 * here, potentially wasting as much memory as actually used by
-	 * the hash table, even if multiple growths occur.  That's not
-	 * so bad as to require some overengineered solution that would
-	 * enable us to keep track of how it was allocated.
-	 */
-	_dl_free(oentries);
-#endif
-	return 1;
-}
-
-/*
- * This function searches for a hash table slot containing an entry
- * equal to the given element.  To delete an entry, call this with
- * INSERT = 0, then call htab_clear_slot on the slot returned (possibly
- * after doing some checks).  To insert an entry, call this with
- * INSERT = 1, then write the value you want into the returned slot.
- * When inserting an entry, NULL may be returned if memory allocation
- * fails.
- */
-static __always_inline struct funcdesc_value **
-htab_find_slot(struct funcdesc_ht *htab, void *ptr, int insert)
-{
-	unsigned int index;
-	int hash, hash2;
-	size_t size;
-	struct funcdesc_value **entry;
-
-	if (htab->size * 3 <= htab->n_elements * 4 &&
-	    htab_expand(htab) == 0)
-		return NULL;
-
-	hash = hash_pointer(ptr);
-
-	size = htab->size;
-	index = hash % size;
-
-	entry = &htab->entries[index];
-	if (!*entry)
-		goto empty_entry;
-	else if ((*entry)->entry_point == ptr)
-		return entry;
-
-	hash2 = 1 + hash % (size - 2);
-	for (;;) {
-		index += hash2;
-		if (index >= size)
-			index -= size;
-
-		entry = &htab->entries[index];
-		if (!*entry)
-			goto empty_entry;
-		else if ((*entry)->entry_point == ptr)
-			return entry;
-	}
-
- empty_entry:
-	if (!insert)
-		return NULL;
+	struct funcdesc_value *entry = p;
 
-	htab->n_elements++;
-	return entry;
+	return entry->entry_point == q;
 }
 
 void *
@@ -424,7 +175,7 @@ _dl_funcdesc_for (void *entry_point, void *got_value)
 		tpnt->funcdesc_ht = ht;
 	}
 
-	entry = htab_find_slot(ht, entry_point, 1);
+	entry = htab_find_slot(ht, entry_point, 1, hash_pointer, eq_pointer);
 	if (*entry) {
 		_dl_assert((*entry)->entry_point == entry_point);
 		return _dl_stabilize_funcdesc(*entry);
@@ -459,7 +210,8 @@ _dl_lookup_address(void const *address)
 		if (fd->got_value != rpnt->loadaddr.got_value)
 			continue;
 
-		address = htab_find_slot(rpnt->funcdesc_ht, (void *)fd->entry_point, 0);
+		address = htab_find_slot(rpnt->funcdesc_ht, (void *)fd->entry_point, 0,
+				hash_pointer, eq_pointer);
 
 		if (address && *(struct funcdesc_value *const*)address == fd) {
 			address = (*(struct funcdesc_value *const*)address)->entry_point;
diff --git a/ldso/ldso/xtensa/dl-debug.h b/ldso/ldso/xtensa/dl-debug.h
index 4128d94..18beae5 100644
--- a/ldso/ldso/xtensa/dl-debug.h
+++ b/ldso/ldso/xtensa/dl-debug.h
@@ -8,54 +8,31 @@
 
 static const char * const _dl_reltypes_tab[] =
 {
-	"R_XTENSA_NONE",
-	"R_XTENSA_32",
-	"R_XTENSA_RTLD",
-	"R_XTENSA_GLOB_DAT",
-	"R_XTENSA_JMP_SLOT",
-	"R_XTENSA_RELATIVE",
-	"R_XTENSA_PLT",
-	"R_XTENSA_UNUSED7",
-	"R_XTENSA_OP0",
-	"R_XTENSA_OP1",
-	"R_XTENSA_OP2",
-	"R_XTENSA_ASM_EXPAND",
-	"R_XTENSA_ASM_SIMPLIFY",
-	"R_XTENSA_UNUSED13",
-	"R_XTENSA_UNUSED14",
-	"R_XTENSA_GNU_VTINHERIT",
-	"R_XTENSA_GNU_VTENTRY",
-	"R_XTENSA_DIFF8",
-	"R_XTENSA_DIFF16",
-	"R_XTENSA_DIFF32",
-	"R_XTENSA_SLOT0_OP",
-	"R_XTENSA_SLOT1_OP",
-	"R_XTENSA_SLOT2_OP",
-	"R_XTENSA_SLOT3_OP",
-	"R_XTENSA_SLOT4_OP",
-	"R_XTENSA_SLOT5_OP",
-	"R_XTENSA_SLOT6_OP",
-	"R_XTENSA_SLOT7_OP",
-	"R_XTENSA_SLOT8_OP",
-	"R_XTENSA_SLOT9_OP",
-	"R_XTENSA_SLOT10_OP",
-	"R_XTENSA_SLOT11_OP",
-	"R_XTENSA_SLOT12_OP",
-	"R_XTENSA_SLOT13_OP",
-	"R_XTENSA_SLOT14_OP",
-	"R_XTENSA_SLOT0_ALT",
-	"R_XTENSA_SLOT1_ALT",
-	"R_XTENSA_SLOT2_ALT",
-	"R_XTENSA_SLOT3_ALT",
-	"R_XTENSA_SLOT4_ALT",
-	"R_XTENSA_SLOT5_ALT",
-	"R_XTENSA_SLOT6_ALT",
-	"R_XTENSA_SLOT7_ALT",
-	"R_XTENSA_SLOT8_ALT",
-	"R_XTENSA_SLOT9_ALT",
-	"R_XTENSA_SLOT10_ALT",
-	"R_XTENSA_SLOT11_ALT",
-	"R_XTENSA_SLOT12_ALT",
-	"R_XTENSA_SLOT13_ALT",
-	"R_XTENSA_SLOT14_ALT"
+	 [0] "R_XTENSA_NONE",			"R_XTENSA_32",
+	 [2] "R_XTENSA_RTLD",			"R_XTENSA_GLOB_DAT",
+	 [4] "R_XTENSA_JMP_SLOT",		"R_XTENSA_RELATIVE",
+	 [6] "R_XTENSA_PLT",			"R_XTENSA_UNUSED7",
+	 [8] "R_XTENSA_OP0",			"R_XTENSA_OP1",
+	[10] "R_XTENSA_OP2",			"R_XTENSA_ASM_EXPAND",
+	[12] "R_XTENSA_ASM_SIMPLIFY",	"R_XTENSA_UNUSED13",
+	[14] "R_XTENSA_UNUSED14",		"R_XTENSA_GNU_VTINHERIT",
+	[16] "R_XTENSA_GNU_VTENTRY",	"R_XTENSA_DIFF8",
+	[18] "R_XTENSA_DIFF16",			"R_XTENSA_DIFF32",
+	[20] "R_XTENSA_SLOT0_OP",		"R_XTENSA_SLOT1_OP",
+	[22] "R_XTENSA_SLOT2_OP",		"R_XTENSA_SLOT3_OP",
+	[24] "R_XTENSA_SLOT4_OP",		"R_XTENSA_SLOT5_OP",
+	[26] "R_XTENSA_SLOT6_OP",		"R_XTENSA_SLOT7_OP",
+	[28] "R_XTENSA_SLOT8_OP",		"R_XTENSA_SLOT9_OP",
+	[30] "R_XTENSA_SLOT10_OP",		"R_XTENSA_SLOT11_OP",
+	[32] "R_XTENSA_SLOT12_OP",		"R_XTENSA_SLOT13_OP",
+	[34] "R_XTENSA_SLOT14_OP",		"R_XTENSA_SLOT0_ALT",
+	[36] "R_XTENSA_SLOT1_ALT",		"R_XTENSA_SLOT2_ALT",
+	[38] "R_XTENSA_SLOT3_ALT",		"R_XTENSA_SLOT4_ALT",
+	[40] "R_XTENSA_SLOT5_ALT",		"R_XTENSA_SLOT6_ALT",
+	[42] "R_XTENSA_SLOT7_ALT",		"R_XTENSA_SLOT8_ALT",
+	[44] "R_XTENSA_SLOT9_ALT",		"R_XTENSA_SLOT10_ALT",
+	[46] "R_XTENSA_SLOT11_ALT",		"R_XTENSA_SLOT12_ALT",
+	[48] "R_XTENSA_SLOT13_ALT",		"R_XTENSA_SLOT14_ALT",
+	[50] "R_XTENSA_TLSDESC_FN",		"R_XTENSA_TLSDESC_ARG",
+	[52] "R_XTENSA_TLS_TPOFF"
 };
diff --git a/ldso/ldso/xtensa/dl-startup.h b/ldso/ldso/xtensa/dl-startup.h
index b135a4c..70a6255 100644
--- a/ldso/ldso/xtensa/dl-startup.h
+++ b/ldso/ldso/xtensa/dl-startup.h
@@ -11,7 +11,7 @@
 __asm__ (
     "	.text\n"
     "	.align  4\n"
-    "	.literal_position\n"
+    "   .literal_position\n"
     "	.global _start\n"
     "	.type   _start, @function\n"
     "	.hidden _start\n"
diff --git a/ldso/ldso/xtensa/dl-sysdep.h b/ldso/ldso/xtensa/dl-sysdep.h
index a0ed4e5..148de5b 100644
--- a/ldso/ldso/xtensa/dl-sysdep.h
+++ b/ldso/ldso/xtensa/dl-sysdep.h
@@ -78,10 +78,13 @@ typedef struct xtensa_got_location_struct {
 struct elf_resolve;
 extern unsigned long _dl_linux_resolver (struct elf_resolve *, int);
 
-/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
-   undefined references should not be allowed to define the value.  */
+/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or
+   TLS variable, so undefined references should not be allowed to define
+   the value.  */
 #define elf_machine_type_class(type) \
-  (((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
+  (((type) == R_XTENSA_JMP_SLOT || (type) == R_XTENSA_TLS_TPOFF \
+   || (type) == R_XTENSA_TLSDESC_FN || (type) == R_XTENSA_TLSDESC_ARG) \
+   * ELF_RTYPE_CLASS_PLT)
 
 /* Return the link-time address of _DYNAMIC.  */
 static __always_inline Elf32_Addr
diff --git a/ldso/ldso/xtensa/dl-tlsdesc.S b/ldso/ldso/xtensa/dl-tlsdesc.S
new file mode 100644
index 0000000..a6ebc94
--- /dev/null
+++ b/ldso/ldso/xtensa/dl-tlsdesc.S
@@ -0,0 +1,96 @@
+/* Thread-local storage handling in the ELF dynamic linker.  Xtensa version.
+   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <sysdep.h>
+#include <tls.h>
+#include "tlsdesc.h"
+
+
+	.text
+	.align 4
+	.hidden _dl_tlsdesc_return
+	.global	_dl_tlsdesc_return
+	.type	_dl_tlsdesc_return, @function
+_dl_tlsdesc_return:
+	entry	a1, 16
+	rur.threadptr	a3
+	add		a2, a2, a3
+	retw
+	.size	_dl_tlsdesc_return, .-_dl_tlsdesc_return
+
+#ifdef SHARED
+
+
+	/* This function is used for symbols that need dynamic TLS.
+
+	   The argument passed to this function points to the TLS descriptor.
+
+	   The assembly code that follows is a rendition of the following
+	   C code, hand-optimized a little bit.
+
+	   ptrdiff_t
+	   _dl_tlsdesc_dynamic(struct tlsdesc_dynamic_arg *td)
+	   {
+	     dtv_t *dtv = (dtv_t *)THREAD_DTV();
+	     if (td->gen_count <= dtv[0].counter
+	         && dtv[td->tlsinfo.ti_module].pointer.val
+	            != TLS_DTV_UNALLOCATED)
+	       return dtv[td->tlsinfo.ti_module].pointer.val
+	              + td->tlsinfo.ti_offset - __builtin_thread_pointer();
+	     return __tls_get_addr (&td->tlsinfo) - __builtin_thread_pointer();
+	   }
+	 */
+
+	.align 4
+	.hidden _dl_tlsdesc_dynamic
+	.global	_dl_tlsdesc_dynamic
+	.type	_dl_tlsdesc_dynamic, @function
+_dl_tlsdesc_dynamic:
+	entry	a1, 32
+
+	/* dtv_t *dtv = (dtv_t *)THREAD_DTV(); */
+	rur.threadptr	a3
+	l32i	a4, a3, 0
+
+	/* if (td->gen_count <= dtv[0].counter */
+	l32i	a6, a2, TLSDESC_GEN_COUNT
+	l32i	a7, a4, 0
+	blt	a7, a6, .Lslow
+
+	/* && dtv[td->tlsinfo.ti_module].pointer.val != TLS_DTV_UNALLOCATED) */
+	l32i	a6, a2, TLSDESC_MODID
+	addx8	a6, a3, a6
+	l32i	a6, a6, 0
+	beqi	a6, -1, .Lslow
+
+	/* return dtv[td->tlsinfo.ti_module].pointer.val
+	     + td->tlsinfo.ti_offset - __builtin_thread_pointer(); */
+	l32i	a6, a2, TLSDESC_MODOFF
+	sub	a2, a6, a3
+	retw
+
+	/* return __tls_get_addr (&td->tlsinfo) - __builtin_thread_pointer(); */
+.Lslow:
+	mov	a10, a2
+	movi	a8, __tls_get_addr
+	callx8	a8
+	sub	a2, a10, a3
+	retw
+	.size	_dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic
+
+#endif /* SHARED */
diff --git a/ldso/ldso/xtensa/elfinterp.c b/ldso/ldso/xtensa/elfinterp.c
index b4cf975..1397e95 100644
--- a/ldso/ldso/xtensa/elfinterp.c
+++ b/ldso/ldso/xtensa/elfinterp.c
@@ -31,6 +31,8 @@
  */
 
 #include "ldso.h"
+#include "dl-tls.h"
+#include "tlsdeschtab.h"
 
 unsigned long
 _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry)
@@ -146,6 +148,9 @@ _dl_do_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,
 	int reloc_type;
 	int symtab_index;
 	char *symname;
+#if defined USE_TLS && USE_TLS
+	struct elf_resolve *tls_tpnt = NULL;
+#endif
 	struct symbol_ref sym_ref;
 	ElfW(Addr) *reloc_addr;
 	ElfW(Addr) symbol_addr;
@@ -172,15 +177,22 @@ _dl_do_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,
 		 * here, so all bases should be covered.
 		 */
 		if (unlikely (!symbol_addr &&
+					  ELF_ST_TYPE (sym_ref.sym->st_info) != STT_TLS &&
 					  ELF_ST_BIND (sym_ref.sym->st_info) != STB_WEAK)) {
-			_dl_dprintf (2, "%s: can't resolve symbol '%s'\n",
-						 _dl_progname, symname);
-			_dl_exit (1);
+			return 1;
 		}
 		if (_dl_trace_prelink) {
 			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],
 						&sym_ref, elf_machine_type_class(reloc_type));
 		}
+#if defined USE_TLS && USE_TLS
+		tls_tpnt = sym_ref.tpnt;
+#endif
+	} else {
+		symbol_addr =symtab[symtab_index].st_value;
+#if defined USE_TLS && USE_TLS
+		tls_tpnt = tpnt;
+#endif
 	}
 
 #if defined (__SUPPORT_LD_DEBUG__)
@@ -198,8 +210,8 @@ _dl_do_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,
 
 	case R_XTENSA_RTLD:
 		if (rpnt->r_addend == 1) {
-			/* Grab the function pointer stashed at the beginning of the
-			   GOT by the GOT_INIT function.  */
+			/* Grab the function pointer stashed at the beginning
+			   of the GOT by the GOT_INIT function.  */
 			*reloc_addr = *(ElfW(Addr) *) tpnt->dynamic_info[DT_PLTGOT];
 		} else if (rpnt->r_addend == 2) {
 			/* Store the link map for the object.  */
@@ -213,6 +225,35 @@ _dl_do_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,
 		*reloc_addr += tpnt->loadaddr + rpnt->r_addend;
 		break;
 
+#if defined USE_TLS && USE_TLS
+	case R_XTENSA_TLS_TPOFF:
+		CHECK_STATIC_TLS((struct link_map *) tls_tpnt);
+		*reloc_addr = symbol_addr + tls_tpnt->l_tls_offset + rpnt->r_addend;
+		break;
+	case R_XTENSA_TLSDESC_FN:
+#ifndef SHARED
+		CHECK_STATIC_TLS((struct link_map *) tls_tpnt);
+#else
+		if (!TRY_STATIC_TLS ((struct link_map *) tls_tpnt))
+			*reloc_addr = (ElfW(Addr)) _dl_tlsdesc_dynamic;
+		else
+#endif
+			*reloc_addr = (ElfW(Addr)) _dl_tlsdesc_return;
+		break;
+	case R_XTENSA_TLSDESC_ARG:
+#ifndef SHARED
+		CHECK_STATIC_TLS((struct link_map *) tls_tpnt);
+#else
+		if (!TRY_STATIC_TLS ((struct link_map *) tls_tpnt))
+			*reloc_addr = (ElfW(Addr))
+				_dl_make_tlsdesc_dynamic((struct link_map *) tls_tpnt,
+										 symbol_addr + *reloc_addr);
+		else
+#endif
+			*reloc_addr += symbol_addr + tls_tpnt->l_tls_offset;
+		break;
+#endif
+
 	default:
 		return -1; /* Calls _dl_exit(1).  */
 	}
diff --git a/libc/sysdeps/linux/xtensa/Makefile.arch b/libc/sysdeps/linux/xtensa/Makefile.arch
index 277a1e3..b9b6b87 100644
--- a/libc/sysdeps/linux/xtensa/Makefile.arch
+++ b/libc/sysdeps/linux/xtensa/Makefile.arch
@@ -5,7 +5,10 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CSRC-y := brk.c fork.c sigaction.c __syscall_error.c
+CSRC-y := brk.c sigaction.c __syscall_error.c
 
 SSRC-y := bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S \
 	sigrestorer.S syscall.S mmap.S windowspill.S __longjmp.S vfork.S
+
+CSRC-$(if $(UCLIBC_HAS_THREADS_NATIVE),,y) += fork.c
+SSRC-$(if $(UCLIBC_HAS_THREADS_NATIVE),,y) += clone.S
diff --git a/libc/sysdeps/linux/xtensa/clone.S b/libc/sysdeps/linux/xtensa/clone.S
index aa79aa7..34d68a8 100644
--- a/libc/sysdeps/linux/xtensa/clone.S
+++ b/libc/sysdeps/linux/xtensa/clone.S
@@ -1,34 +1,38 @@
-/* Copyright (C) 2001, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2005 Free Software Foundation, Inc.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* clone is even more special than fork as it mucks with stacks
-   and invokes a function in the right context after it's all over.  */
+   and invokes a function in the right context after its all over.  */
 
-#include "sysdep.h"
-#include <sys/syscall.h>
+#include <features.h>
+#include <sysdep.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
+#ifdef RESET_PID
+#include <tls.h>
+#endif
+#define __ASSEMBLY__
+#include <linux/sched.h>
 
-/* int clone (a2 = int (*fn)(void *arg),
-	      a3 = void *child_stack,
-	      a4 = int flags,
-	      a5 = void *arg,
-              a6 = pid_t *ptid,
-	      a7 = struct user_desc *tls,
-	      16(sp) = pid_t *ctid) */
+/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg,
+                    a2                    a3               a4        a5
+             pid_t *ptid, struct user_desc *tls, pid_t *ctid)
+                   a6               a7              16(sp)
+*/
 
         .text
 ENTRY (__clone)
@@ -39,7 +43,7 @@ ENTRY (__clone)
 
 	/* a2 and a3 are candidates for destruction by system-call return
 	   parameters.  We don't need the stack pointer after the system
-	   call.  We trust that the kernel will preserve a7, a9, and a6.  */
+	   call.  We trust that the kernel will preserve a6, a7 and a9. */
 
 	mov	a9, a5			/* save function argument */
 	mov	a5, a7
@@ -48,19 +52,18 @@ ENTRY (__clone)
 	mov	a6, a4
 	mov	a4, a8
 	l32i	a8, a1, 16		/* child_tid */
-	movi	a2, SYS_ify (clone)
-
-	/* syscall (a2 = NR_clone,
-		    a6 = clone_flags,
-		    a3 = usp,
-		    a4 = parent_tid,
-		    a5 = child_tls,
-		    a8 = child_tid) */
+	movi	a2, SYS_ify(clone)
+
+	/* syscall(NR_clone,clone_flags, usp, parent_tid, child_tls, child_tid)
+                     a2         a6        a3        a4        a5         a8
+         */
+
 	syscall
 	bltz	a2, SYSCALL_ERROR_LABEL
 	beqz	a2, .Lthread_start
 
-	/* Fall through for parent.  */
+	/* fall through for parent */
+
 .Lpseudo_end:
 	retw
 
@@ -69,32 +72,38 @@ ENTRY (__clone)
 	j	SYSCALL_ERROR_LABEL
 
 .Lthread_start:
-	/* Start child thread.  */
-	movi	a0, 0			/* terminate the stack frame */
+
+#if CLONE_THREAD != 0x00010000 || CLONE_VM != 0x00000100
+# error invalid values for CLONE_THREAD or CLONE_VM
+#endif
 
 #ifdef RESET_PID
-	/* Check and see if we need to reset the PID.  */
-	bbsi.l	a6, 16, 1f		/* CLONE_THREAD = 0x00010000 */
+	bbsi.l	a6, 16, .Lskip_restore_pid	/* CLONE_THREAD = 0x00010000 */
 	movi	a2, -1
-	bbsi.l	a6, 8, 2f		/* CLONE_VM = 0x00000100 */
-	movi	a2, SYS_ify (getpid)
+	bbsi	a6, 8, .Lgotpid			/* CLONE_VM     = 0x00000100 */
+	movi	a2, SYS_ify(getpid)
 	syscall
-2:	rur	a3, THREADPTR
-	movi	a4, PID_OFFSET
-	add	a4, a4, a3
-	s32i	a2, a4, 0
-	movi	a4, TID_OFFSET
-	add	a4, a4, a3
-	s32i	a2, a3, 0
-1:
-#endif /* RESET_PID */
-
+.Lgotpid:
+	rur	a3, threadptr
+	movi	a0, TLS_PRE_TCB_SIZE
+	sub	a3, a3, a0
+	s32i	a2, a3, PID
+	s32i	a2, a3, TID
+.Lskip_restore_pid:
+#endif
+
+	/* start child thread */
+	movi	a0, 0			/* terminate the stack frame */
 	mov	a6, a9			/* load up the 'arg' parameter */
 	callx4	a7			/* call the user's function */
 
 	/* Call _exit.  Note that any return parameter from the user's
-	   function in a6 is seen as inputs to _exit.  */
-	movi	a2, JUMPTARGET(_exit)
+	   function in a6 is seen as inputs to _exit. */
+#ifdef	PIC
+	movi	a2, _exit at PLT
+#else
+	movi	a2, _exit
+#endif
 	callx4	a2
 
 PSEUDO_END (__clone)
diff --git a/libc/sysdeps/linux/xtensa/fork.c b/libc/sysdeps/linux/xtensa/fork.c
index e9b681c..4e4f937 100644
--- a/libc/sysdeps/linux/xtensa/fork.c
+++ b/libc/sysdeps/linux/xtensa/fork.c
@@ -20,6 +20,10 @@ pid_t fork(void)
 {
 	return (pid_t) INLINE_SYSCALL(clone, 2, SIGCHLD, 0);
 }
-lt_strong_alias(fork)
-lt_libc_hidden(fork)
+# ifdef __UCLIBC_HAS_THREADS__
+strong_alias(fork,__libc_fork)
+libc_hidden_weak(fork)
+# else
+libc_hidden_def(fork)
+# endif
 #endif
diff --git a/libc/sysdeps/linux/xtensa/jmpbuf-unwind.h b/libc/sysdeps/linux/xtensa/jmpbuf-unwind.h
index 41f81db..4516d93 100644
--- a/libc/sysdeps/linux/xtensa/jmpbuf-unwind.h
+++ b/libc/sysdeps/linux/xtensa/jmpbuf-unwind.h
@@ -1,25 +1,23 @@
-/* Copyright (C) 1997, 1998, 2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Test if longjmp to JMPBUF would unwind the frame containing a local
-   variable at ADDRESS.  */
-
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
 #include <setjmp.h>
 #include <jmpbuf-offsets.h>
 
+/* Test if longjmp to JMPBUF would unwind the frame
+   containing a local variable at ADDRESS.  */
 #define _JMPBUF_UNWINDS(jmpbuf, address) \
   ((void *) (address) < (void *) (jmpbuf)[JB_SP])
+
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
+#include <stdint.h>
+#include <unwind.h>
+
+#define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
+  _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
+
+#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \
+  ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj))
+#endif
diff --git a/libc/sysdeps/linux/c6x/sys/ptrace.h b/libc/sysdeps/linux/xtensa/sys/ptrace.h
similarity index 84%
copy from libc/sysdeps/linux/c6x/sys/ptrace.h
copy to libc/sysdeps/linux/xtensa/sys/ptrace.h
index 8ca7e15..882b8c8 100644
--- a/libc/sysdeps/linux/c6x/sys/ptrace.h
+++ b/libc/sysdeps/linux/xtensa/sys/ptrace.h
@@ -1,5 +1,6 @@
 /* `ptrace' debugger support interface.  Linux version.
-   Copyright (C) 1996-1999,2000,2006,2007 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2007
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,6 +22,15 @@
 
 #include <features.h>
 
+/* Kludge away careless namespace pollution from the kernel. */
+
+#undef PTRACE_GETREGS
+#undef PTRACE_SETREGS
+#undef PTRACE_GETFPREGS
+#undef PTRACE_SETFPREGS
+#undef PTRACE_GETFPREGSIZE
+
+
 __BEGIN_DECLS
 
 /* Type of the REQUEST argument to `ptrace.'  */
@@ -97,35 +107,14 @@ enum __ptrace_request
   PTRACE_DETACH = 17,
 #define PT_DETACH PTRACE_DETACH
 
-  /* Get all extended floating point registers used by a processes.
-     This is not supported on all machines.  */
-   PTRACE_GETFPXREGS = 18,
-#define PT_GETFPXREGS PTRACE_GETFPXREGS
-
-  /* Set all extended floating point registers used by a processes.
+  /* Get size required for the buffer holding the floating point registers.
      This is not supported on all machines.  */
-   PTRACE_SETFPXREGS = 19,
-#define PT_SETFPXREGS PTRACE_SETFPXREGS
+   PTRACE_GETFPREGSIZE = 18,
+#define PT_GETFPREGSIZE PTRACE_GETFPREGSIZE
 
   /* Continue and stop at the next (return from) syscall.  */
-  PTRACE_SYSCALL = 24,
+  PTRACE_SYSCALL = 24
 #define PT_SYSCALL PTRACE_SYSCALL
-
-  /* Set ptrace filter options.  */
-  PTRACE_SETOPTIONS = 0x4200,
-#define PT_SETOPTIONS PTRACE_SETOPTIONS
-
-  /* Get last ptrace message.  */
-  PTRACE_GETEVENTMSG = 0x4201,
-#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
-
-  /* Get siginfo for process.  */
-  PTRACE_GETSIGINFO = 0x4202,
-#define PT_GETSIGINFO PTRACE_GETSIGINFO
-
-  /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
-#define PT_SETSIGINFO PTRACE_SETSIGINFO
 };
 
 /* Options set using PTRACE_SETOPTIONS.  */
diff --git a/libc/sysdeps/linux/xtensa/sysdep.h b/libc/sysdeps/linux/xtensa/sysdep.h
index afe95cc..cab4a2f 100644
--- a/libc/sysdeps/linux/xtensa/sysdep.h
+++ b/libc/sysdeps/linux/xtensa/sysdep.h
@@ -16,6 +16,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef _LINUX_XTENSA_SYSDEP_H
+#define _LINUX_XTENSA_SYSDEP_H 1
+
+#include <common/sysdep.h>
 #include <sys/syscall.h>
 
 #ifdef __ASSEMBLER__
@@ -24,12 +28,6 @@
 #define ASM_TYPE_DIRECTIVE(name, typearg) .type name, typearg
 #define ASM_SIZE_DIRECTIVE(name) .size name, . - name
 
-#ifdef __STDC__
-#define C_LABEL(name)	name :
-#else
-#define C_LABEL(name)	name/**/:
-#endif
-
 #define	ENTRY(name)							\
   ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name);				\
   ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name), @function);			\
@@ -52,6 +50,15 @@
 #undef END
 #define END(name) ASM_SIZE_DIRECTIVE(name)
 
+/* Local label name for asm code. */
+#ifndef L
+# ifdef HAVE_ELF
+#  define L(name)       .L##name
+# else
+#  define L(name)       name
+# endif
+#endif
+
 /* Define a macro for this directive so it can be removed in a few places.  */
 #define LITERAL_POSITION .literal_position
 
@@ -123,19 +130,7 @@
 #define	PSEUDO_END_ERRVAL(name)						      \
   END (name)
 
-#undef ret_ERRVAL
-#define ret_ERRVAL retw
-
-#if defined RTLD_PRIVATE_ERRNO
-# define SYSCALL_ERROR_HANDLER						      \
-0:	movi	a4, rtld_errno;						      \
-	neg	a2, a2;							      \
-	s32i	a2, a4, 0;						      \
-	movi	a2, -1;							      \
-	j	.Lpseudo_end;
-
-#elif defined _LIBC_REENTRANT
-
+#if defined _LIBC_REENTRANT
 # if defined USE___THREAD
 #  ifndef NOT_IN_libc
 #   define SYSCALL_ERROR_ERRNO __libc_errno
@@ -170,3 +165,9 @@
 #endif /* _LIBC_REENTRANT */
 
 #endif	/* __ASSEMBLER__ */
+
+/* Pointer mangling is not yet supported for Xtensa.  */
+#define PTR_MANGLE(var) (void) (var)
+#define PTR_DEMANGLE(var) (void) (var)
+
+#endif	/* _LINUX_XTENSA_SYSDEP_H */
diff --git a/libc/sysdeps/linux/xtensa/vfork.S b/libc/sysdeps/linux/xtensa/vfork.S
index f094ae3..6aced0a 100644
--- a/libc/sysdeps/linux/xtensa/vfork.S
+++ b/libc/sysdeps/linux/xtensa/vfork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2005-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,72 +19,67 @@
 #include <sys/syscall.h>
 #define _SIGNAL_H
 #include <bits/signum.h>
+#define __ASSEMBLY__
+#include <linux/sched.h>
 
 
-/* Clone the calling process, but without copying the whole address space.
+/*
+   Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
    replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
    and the process ID of the new process to the old process.
 
    Note that it is important that we don't create a new stack frame for the
-   caller.  */
+   caller.
 
-
-/* The following are defined in linux/sched.h, which unfortunately
-   is not safe for inclusion in an assembly file.  */
-#define CLONE_VM        0x00000100     /* set if VM shared between processes */
-#define CLONE_VFORK     0x00004000     /* set if the parent wants the child to
-					  wake it up on mm_release */
+*/
 
 #ifndef SAVE_PID
-#define SAVE_PID
+#define SAVE_PID(a,b,c,d)
 #endif
-
 #ifndef RESTORE_PID
-#define RESTORE_PID
+#define RESTORE_PID(a,b,c)
+#endif
+#ifndef RESTORE_PID12
+#define RESTORE_PID12(a,b,c)
 #endif
 
+/*
+   pid_t vfork(void);
+   Implemented as __clone_syscall(CLONE_VFORK | CLONE_VM | SIGCHLD, 0)
+ */
 
-/* pid_t vfork(void);
-   Implemented as __clone_syscall(CLONE_VFORK | CLONE_VM | SIGCHLD, 0) */
 
 HIDDEN_ENTRY (__vfork)
+        .literal .Ljumptable, 0, .L4, .L8, .L12
 
-	movi	a6, .Ljumptable
-	extui	a2, a0, 30, 2		/* call-size: call4/8/12 = 1/2/3 */
-	addx4	a4, a2, a6		/* find return address in jumptable */
-	l32i	a4, a4, 0
-	add	a4, a4, a6
-
+	mov	a3, a0			# move return address out of the way
+	movi	a0, .Ljumptable
+	extui	a2, a3, 30, 2		# call-size: call4/8/12 = 1/2/3
+	addx4	a0, a2, a0		# find return address in jumptable
 	slli	a2, a2, 30
-	xor	a3, a0, a2		/* remove call-size from return addr */
-	extui	a5, a4, 30, 2		/* get high bits of jump target */
-	slli	a5, a5, 30
-	or	a3, a3, a5		/* stuff them into the return address */
-	xor	a4, a4, a5		/* clear high bits of jump target */
-	or	a0, a4, a2		/* create temporary return address */
-	retw				/* "return" to .L4, .L8, or .L12 */
-
-	.align	4
-.Ljumptable:
-	.word	0
-	.word	.L4 - .Ljumptable
-	.word	.L8 - .Ljumptable
-	.word	.L12 - .Ljumptable
+	l32i	a0, a0, 0
+
+	xor	a3, a3, a2		# remove call-size from return address
+	or	a0, a0, a2		# create temporary return address
+	retw
 
 	/* a7: return address */
+
 .L4:	mov	a12, a2
 	mov	a13, a3
 
-	SAVE_PID
+	SAVE_PID(a5,a15,a2,a3)
+
+	/* use syscall 'clone' and set new stack pointer to the same address */
 
-	/* Use syscall 'clone'.  Set new stack pointer to the same address.  */
-	movi	a2, SYS_ify (clone)
+	movi	a2, SYS_ify(clone)
 	movi	a3, 0
 	movi	a6, CLONE_VM | CLONE_VFORK | SIGCHLD
+
         syscall
 
-	RESTORE_PID
+	RESTORE_PID(a5,a15,a2)
 
 	movi	a5, -4096
 
@@ -94,22 +89,24 @@ HIDDEN_ENTRY (__vfork)
 
 	bgeu	a6, a5, 1f
 	jx	a7
-1:	call4	.Lerr			/* returns to original caller */
 
+1:	call4	.Lerr
 
 	/* a11: return address */
+
 .L8:	mov	a12, a2
 	mov	a13, a3
 	mov	a14, a6
 
-	SAVE_PID
+	SAVE_PID(a9,a15,a2,a3)
 
-	movi	a2, SYS_ify (clone)
+	movi	a2, SYS_ify(clone)
 	movi	a3, 0
 	movi	a6, CLONE_VM | CLONE_VFORK | SIGCHLD
+
 	syscall
 
-	RESTORE_PID
+	RESTORE_PID(a9,a15,a2)
 
 	movi	a9, -4096
 
@@ -120,22 +117,25 @@ HIDDEN_ENTRY (__vfork)
 
 	bgeu	a10, a9, 1f
 	jx	a11
-1:	call8	.Lerr			/* returns to original caller */
+
+1:	call8	.Lerr
 
 
 	/* a15: return address */
+
 .L12:	mov	a12, a2
 	mov	a13, a3
 	mov	a14, a6
 
-	SAVE_PID
+	SAVE_PID (a2,a3,a2,a6)
 
-	movi	a2, SYS_ify (clone)
+	movi	a2, SYS_ify(clone)
 	movi	a3, 0
 	movi	a6, CLONE_VM | CLONE_VFORK | SIGCHLD
+
 	syscall
 
-	RESTORE_PID
+	RESTORE_PID12(a3,a6,a15)
 
 	mov	a3, a13
 	movi	a13, -4096
@@ -147,18 +147,18 @@ HIDDEN_ENTRY (__vfork)
 
 	bgeu	a14, a13, 1f
 	jx	a15
-1:	call12	.Lerr			/* returns to original caller */
 
+1:	call12	.Lerr
 
 	.align 4
+
 .Lerr:	entry	a1, 16
 
-	/* Restore the return address.  */
-	extui	a4, a0, 30, 2		/* get the call-size bits */
+	/* Restore return address */
+
+	extui	a4, a0, 30, 2
 	slli	a4, a4, 30
-	slli	a3, a3, 2		/* clear high bits of target address */
-	srli	a3, a3, 2
-	or	a0, a3, a4		/* combine them */
+	or	a0, a3, a4
 
 	PSEUDO_END (__vfork)
 .Lpseudo_end:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
index 2a5bf6d..75369bd 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
@@ -22,8 +22,6 @@
 #include <lowlevellock.h>
 #include <sys/time.h>
 #include <tls.h>
-#include <tcb-offsets.h>
-
 
 void
 #ifndef IS_IN_libpthread
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/Makefile.arch
new file mode 100644
index 0000000..8ebe287
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/Makefile.arch
@@ -0,0 +1,15 @@
+# uClibc-ng project
+# Licensed under the LGPL v2.1, see the file COPYING and LICENSE.
+
+libc_linux_arch_CSRC = fork.c
+libc_linux_arch_SSRC = clone.S vfork.S
+libpthread_linux_arch_CSRC = pthread_once.c
+libpthread_linux_arch_SSRC =
+
+CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread
+ASFLAGS-pt-vfork.S = -DNOT_IN_libc -DIS_IN_libpthread -D_LIBC_REENTRANT
+
+ASFLAGS-clone.S = -D_LIBC_REENTRANT
+ASFLAGS-vfork.S = -D_LIBC_REENTRANT
+ASFLAGS-syscall.S = -D_LIBC_REENTRANT
+ASFLAGS-mmap.S = -D_LIBC_REENTRANT
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/pthreadtypes.h b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/bits/pthreadtypes.h
similarity index 94%
copy from libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/pthreadtypes.h
copy to libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/bits/pthreadtypes.h
index ae0d79f..5e44020 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/pthreadtypes.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/bits/pthreadtypes.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -12,7 +12,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
+   License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
 #ifndef _BITS_PTHREADTYPES_H
@@ -37,11 +37,15 @@
 typedef unsigned long int pthread_t;
 
 
-typedef union
+union pthread_attr_t
 {
   char __size[__SIZEOF_PTHREAD_ATTR_T];
   long int __align;
-} pthread_attr_t;
+};
+#ifndef __have_pthread_attr_t
+typedef union pthread_attr_t pthread_attr_t;
+# define __have_pthread_attr_t	1
+#endif
 
 
 typedef struct __pthread_internal_slist
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/bits/semaphore.h b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/bits/semaphore.h
similarity index 94%
copy from libpthread/nptl/sysdeps/unix/sysv/linux/metag/bits/semaphore.h
copy to libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/bits/semaphore.h
index dadfac2..8845cf0 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/bits/semaphore.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/bits/semaphore.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/clone.S b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/clone.S
new file mode 100644
index 0000000..539b9ef
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/clone.S
@@ -0,0 +1,3 @@
+#define RESET_PID
+#include <tcb-offsets.h>
+#include <libc/sysdeps/linux/xtensa/clone.S>
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/createthread.c b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/createthread.c
similarity index 85%
copy from libpthread/nptl/sysdeps/unix/sysv/linux/metag/createthread.c
copy to libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/createthread.c
index 2d43559..2bb96e9 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/createthread.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/createthread.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -8,7 +8,7 @@
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
@@ -19,5 +19,6 @@
 /* Value passed to 'clone' for initialization of the thread register.  */
 #define TLS_VALUE (pd + 1)
 
-/* Get the real implementation.	 */
+
+/* Get the real implementation.  */
 #include <sysdeps/pthread/createthread.c>
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/fork.c
similarity index 89%
copy from libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c
copy to libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/fork.c
index e7a41d8..ba5c700 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/fork.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper at redhat.com>, 2002.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/lowlevellock.c
similarity index 92%
copy from libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c
copy to libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/lowlevellock.c
index cd42135..756f39f 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/lowlevellock.c
@@ -1,5 +1,5 @@
 /* low level locking for pthread library.  Generic futex-using version.
-   Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -13,19 +13,15 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
+   License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sysdep.h>
 #include <lowlevellock.h>
 #include <sys/time.h>
-#include <tls.h>
 
 void
-#ifndef IS_IN_libpthread
-weak_function
-#endif
 __lll_lock_wait_private (int *futex)
 {
   do
@@ -71,7 +67,7 @@ __lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
       struct timeval tv;
 
       /* Get the current time.  */
-      (void) gettimeofday (&tv, NULL);
+      (void) __gettimeofday (&tv, NULL);
 
       /* Compute relative timeout.  */
       rt.tv_sec = abstime->tv_sec - tv.tv_sec;
@@ -110,7 +106,7 @@ __lll_timedwait_tid (int *tidp, const struct timespec *abstime)
       struct timespec rt;
 
       /* Get the current time.  */
-      (void) gettimeofday (&tv, NULL);
+      (void) __gettimeofday (&tv, NULL);
 
       /* Compute relative timeout.  */
       rt.tv_sec = abstime->tv_sec - tv.tv_sec;
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/lowlevellock.h
similarity index 93%
copy from libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.h
copy to libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/lowlevellock.h
index 116a8c2..abe6e9c 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/lowlevellock.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2005-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -12,7 +12,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
+   License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LOWLEVELLOCK_H
@@ -69,7 +69,7 @@
       : (fl))								      \
    : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG)				      \
 	      & THREAD_GETMEM (THREAD_SELF, header.private_futex))))
-# endif	      
+# endif
 #endif
 
 
@@ -86,6 +86,18 @@
     __ret;								      \
   })
 
+#define lll_futex_timed_wait_bitset(futexp, val, timespec, clockbit, private) \
+  ({									\
+    INTERNAL_SYSCALL_DECL (__err);					\
+    long int __ret;							\
+    int __op = FUTEX_WAIT_BITSET | clockbit;				\
+    __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp),		\
+			      __lll_private_flag (__op, private),	\
+			      (val), (timespec), NULL /* Unused.  */,	\
+			      FUTEX_BITSET_MATCH_ANY);			\
+    __ret;								\
+  })
+
 #define lll_futex_wake(futexp, nr, private) \
   ({									      \
     INTERNAL_SYSCALL_DECL (__err);					      \
@@ -256,7 +268,7 @@ extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *,
     1  -  taken by one user
    >1  -  taken by more users */
 
-/* The kernel notifies a process which uses CLONE_CLEARTID via futex
+/* The kernel notifies a process which uses CLONE_CHILD_CLEARTID via futex
    wakeup when the clone terminates.  The memory location contains the
    thread ID while the clone is running and is reset to zero
    afterwards.	*/
diff --git a/libpthread/nptl/sysdeps/pthread/pt-initfini.c b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/pt-initfini.c
similarity index 94%
copy from libpthread/nptl/sysdeps/pthread/pt-initfini.c
copy to libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/pt-initfini.c
index d9881c7..4e6d26e 100644
--- a/libpthread/nptl/sysdeps/pthread/pt-initfini.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/pt-initfini.c
@@ -106,6 +106,11 @@ _fini (void)
   __asm__ ("END_FINI");
   __asm__ ("\n/*@_fini_PROLOG_ENDS*/");
 
+  /* Xtensa: It doesn't really matter whether GCC thinks this is a leaf
+     function or not, and the scripts that are supposed to remove the
+     call don't catch the literal, resulting in an undefined symbol
+     reference.  */
+#if 0
   {
     /* Let GCC know that _fini is not a leaf function by having a dummy
        function call here.  We arrange for this call to be omitted from
@@ -113,6 +118,7 @@ _fini (void)
     extern void i_am_not_a_leaf (void);
     i_am_not_a_leaf ();
   }
+#endif
 
   /* Beginning of the _fini epilog. */
   __asm__ ("\n/*@_fini_EPILOG_BEGINS*/");
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/pthread_once.c
similarity index 80%
copy from libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c
copy to libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/pthread_once.c
index 8a0faaf..46085d3 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/pthread_once.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -12,13 +12,12 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
+   License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
 #include "pthreadP.h"
 #include <lowlevellock.h>
 
-
 unsigned long int __fork_generation attribute_hidden;
 
 static void
@@ -31,14 +30,12 @@ clear_once_control (void *arg)
 }
 
 int
-attribute_protected
 __pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
 {
   for (;;)
     {
       int oldval;
       int newval;
-      int tmp;
 
       /* Pseudo code:
 	 newval = __fork_generation | 1;
@@ -47,17 +44,13 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
 	   *once_control = newval;
 	 Do this atomically.
       */
-      newval = __fork_generation | 1;
-      __asm__ __volatile__ (
-		"1:	ldl_l	%0, %2\n"
-		"	and	%0, 2, %1\n"
-		"	bne	%1, 2f\n"
-		"	mov	%3, %1\n"
-		"	stl_c	%1, %2\n"
-		"	beq	%1, 1b\n"
-		"2:	mb"
-		: "=&r" (oldval), "=&r" (tmp), "=m" (*once_control)
-		: "r" (newval), "m" (*once_control));
+      do
+	{
+	  newval = __fork_generation | 1;
+	  oldval = *once_control;
+	  if (oldval & 2)
+	    break;
+	} while (atomic_compare_and_exchange_val_acq (once_control, newval, oldval) != oldval);
 
       /* Check if the initializer has already been done.  */
       if ((oldval & 2) != 0)
@@ -84,8 +77,8 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
 
   pthread_cleanup_pop (0);
 
-  /* Add one to *once_control to take the bottom 2 bits from 01 to 10.  */
-  atomic_increment (once_control);
+  /* Say that the initialisation is done.  */
+  *once_control = __fork_generation | 2;
 
   /* Wake up all other threads.  */
   lll_futex_wake (once_control, INT_MAX, LLL_PRIVATE);
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h
new file mode 100644
index 0000000..6bb2aeb
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h
@@ -0,0 +1,108 @@
+/* Copyright (C) 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+#include <tls.h>
+/* #include <pt-machine.h> */
+#ifndef __ASSEMBLER__
+# include <pthreadP.h>
+#endif
+
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+// FIXME: ENTRY includes an entry instruction, here we'd want entry sp, 48!
+# undef PSEUDO
+# define PSEUDO(name, syscall_name, args)				      \
+  .text;								      \
+  ENTRY (name)								      \
+    SINGLE_THREAD_P(a15);						      \
+    bnez     a15, .Lpseudo_cancel; 					      \
+    DO_CALL (syscall_name, args);					      \
+    bgez     a2, .Lpseudo_done; 					      \
+    movi     a4, -4095;							      \
+    blt      a2, a4, .Lpseudo_done; 					      \
+    j        SYSCALL_ERROR_LABEL;					      \
+  .Lpseudo_done: 							      \
+    retw;								      \
+  .Lpseudo_cancel: 							      \
+    /* The syscall args are in a2...a7; no need to save */		      \
+    CENABLE;								      \
+    /* The return value is in a10 and preserved across the syscall */	      \
+    DO_CALL (syscall_name, args);					      \
+    CDISABLE;								      \
+    bgez     a2, .Lpseudo_end;                                                \
+    movi     a4, -4095;							      \
+    blt      a2, a4, .Lpseudo_end;                                            \
+    j        SYSCALL_ERROR_LABEL;					      \
+  .Lpseudo_end:
+
+
+# ifdef IS_IN_libpthread
+#  define CENABLE_FUNC	__pthread_enable_asynccancel
+#  define CDISABLE_FUNC	__pthread_disable_asynccancel
+#  define __local_multiple_threads __pthread_multiple_threads
+# elif !defined NOT_IN_libc
+#  define CENABLE_FUNC	__libc_enable_asynccancel
+#  define CDISABLE_FUNC	__libc_disable_asynccancel
+#  define __local_multiple_threads __libc_multiple_threads
+# elif defined IS_IN_librt
+#  define CENABLE_FUNC	__librt_enable_asynccancel
+#  define CDISABLE_FUNC	__librt_disable_asynccancel
+# else
+#  error Unsupported library
+# endif
+
+# define CENABLE	movi    a8, CENABLE_FUNC;		\
+			callx8  a8
+# define CDISABLE	movi    a8, CDISABLE_FUNC;		\
+			callx8  a8
+
+# if defined IS_IN_libpthread || !defined NOT_IN_libc
+#  ifndef __ASSEMBLER__
+extern int __local_multiple_threads attribute_hidden;
+#   define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
+#  else
+#   define SINGLE_THREAD_P(reg) movi reg, __local_multiple_threads; \
+			        l32i reg, reg, 0;
+#  endif
+
+# else
+#  ifndef __ASSEMBLER__
+#   define SINGLE_THREAD_P \
+	__builtin_expect (THREAD_GETMEM (THREAD_SELF, \
+			  header.multiple_threads) == 0, 1)
+#  else
+#   define SINGLE_THREAD_P(reg) \
+	rur reg, threadptr; \
+	l32i reg, reg, MULTIPLE_THREADS_OFFSET;
+#  endif
+# endif
+
+#else
+
+/* This code should never be used but we define it anyhow.  */
+# define SINGLE_THREAD_P (1)
+# define NO_CANCELLATION 1
+
+#endif
+
+
+#ifndef __ASSEMBLER__
+# define RTLD_SINGLE_THREAD_P \
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
+				   header.multiple_threads) == 0, 1)
+#endif
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/vfork.S
new file mode 100644
index 0000000..46eb76d
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/vfork.S
@@ -0,0 +1,59 @@
+/* Copyright (C) 2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <tls.h>
+
+/*
+  Save the PID value, save 0x80000000 if PID was 0.
+  Registers a2 and a3 are available; ar should return the PID and as threadptr
+ */
+
+#define SAVE_PID(pid,tp,ar,as)						\
+	rur	tp, threadptr;						\
+	movi	ar, TLS_PRE_TCB_SIZE;					\
+	sub	tp, tp, ar;						\
+	l32i	pid, tp, PID;						\
+	neg	ar, pid;						\
+	movi	as, 0x80000000;						\
+	moveqz	ar, as, ar;						\
+	s32i	ar, tp, PID;						\
+
+/*
+  Restore the PID value, restore to 0 if saved value was 0x80000000
+  Return value from the syscall is in a2.
+ */
+#define RESTORE_PID(pid,tp,res)						\
+	beqz	res, 1f;						\
+	s32i	pid, tp, PID;						\
+1:
+
+/*
+  Special version for call12, where we don't have enough registers
+  available to preserve the original PID.
+ */
+#define RESTORE_PID12(ar, as, at)					\
+	rur	as, threadptr;						\
+	movi	ar, TLS_PRE_TCB_SIZE;					\
+	sub	as, as, ar;						\
+	l32i	ar, as, PID;						\
+	movi	at, 0x80000000;						\
+	sub	at, at, ar;						\
+	neg	ar, ar;							\
+	moveqz	ar, at, at;						\
+	s32i	ar, as, PID;
+
+#include <libc/sysdeps/linux/xtensa/vfork.S>
diff --git a/libpthread/nptl/sysdeps/xtensa/Makefile.arch b/libpthread/nptl/sysdeps/xtensa/Makefile.arch
new file mode 100644
index 0000000..5bbd409
--- /dev/null
+++ b/libpthread/nptl/sysdeps/xtensa/Makefile.arch
@@ -0,0 +1,40 @@
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+#
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+CFLAGS-pt-raise.c = -DNOT_IN_libc -DIS_IN_libpthread
+
+ASFLAGS-dl-tlsdesc.S = -DNOT_IN_libc=1
+ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread
+ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread
+ASFLAGS-nptl-sysdep.S = -DNOT_IN_libc -DIS_IN_libpthread	\
+                        -D_LIBC_REENTRANT			\
+                        -I$(top_srcdir)libc/sysdeps/linux/xtensa
+
+libc_arch_a_CSRC = libc-tls.c
+librt_arch_a_SSRC = dl-tlsdesc.S
+
+CFLAGS-gen_tlsdesc.c = -S
+$(libpthread_arch_OUT)/gen_tlsdesc.c: $(libpthread_arch_DIR)/tlsdesc.sym | $(libpthread_arch_OUT)
+	$(do_awk) $(top_srcdir)extra/scripts/gen-as-const.awk $< > $@
+$(libpthread_arch_OUT)/gen_tlsdesc.s: $(libpthread_arch_OUT)/gen_tlsdesc.c | headers
+	$(compile.c)
+libpthread-generated-y += $(libpthread_arch_OUT)/gen_tlsdesc.s
+$(libpthread_arch_OUT)/tlsdesc.h: $(libpthread_arch_OUT)/gen_tlsdesc.s
+	$(do_sed) $(PTHREAD_GENERATE_MANGLE) $< > $@
+	@if test ! -s $@ ; then rm -f $@ ; false ; fi
+pregen-headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(libpthread_arch_OUT)/tlsdesc.h
diff --git a/libpthread/nptl/sysdeps/metag/dl-tls.h b/libpthread/nptl/sysdeps/xtensa/dl-tls.h
similarity index 55%
copy from libpthread/nptl/sysdeps/metag/dl-tls.h
copy to libpthread/nptl/sysdeps/xtensa/dl-tls.h
index cba8fcb..29008db 100644
--- a/libpthread/nptl/sysdeps/metag/dl-tls.h
+++ b/libpthread/nptl/sysdeps/xtensa/dl-tls.h
@@ -1,5 +1,5 @@
-/* Thread-local storage handling in the ELF dynamic linker.  Meta version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* Thread-local storage handling in the ELF dynamic linker.  Xtensa version.
+   Copyright (C) 2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,6 +17,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#ifndef _XTENSA_DL_TLS_H
+#define _XTENSA_DL_TLS_H 1
 
 /* Type used for the representation of TLS information in the GOT.  */
 typedef struct
@@ -25,5 +27,32 @@ typedef struct
   unsigned long int ti_offset;
 } tls_index;
 
-
 extern void *__tls_get_addr (tls_index *ti);
+
+/* Type used to represent a TLS descriptor.  */
+struct tlsdesc
+{
+  union
+    {
+      void *pointer;
+      long value;
+    } argument;
+  ptrdiff_t (*entry)(struct tlsdesc *);
+};
+
+/* Type used as the argument in a TLS descriptor for a symbol that
+   needs dynamic TLS offsets.  */
+struct tlsdesc_dynamic_arg
+{
+  tls_index tlsinfo;
+  size_t gen_count;
+};
+
+extern ptrdiff_t attribute_hidden
+  _dl_tlsdesc_return(struct tlsdesc_dynamic_arg *);
+
+extern void *_dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset);
+extern ptrdiff_t attribute_hidden
+  _dl_tlsdesc_dynamic(struct tlsdesc_dynamic_arg *);
+
+#endif
diff --git a/libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/xtensa/jmpbuf-unwind.h
similarity index 89%
copy from libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h
copy to libpthread/nptl/sysdeps/xtensa/jmpbuf-unwind.h
index 11a043b..bda498b 100644
--- a/libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h
+++ b/libpthread/nptl/sysdeps/xtensa/jmpbuf-unwind.h
@@ -23,10 +23,10 @@
    containing a local variable at ADDRESS.  */
 #undef _JMPBUF_UNWINDS
 #define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \
-  ((void *) (address) < (void *) demangle (jmpbuf[__JMP_BUF_SP]))
+  ((void *) (address) < (void *) demangle (jmpbuf[JB_SP]))
 
 #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
   _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
 
 #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \
-  ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[__JMP_BUF_SP] - (_adj))
+  ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj))
diff --git a/libpthread/nptl/sysdeps/arm/libc-tls.c b/libpthread/nptl/sysdeps/xtensa/libc-tls.c
similarity index 88%
copy from libpthread/nptl/sysdeps/arm/libc-tls.c
copy to libpthread/nptl/sysdeps/xtensa/libc-tls.c
index 6576072..80494c5 100644
--- a/libpthread/nptl/sysdeps/arm/libc-tls.c
+++ b/libpthread/nptl/sysdeps/xtensa/libc-tls.c
@@ -1,4 +1,4 @@
-/* Thread-local storage handling in the ELF dynamic linker.  ARM version.
+/* Thread-local storage handling in the ELF dynamic linker.  Xtensa version.
    Copyright (C) 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -21,7 +21,7 @@
 
 #if defined(USE_TLS) && USE_TLS
 
-/* On ARM, linker optimizations are not required, so __tls_get_addr
+/* On Xtensa, linker optimizations are not required, so __tls_get_addr
    can be called even in statically linked binaries.  In this case module
    must be always 1 and PT_TLS segment exist in the binary, otherwise it
    would not link.  */
diff --git a/libc/sysdeps/linux/metag/bits/stackinfo.h b/libpthread/nptl/sysdeps/xtensa/pthread_spin_lock.S
similarity index 72%
copy from libc/sysdeps/linux/metag/bits/stackinfo.h
copy to libpthread/nptl/sysdeps/xtensa/pthread_spin_lock.S
index 55a6121..1e220a8 100644
--- a/libc/sysdeps/linux/metag/bits/stackinfo.h
+++ b/libpthread/nptl/sysdeps/xtensa/pthread_spin_lock.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -16,13 +16,22 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* This file contains a bit of information about the stack allocation
-   of the processor.  */
+	.text
+	.align 4
 
-#ifndef _STACKINFO_H
-#define _STACKINFO_H	1
+	.globl pthread_spin_lock
+pthread_spin_lock:
 
-/* On Meta the stack grows up.  */
-#define _STACK_GROWS_UP	1
+	entry	a1, 16
 
-#endif	/* stackinfo.h */
+	movi	a3, 0
+	wsr 	a3, scompare1
+	movi	a3, 1
+1:	s32c1i	a3, a2, 0
+	bnez	a3, 1b
+	movi	a2, 0
+
+	retw
+
+	.type pthread_spin_lock, @function
+	.size pthread_spin_lock, .-pthread_spin_lock
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/fork.c b/libpthread/nptl/sysdeps/xtensa/pthread_spin_trylock.S
similarity index 72%
copy from libpthread/nptl/sysdeps/unix/sysv/linux/metag/fork.c
copy to libpthread/nptl/sysdeps/xtensa/pthread_spin_trylock.S
index 41776f9..a736b01 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/fork.c
+++ b/libpthread/nptl/sysdeps/xtensa/pthread_spin_trylock.S
@@ -1,6 +1,5 @@
 /* Copyright (C) 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Phil Blundell <pb at nexus.co.uk>, 2005
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -17,15 +16,25 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <sched.h>
-#include <signal.h>
-#include <sysdep.h>
-#include <tls.h>
+#define _ERRNO_H 1
+#include <bits/errno.h>
 
+	.text
+	.align 4
 
-#define ARCH_FORK()							\
-  INLINE_SYSCALL (clone, 5,						\
-		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,	\
-		  NULL, NULL, &THREAD_SELF->tid, NULL)
+	.globl pthread_spin_trylock
+pthread_spin_trylock:
 
-#include "../fork.c"
+	entry	a1, 16
+
+	movi	a3, 0
+	wsr 	a3, scompare1
+	movi	a3, 1
+	s32c1i	a3, a2, 0
+	movi	a2, EBUSY
+	moveqz	a2, a3, a3
+
+	retw
+
+	.type pthread_spin_trylock, @function
+	.size pthread_spin_trylock, .-pthread_spin_trylock
diff --git a/libpthread/nptl/sysdeps/metag/pthreaddef.h b/libpthread/nptl/sysdeps/xtensa/pthreaddef.h
similarity index 91%
copy from libpthread/nptl/sysdeps/metag/pthreaddef.h
copy to libpthread/nptl/sysdeps/xtensa/pthreaddef.h
index 51625e4..e72b4bc 100644
--- a/libpthread/nptl/sysdeps/metag/pthreaddef.h
+++ b/libpthread/nptl/sysdeps/xtensa/pthreaddef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -16,19 +16,17 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <sysdep.h>
-
 /* Default stack size.  */
 #define ARCH_STACK_DEFAULT_SIZE	(2 * 1024 * 1024)
 
 /* Required stack pointer alignment at beginning.  */
-#define STACK_ALIGN		8
+#define STACK_ALIGN		16
 
 /* Minimal stack size after allocating thread descriptor and guard size.  */
 #define MINIMAL_REST_STACK	2048
 
 /* Alignment requirement for TCB.  */
-#define TCB_ALIGNMENT		8
+#define TCB_ALIGNMENT		16
 
 
 /* Location of current stack frame.  */
@@ -36,5 +34,6 @@
 
 
 /* XXX Until we have a better place keep the definitions here.  */
+
 #define __exit_thread_inline(val) \
   INLINE_SYSCALL (exit, 1, (val))
diff --git a/libpthread/nptl/sysdeps/arc/tcb-offsets.sym b/libpthread/nptl/sysdeps/xtensa/tcb-offsets.sym
similarity index 54%
copy from libpthread/nptl/sysdeps/arc/tcb-offsets.sym
copy to libpthread/nptl/sysdeps/xtensa/tcb-offsets.sym
index cbf0ae4..4c86876 100644
--- a/libpthread/nptl/sysdeps/arc/tcb-offsets.sym
+++ b/libpthread/nptl/sysdeps/xtensa/tcb-offsets.sym
@@ -1,8 +1,7 @@
 #include <sysdep.h>
 #include <tls.h>
 
-PTHREAD_TID		offsetof (struct pthread, tid)
-PTHREAD_PID		offsetof (struct pthread, pid)
-MULTIPLE_THREADS_OFFSET	offsetof (struct pthread, header.multiple_threads)
 TLS_PRE_TCB_SIZE	sizeof (struct pthread)
-TLS_TCB_SIZE            sizeof(tcbhead_t)
+MULTIPLE_THREADS_OFFSET	offsetof (struct pthread, header.multiple_threads)
+PID			offsetof (struct pthread, pid)
+TID			offsetof (struct pthread, tid)
diff --git a/libpthread/nptl/sysdeps/arm/tls.h b/libpthread/nptl/sysdeps/xtensa/tls.h
similarity index 80%
copy from libpthread/nptl/sysdeps/arm/tls.h
copy to libpthread/nptl/sysdeps/xtensa/tls.h
index f32cfc8..f0cb27c 100644
--- a/libpthread/nptl/sysdeps/arm/tls.h
+++ b/libpthread/nptl/sysdeps/xtensa/tls.h
@@ -1,5 +1,5 @@
-/* Definition for thread-local data handling.  NPTL/ARM version.
-   Copyright (C) 2005,2007 Free Software Foundation, Inc.
+/* Definition for thread-local data handling.  NPTL/Xtensa version.
+   Copyright (C) 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -13,11 +13,12 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #ifndef _TLS_H
-#define _TLS_H	1
+#define _TLS_H
 
 #ifndef __ASSEMBLER__
 
@@ -36,11 +37,11 @@ typedef union dtv
   } pointer;
 } dtv_t;
 
+
 #else /* __ASSEMBLER__ */
 # include <tcb-offsets.h>
 #endif /* __ASSEMBLER__ */
 
-
 /* We require TLS support in the tools.  */
 #define HAVE_TLS_SUPPORT                1
 #define HAVE_TLS_MODEL_ATTRIBUTE        1
@@ -54,7 +55,7 @@ typedef union dtv
 /* Get system call information.  */
 # include <sysdep.h>
 
-/* The TP points to the start of the thread blocks.  */
+/* The TLS blocks start right after the TCB.  */
 # define TLS_DTV_AT_TP	1
 
 /* Get the thread descriptor definition.  */
@@ -81,14 +82,17 @@ typedef struct
 /* Alignment requirements for the TCB.  */
 # define TLS_TCB_ALIGN		16
 
+
 /* Install the dtv pointer.  The pointer passed is to the element with
    index -1 which contain the length.  */
 # define INSTALL_DTV(tcbp, dtvp) \
   (((tcbhead_t *) (tcbp))->dtv = (dtvp) + 1)
 
 /* Install new dtv for current thread.  */
-# define INSTALL_NEW_DTV(dtv) \
-  (THREAD_DTV() = (dtv))
+# define INSTALL_NEW_DTV(dtv)						\
+  ({ tcbhead_t *__tcbp;							\
+     __asm__ __volatile__ ("rur %0, threadptr" : "=r" (__tcbp));	\
+     __tcbp->dtv = (dtv); })						\
 
 /* Return dtv of given thread descriptor.  */
 # define GET_DTV(tcbp) \
@@ -97,20 +101,20 @@ typedef struct
 /* Code to initially initialize the thread pointer.  This might need
    special attention since 'errno' is not yet available and if the
    operation can cause a failure 'errno' must not be touched.  */
-# define TLS_INIT_TP(tcbp, secondcall) \
-  ({ INTERNAL_SYSCALL_DECL (err);					\
-     long result_var;							\
-     result_var = INTERNAL_SYSCALL_ARM (set_tls, err, 1, (tcbp));	\
-     INTERNAL_SYSCALL_ERROR_P (result_var, err)				\
-       ? "unknown error" : NULL; })
+# define TLS_INIT_TP(tcbp, secondcall)					\
+  ({ __asm__ __volatile__ ("wur %0, threadptr" : : "r" (tcbp)); 0; })
 
 /* Return the address of the dtv for the current thread.  */
-# define THREAD_DTV() \
-  (((tcbhead_t *) __builtin_thread_pointer ())->dtv)
+# define THREAD_DTV()							\
+  ({ tcbhead_t *__tcbp;							\
+      __asm__ __volatile__ ("rur %0, threadptr" : "=r" (__tcbp));	\
+      __tcbp->dtv; })
 
 /* Return the thread descriptor for the current thread.  */
-# define THREAD_SELF \
- ((struct pthread *)__builtin_thread_pointer () - 1)
+# define THREAD_SELF							\
+ ({ struct pthread *__self;						\
+    __asm__ ("rur %0, threadptr" : "=r" (__self));			\
+    __self - 1; })
 
 /* Magic for libthread_db to know how to do THREAD_SELF.  */
 # define DB_THREAD_SELF \
@@ -126,10 +130,6 @@ typedef struct
 #define THREAD_SETMEM_NC(descr, member, idx, value) \
   descr->member[idx] = (value)
 
-/* Initializing the thread pointer will generate a SIGILL if the syscall
-   is not available.  */
-#define TLS_INIT_TP_EXPENSIVE 1
-
 /* Get and set the global scope generation counter in struct pthread.  */
 #define THREAD_GSCOPE_FLAG_UNUSED 0
 #define THREAD_GSCOPE_FLAG_USED   1
@@ -150,6 +150,7 @@ typedef struct
       atomic_write_barrier ();						     \
     }									     \
   while (0)
+
 #define THREAD_GSCOPE_WAIT() \
   GL(dl_wait_lookup_done) ()
 
diff --git a/libpthread/nptl/sysdeps/xtensa/tlsdesc.sym b/libpthread/nptl/sysdeps/xtensa/tlsdesc.sym
new file mode 100644
index 0000000..b18bf5f
--- /dev/null
+++ b/libpthread/nptl/sysdeps/xtensa/tlsdesc.sym
@@ -0,0 +1,10 @@
+#include <stddef.h>
+#include <sysdep.h>
+#include <tls.h>
+#include <link.h>
+#include <dl-tls.h>
+
+TLSDESC_ARG		offsetof(struct tlsdesc, argument)
+TLSDESC_GEN_COUNT	offsetof(struct tlsdesc_dynamic_arg, gen_count)
+TLSDESC_MODID		offsetof(struct tlsdesc_dynamic_arg, tlsinfo.ti_module)
+TLSDESC_MODOFF		offsetof(struct tlsdesc_dynamic_arg, tlsinfo.ti_offset)


hooks/post-receive
-- 
uClibc-ng - small C library for embedded systems


More information about the devel mailing list