diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-09-09 01:39:02 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-09 01:39:02 +0000 |
| commit | 2d0697017b1b15bc819abbcefeaade5b6fa12a0e (patch) | |
| tree | bdb871fecb398828c8b4d10f4f65d178a75e18d8 /packages/uclibc | |
| parent | b0b28d7137f8aa3e4c8c6977305565879e3a4a05 (diff) | |
uclibc: fix STT_ARM_TFUNC handling in the uclibc ld.so
STT_ARM_TFUNC handling was broken in uclibc because it is an ARM specific
hack and uclibc code did not have support for it. Added the support in a
way which I hope will be acceptable to uclibc and which should remain
compatible with forthcoming binutils changes. ARM Thumb code is fully
working with this commit with the possible exception of uclibc/gcc itself
(not yet tested).
Diffstat (limited to 'packages/uclibc')
| -rw-r--r-- | packages/uclibc/uclibc-0.9.28/thumb-resolve.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/packages/uclibc/uclibc-0.9.28/thumb-resolve.patch b/packages/uclibc/uclibc-0.9.28/thumb-resolve.patch index e088757590..9d1db384ab 100644 --- a/packages/uclibc/uclibc-0.9.28/thumb-resolve.patch +++ b/packages/uclibc/uclibc-0.9.28/thumb-resolve.patch @@ -170,3 +170,46 @@ + mov pc, ip +#endif .size _dl_linux_resolve, .-_dl_linux_resolve +--- uClibc/ldso/ldso/dl-hash.c 2005-09-08 13:54:30.124416436 -0700 ++++ uClibc/ldso/ldso/dl-hash.c 2005-09-08 14:17:44.828179610 -0700 +@@ -186,11 +186,19 @@ + + if (type_class & (sym->st_shndx == SHN_UNDEF)) + continue; +- if (_dl_strcmp(strtab + sym->st_name, name) != 0) +- continue; + if (sym->st_value == 0) + continue; +- if (ELF_ST_TYPE(sym->st_info) > STT_FUNC) ++ if (ELF_ST_TYPE(sym->st_info) > STT_FUNC ++#if defined(__arm__) || defined(__thumb__) ++ /* On ARM (only) STT_ARM_TFUNC is a function ++ * and has a value >STT_FUNC, so this must ++ * be checked specially. ++ */ ++ && ELF_ST_TYPE(sym->st_info) != STT_ARM_TFUNC ++#endif ++ ) ++ continue; ++ if (_dl_strcmp(strtab + sym->st_name, name) != 0) + continue; + + switch (ELF_ST_BIND(sym->st_info)) { +@@ -203,7 +211,17 @@ + break; + #endif + case STB_GLOBAL: ++#if defined(__arm__) || defined(__thumb__) ++ /* On ARM the caller needs to know that STT_ARM_TFUNC ++ * is a thumb function call, this is now indicated by ++ * setting the low bit of the value (and newer binutils ++ * will do this and record STT_FUNC). ++ */ ++ return (char*)tpnt->loadaddr + (sym->st_value | ++ (ELF_ST_TYPE(sym->st_info) == STT_ARM_TFUNC)); ++#else + return (char*)tpnt->loadaddr + sym->st_value; ++#endif + default: /* Local symbols not handled here */ + break; + } |