aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-02-24 12:56:20 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-02-24 12:56:20 +0000
commitae885a39784d0651e6d47a9247cb98855532263e (patch)
treeafca8add2e4fd4e51379c66583ceee8116b5ea1c /toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch
parentbb54973a24abcb09ec74a6774765862f53b4e3bd (diff)
downloadupstream-ae885a39784d0651e6d47a9247cb98855532263e.tar.gz
upstream-ae885a39784d0651e6d47a9247cb98855532263e.tar.bz2
upstream-ae885a39784d0651e6d47a9247cb98855532263e.zip
upgrade to latest git, refresh patches
SVN-Revision: 25698
Diffstat (limited to 'toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch')
-rw-r--r--toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch b/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch
index 0333046c27..b4f9ce681c 100644
--- a/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch
+++ b/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch
@@ -1,6 +1,6 @@
--- a/ldso/include/dl-elf.h
+++ b/ldso/include/dl-elf.h
-@@ -42,6 +42,10 @@
+@@ -42,6 +42,10 @@ extern int _dl_linux_resolve(void);
extern int _dl_fixup(struct dyn_elf *rpnt, int flag);
extern void _dl_protect_relro (struct elf_resolve *l);
@@ -11,18 +11,18 @@
/*
* Bitsize related settings for things ElfW()
* does not handle already
-@@ -163,7 +167,7 @@
- dynamic_info[tag] = (unsigned long) DL_RELOC_ADDR(load_off, dynamic_info[tag]); \
- } while (0)
- /* Don't adjust .dynamic unnecessarily. */
-- if (load_off != 0) {
-+ if (DL_LOADADDR_ISSET(load_off)) {
+@@ -166,7 +170,7 @@ unsigned int __dl_parse_dynamic_info(Elf
+ we'd have to walk all the loadsegs to find out if it was
+ actually unnecessary, so skip this optimization. */
+ #ifndef __FDPIC__
+- if (load_off != 0)
++ if (DL_LOADADDR_ISSET(load_off))
+ #endif
+ {
ADJUST_DYN_INFO(DT_HASH, load_off);
- ADJUST_DYN_INFO(DT_PLTGOT, load_off);
- ADJUST_DYN_INFO(DT_STRTAB, load_off);
--- a/ldso/ldso/ubicom32/dl-sysdep.h
+++ b/ldso/ldso/ubicom32/dl-sysdep.h
-@@ -101,6 +101,7 @@
+@@ -101,6 +101,7 @@ do { \
} while (0)
#define DL_LOADADDR_TYPE struct elf32_fdpic_loadaddr