[Glibc-bsd-commits] r1609 - trunk/kfreebsd-6/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2006-06-24 18:10:43 +0000 (Sat, 24 Jun 2006)
New Revision: 1609

Added:
   trunk/kfreebsd-6/debian/patches/018_genassym_MAXCPU.diff
Modified:
   trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff
Log:
- FreeBSD 6.1: new patches


Modified: trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff	2006-06-24 18:08:59 UTC (rev 1608)
+++ trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff	2006-06-24 18:10:43 UTC (rev 1609)
@@ -1,15 +1,17 @@
 
-Author: aurel32
-Status: Merged in 7-CURRENT.
 
---- sys.orig/kern/imgact_elf.c	2005-08-17 15:29:41.000000000 +0200
-+++ sys/kern/imgact_elf.c	2005-08-17 15:31:08.000000000 +0200
-@@ -655,7 +655,7 @@
- 	/*
- 	 * Do we have a valid ELF header ?
- 	 */
--	if (__elfN(check_header)(hdr) != 0 || hdr->e_type != ET_EXEC)
-+	if (__elfN(check_header)(hdr) != 0 || (hdr->e_type != ET_EXEC && hdr->e_type != ET_DYN))
- 		return (-1);
- 
- 	/*
+Index: sys/kern/imgact_elf.c
+===================================================================
+--- sys/kern/imgact_elf.c.orig	2006-03-16 01:25:31.000000000 +0100
++++ sys/kern/imgact_elf.c	2006-06-24 17:37:23.000000000 +0200
+@@ -649,8 +649,10 @@
+ 		    hdr->e_ident[EI_OSABI]);
+ 		return (ENOEXEC);
+ 	}
++#if 0
+ 	if (hdr->e_type == ET_DYN && brand_info->brand != ELFOSABI_LINUX)
+ 		return (ENOEXEC);
++#endif
+ 	sv = brand_info->sysvec;
+ 	if (interp != NULL && brand_info->interp_newpath != NULL)
+ 		interp = brand_info->interp_newpath;

Added: trunk/kfreebsd-6/debian/patches/018_genassym_MAXCPU.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/018_genassym_MAXCPU.diff	2006-06-24 18:08:59 UTC (rev 1608)
+++ trunk/kfreebsd-6/debian/patches/018_genassym_MAXCPU.diff	2006-06-24 18:10:43 UTC (rev 1609)
@@ -0,0 +1,27 @@
+
+ MAXCPU is needed in support.s
+
+Index: sys/amd64/amd64/genassym.c
+===================================================================
+--- sys/amd64/amd64/genassym.c.orig	2006-06-24 20:18:36.612344000 +0200
++++ sys/amd64/amd64/genassym.c	2006-06-24 20:20:33.000000000 +0200
+@@ -88,6 +88,7 @@
+ ASSYM(V_INTR, offsetof(struct vmmeter, v_intr));
+ ASSYM(KSTACK_PAGES, KSTACK_PAGES);
+ ASSYM(PAGE_SIZE, PAGE_SIZE);
++ASSYM(MAXCPU, MAXCPU);
+ ASSYM(NPTEPG, NPTEPG);
+ ASSYM(NPDEPG, NPDEPG);
+ ASSYM(addr_PTmap, addr_PTmap);
+Index: sys/i386/i386/genassym.c
+===================================================================
+--- sys/i386/i386/genassym.c.orig	2006-06-24 20:18:44.297911000 +0200
++++ sys/i386/i386/genassym.c	2006-06-24 20:20:19.000000000 +0200
+@@ -97,6 +97,7 @@
+ /* ASSYM(UPAGES, UPAGES);*/
+ ASSYM(KSTACK_PAGES, KSTACK_PAGES);
+ ASSYM(PAGE_SIZE, PAGE_SIZE);
++ASSYM(MAXCPU, MAXCPU);
+ ASSYM(NPTEPG, NPTEPG);
+ ASSYM(NPDEPG, NPDEPG);
+ ASSYM(NPDEPTD, NPDEPTD);