diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-06-24 16:24:25 +0200 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-06-24 16:24:25 +0200 |
| commit | 7682323a3a798d6f15708f228f859a64cb869aa3 (patch) | |
| tree | 0f3648e92245745c9828db3175651974b10c9ae4 /libpthread/linuxthreads.old_db | |
| parent | 3004ce0c9619f89bf8e64931edd696bf4df8d2e1 (diff) | |
| parent | 74da7a88552ecf518e64642c90742fddca57be00 (diff) | |
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 <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/linuxthreads.old_db')
| -rw-r--r-- | libpthread/linuxthreads.old_db/td_ta_delete.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpthread/linuxthreads.old_db/td_ta_delete.c b/libpthread/linuxthreads.old_db/td_ta_delete.c index 0e6ec17d0..be1165af2 100644 --- a/libpthread/linuxthreads.old_db/td_ta_delete.c +++ b/libpthread/linuxthreads.old_db/td_ta_delete.c @@ -45,7 +45,7 @@ td_ta_delete (td_thragent_t *ta) runp = runp->next; if (runp->next == NULL) - /* It's not a valid decriptor since it is not in the list. */ + /* It's not a valid descriptor since it is not in the list. */ return TD_BADTA; runp->next = runp->next->next; |