Merge remote-tracking branch 'origin/master' into prelink

* origin/master: (61 commits)
  fts: fix warning due to old-style function definition
  ldso_tls: fix compiler warning due to missing cast
  resolv: fix bug in res_init with ipv6 nameservers
  config: Fix passing defconfig args
  buildsys: pt-initfini.s depends on uClibc_config.h
  libdl: search for ELF_RTYPE_CLASS_DLSYM in dlsym()
  resolv: try next server on SERVFAIL
  getaddrinfo: allow numeric service without any hints
  bump version to 0.9.33-git
  nptl/pthread: Correct path for machine specific pt-initfini.c
  ctor/dtor nptl: Fix init and fini function compilation
  Rules.mak: Rearrange appending UCLIBC_EXTRA_CFLAGS to CFLAGS
  ARM: remove EABI/OABI selection
  ARM: detect BX availibility at build time
  ARM: #include <bits/arm_asm.h> where __USE_BX__ is used
  ARM: transform the EABI/OABI choice into a boolean
  ARM: remove sub-arch/variants selection from menuconfig
  ARM: introduce blind options to select & force THUMB mode
  ARM: reorder "Use BX" option
  Fix __libc_epoll_pwait compile failure on x86
  ...

Conflicts:
	ldso/libdl/libdl.c

Signed-off-by: Carmelo Amoroso <[email protected]>

diff --cc Makerules
Simple merge

diff --cc extra/Configs/Config.in
Simple merge

diff --cc ldso/include/dl-defs.h
Simple merge

diff --cc ldso/ldso/dl-elf.c
Simple merge

diff --cc ldso/libdl/libdl.c
index 83dfd089816188748de74badc8a01ccd94efabf9,f59889c997d317145c3c7d687bed12645f5af6a1..4ecd1c55e0c7f265409412dfc9258e9c371848b2
--- 1/ldso/libdl/libdl.c
--- 2/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@@ -706,12 -667,12 +706,12 @@@ void *dlsym(void *vhandle, const char *
        tpnt = NULL;
        if (handle == _dl_symbol_tables)
                tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
-       ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, 0, &sym_ref);
 -      ret = _dl_find_hash(name2, handle, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++      ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
  
  #if defined(USE_TLS) && USE_TLS && defined SHARED
 -      if (sym_ref.tpnt) {
 +      if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) {
                /* The found symbol is a thread-local storage variable.
-               Return the address for to the current thread.  */
+               Return its address for the current thread.  */
                ret = _dl_tls_symaddr ((struct link_map *)sym_ref.tpnt, (Elf32_Addr)ret);
        }
  #endif