[Glibc-bsd-commits] r2807 - in trunk/kfreebsd-8/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-10-22 08:07:06 +0000 (Thu, 22 Oct 2009)
New Revision: 2807

Removed:
   trunk/kfreebsd-8/debian/patches/010_ET_DYN.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
* New upstream snapshot (post RC1) of RELENG_8
     - 010_ET_DYN.diff dropped, fixed upstream



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2009-10-19 12:21:14 UTC (rev 2806)
+++ trunk/kfreebsd-8/debian/changelog	2009-10-22 08:07:06 UTC (rev 2807)
@@ -1,8 +1,9 @@
-kfreebsd-8 (8.0~cvs20090914-1) EXPERIMENTAL; urgency=low
+kfreebsd-8 (8.0~cvs20091022-1) EXPERIMENTAL; urgency=low
 
   [ Petr Salinger ]
-  * New upstream snapshot of RELENG_8
+  * New upstream snapshot (post RC1) of RELENG_8
      - 011_brandinfo.diff dropped, fixed upstream
+     - 010_ET_DYN.diff dropped, fixed upstream
      - 101_subsecond_timestamp.diff merged upstream
   * Alter Build-depends as freebsd-buildutils 7.0 is still sufficent
   * Update of some patches

Deleted: trunk/kfreebsd-8/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/010_ET_DYN.diff	2009-10-19 12:21:14 UTC (rev 2806)
+++ trunk/kfreebsd-8/debian/patches/010_ET_DYN.diff	2009-10-22 08:07:06 UTC (rev 2807)
@@ -1,83 +0,0 @@
-
-
---- src.orig/sys/kern/imgact_elf.c
-+++ src/sys/kern/imgact_elf.c
-@@ -633,6 +633,8 @@
- 	Elf_Brandinfo *brand_info;
- 	char *path;
- 	struct sysentvec *sv;
-+	u_long rbase = 0;
-+
- 
- 	/*
- 	 * Do we have a valid ELF header ?
-@@ -674,11 +676,27 @@
- 		    hdr->e_ident[EI_OSABI]);
- 		return (ENOEXEC);
- 	}
-+#if 0
- 	if (hdr->e_type == ET_DYN &&
- 	    (brand_info->flags & BI_CAN_EXEC_DYN) == 0)
- 		return (ENOEXEC);
-+#endif
-+	if (hdr->e_type == ET_DYN) {
-+ 	    for (i = 0; i < hdr->e_phnum; i++) {
-+		if (phdr[i].p_type == PT_LOAD) {
-+			if (phdr[i].p_vaddr == 0) {
-+				/* we have to load at base addr 0,
-+				 * so relocate somewhere (at 512 MB)
-+				 */
-+				rbase = 512 * 1024 * 1024;
-+				break;
-+			}
-+		}
-+	    }
-+	}
-+
- 	sv = brand_info->sysvec;
--	if (interp != NULL && brand_info->interp_newpath != NULL)
-+	if (interp != NULL && brand_info->interp_newpath != NULL && !strcmp(interp, "/libexec/ld-elf.so.1"))
- 		newinterp = brand_info->interp_newpath;
- 
- 	/*
-@@ -722,7 +740,7 @@
- 
- 			if ((error = __elfN(load_section)(vmspace,
- 			    imgp->object, phdr[i].p_offset,
--			    (caddr_t)(uintptr_t)phdr[i].p_vaddr,
-+			    (caddr_t)(uintptr_t)phdr[i].p_vaddr + rbase,
- 			    phdr[i].p_memsz, phdr[i].p_filesz, prot,
- 			    sv->sv_pagesize)) != 0)
- 				return (error);
-@@ -736,11 +754,12 @@
- 			if (phdr[i].p_offset == 0 &&
- 			    hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize
- 				<= phdr[i].p_filesz)
--				proghdr = phdr[i].p_vaddr + hdr->e_phoff;
-+				proghdr = phdr[i].p_vaddr + rbase + hdr->e_phoff;
- 
- 			seg_addr = trunc_page(phdr[i].p_vaddr);
- 			seg_size = round_page(phdr[i].p_memsz +
- 			    phdr[i].p_vaddr - seg_addr);
-+			seg_addr += rbase;
- 
- 			/*
- 			 * Is this .text or .data?  We can't use
-@@ -762,7 +781,7 @@
- 			    phdr[i].p_memsz)) {
- 				text_size = seg_size;
- 				text_addr = seg_addr;
--				entry = (u_long)hdr->e_entry;
-+				entry = (u_long)hdr->e_entry + rbase;
- 			} else {
- 				data_size = seg_size;
- 				data_addr = seg_addr;
-@@ -770,7 +789,7 @@
- 			total_size += seg_size;
- 			break;
- 		case PT_PHDR: 	/* Program header table info */
--			proghdr = phdr[i].p_vaddr;
-+			proghdr = phdr[i].p_vaddr + rbase;
- 			break;
- 		default:
- 			break;

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2009-10-19 12:21:14 UTC (rev 2806)
+++ trunk/kfreebsd-8/debian/patches/series	2009-10-22 08:07:06 UTC (rev 2807)
@@ -4,7 +4,6 @@
 007_clone_signals.diff
 008_config.diff
 009_disable_duped_modules.diff
-010_ET_DYN.diff
 013_ip_packed.diff
 020_linker.diff 
 102_POLL_HUP.diff