[Glibc-bsd-commits] r4735 - in trunk/kfreebsd-9/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2013-07-11 18:02:11 +0000 (Thu, 11 Jul 2013)
New Revision: 4735

Added:
   trunk/kfreebsd-9/debian/patches/111_ldd_load_address.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
Log:
111_ldd_address.diff - fix ldd on big executables


Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2013-07-11 18:00:10 UTC (rev 4734)
+++ trunk/kfreebsd-9/debian/changelog	2013-07-11 18:02:11 UTC (rev 4735)
@@ -1,7 +1,11 @@
 kfreebsd-9 (9.1-2) UNRELEASED; urgency=low
 
+  [ Robert Millan ]
   * Bump B-D on freebsd-buildutils to 10~svn251967-4.
 
+  [ Petr Salinger ]
+  * Add 111_ldd_address.diff. Closes: #696556.
+
  -- Robert Millan <rmh at debian.org>  Sun, 07 Jul 2013 13:56:18 +0200
 
 kfreebsd-9 (9.1-1) experimental; urgency=low

Added: trunk/kfreebsd-9/debian/patches/111_ldd_load_address.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/111_ldd_load_address.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/111_ldd_load_address.diff	2013-07-11 18:02:11 UTC (rev 4735)
@@ -0,0 +1,20 @@
+use a different adress for ldd
+see #696556
+
+--- a/sys/kern/imgact_elf.c
++++ b/sys/kern/imgact_elf.c
+@@ -795,7 +795,14 @@
+ 		 * non-zero for some reason.
+ 		 */
+ 		if (baddr == 0)
++                {
++#ifndef ET_DYN_LOAD_ADDR_INTERP_DELTA
++# define ET_DYN_LOAD_ADDR_INTERP_DELTA 0x20000000
++#endif
+ 			et_dyn_addr = ET_DYN_LOAD_ADDR;
++			if (interp == NULL)
++				et_dyn_addr += ET_DYN_LOAD_ADDR_INTERP_DELTA;
++                }
+ 		else
+ 			et_dyn_addr = 0;
+ 	} else

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2013-07-11 18:00:10 UTC (rev 4734)
+++ trunk/kfreebsd-9/debian/patches/series	2013-07-11 18:02:11 UTC (rev 4735)
@@ -16,6 +16,7 @@
 108_teken_utf8_table.diff
 109_linprocfs_non_x86.diff
 110_disable_trampoline_flavour.diff
+111_ldd_load_address.diff
 
 # Patches that are likely to be Debian-specific
 901_disable_optimization_2.diff