X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/030341e663f32bc3740a1edf5e2a01c198c979f2..293af18664fd175403e2fe79688c9d4860798e92:/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch

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 0333046c2..c618e267b 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.  */
+ #if !defined __FDPIC__ && !defined __DSBT__
+-	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