[Odcctools-changes] [140] trunk/patches

9 Sep 2006

Revision: 140
Author:   ssen@mit.edu
Date:     2006-09-09 14:19:15 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Update patches

Modified Paths:
--------------
    trunk/patches/ar/ar-printf.diff
    trunk/patches/include/mach/machine.diff
    trunk/patches/misc/redo_prebinding.nogetattrlist.diff
    trunk/patches/misc/redo_prebinding.nomalloc.diff

Removed Paths:
-------------
    trunk/patches/ar/archive.diff
    trunk/patches/include/architecture/i386/selguard.diff
    trunk/patches/ld/ld-indirect-symbols.diff

Modified: trunk/patches/ar/ar-printf.diff
===================================================================

--- trunk/patches/ar/ar-printf.diff	2006-09-09 21:19:01 UTC (rev 139)
+++ trunk/patches/ar/ar-printf.diff	2006-09-09 21:19:15 UTC (rev 140)
@@ -1,32 +1,38 @@
---- ./archive.c.orig	2006-03-15 20:35:29.000000000 -0800
-+++ ./archive.c	2006-03-15 20:35:30.000000000 -0800
-@@ -313,21 +313,21 @@
- 			(void)sprintf(hb, HDR3, name, (long int)sb->st_mtime,
+--- ./archive.c.orig	2006-09-09 13:44:16.000000000 -0700
++++ ./archive.c	2006-09-09 13:44:25.000000000 -0700
+@@ -310,24 +310,24 @@
+ 				    name, OLDARMAXNAME, name);
+ 				(void)fflush(stderr);
+ 			}
+-			(void)sprintf(hb, HDR3, name, (long int)sb->st_mtimespec.tv_sec,
++			(void)sprintf(hb, HDR3, name, (long int)sb->st_mtime,
  			    (unsigned int)(u_short)sb->st_uid,
  			    (unsigned int)(u_short)sb->st_gid,
 -			    sb->st_mode, sb->st_size, ARFMAG);
-+			    sb->st_mode, (int64_t)sb->st_size, ARFMAG);
++				      sb->st_mode, (int64_t)sb->st_size, ARFMAG);
  			lname = 0;
  		} else if (lname > sizeof(hdr->ar_name) || strchr(name, ' '))
  			(void)sprintf(hb, HDR1, AR_EFMT1, (lname + 3) & ~3,
- 			    (long int)sb->st_mtime,
+-			    (long int)sb->st_mtimespec.tv_sec,
++			    (long int)sb->st_mtime,
  			    (unsigned int)(u_short)sb->st_uid,
  			    (unsigned int)(u_short)sb->st_gid,
 -			    sb->st_mode, sb->st_size + ((lname + 3) & ~3),
-+			    sb->st_mode, (int64_t)sb->st_size + ((lname + 3) & ~3),
++				      sb->st_mode, (int64_t)sb->st_size + ((lname + 3) & ~3),
  			    ARFMAG);
  		else {
  			lname = 0;
- 			(void)sprintf(hb, HDR2, name, (long int)sb->st_mtime,
+-			(void)sprintf(hb, HDR2, name, (long int)sb->st_mtimespec.tv_sec,
++			(void)sprintf(hb, HDR2, name, (long int)sb->st_mtime,
  			    (unsigned int)(u_short)sb->st_uid,
  			    (unsigned int)(u_short)sb->st_gid,
 -			    sb->st_mode, sb->st_size, ARFMAG);
-+			    sb->st_mode, (int64_t)sb->st_size, ARFMAG);
++				      sb->st_mode, (int64_t)sb->st_size, ARFMAG);
  		}
  		size = sb->st_size;
  	} else {
---- ./contents.c.orig	2006-03-15 20:35:29.000000000 -0800
-+++ ./contents.c	2006-03-15 20:35:30.000000000 -0800
+--- ./contents.c.orig	2006-09-09 13:44:16.000000000 -0700
++++ ./contents.c	2006-09-09 13:44:22.000000000 -0700
 @@ -104,7 +104,7 @@
  		if (options & AR_V) {
  			(void)strmode(chdr.mode, buf);

Deleted: trunk/patches/ar/archive.diff
===================================================================
--- trunk/patches/ar/archive.diff	2006-09-09 21:19:01 UTC (rev 139)
+++ trunk/patches/ar/archive.diff	2006-09-09 21:19:15 UTC (rev 140)
@@ -1,27 +0,0 @@
---- ./archive.c.orig	2006-03-15 20:35:29.000000000 -0800
-+++ ./archive.c	2006-03-15 20:35:29.000000000 -0800
-@@ -310,21 +310,21 @@
- 				    name, OLDARMAXNAME, name);
- 				(void)fflush(stderr);
- 			}
--			(void)sprintf(hb, HDR3, name, (long int)sb->st_mtimespec.tv_sec,
-+			(void)sprintf(hb, HDR3, name, (long int)sb->st_mtime,
- 			    (unsigned int)(u_short)sb->st_uid,
- 			    (unsigned int)(u_short)sb->st_gid,
- 			    sb->st_mode, sb->st_size, ARFMAG);
- 			lname = 0;
- 		} else if (lname > sizeof(hdr->ar_name) || strchr(name, ' '))
- 			(void)sprintf(hb, HDR1, AR_EFMT1, (lname + 3) & ~3,
--			    (long int)sb->st_mtimespec.tv_sec,
-+			    (long int)sb->st_mtime,
- 			    (unsigned int)(u_short)sb->st_uid,
- 			    (unsigned int)(u_short)sb->st_gid,
- 			    sb->st_mode, sb->st_size + ((lname + 3) & ~3),
- 			    ARFMAG);
- 		else {
- 			lname = 0;
--			(void)sprintf(hb, HDR2, name, (long int)sb->st_mtimespec.tv_sec,
-+			(void)sprintf(hb, HDR2, name, (long int)sb->st_mtime,
- 			    (unsigned int)(u_short)sb->st_uid,
- 			    (unsigned int)(u_short)sb->st_gid,
- 			    sb->st_mode, sb->st_size, ARFMAG);

Deleted: trunk/patches/include/architecture/i386/selguard.diff
===================================================================
--- trunk/patches/include/architecture/i386/selguard.diff	2006-09-09 21:19:01 UTC (rev 139)
+++ trunk/patches/include/architecture/i386/selguard.diff	2006-09-09 21:19:15 UTC (rev 140)
@@ -1,58 +0,0 @@
---- ./fpu.h.orig	2003-08-12 17:09:50.000000000 -0700
-+++ ./fpu.h	2006-03-15 20:35:30.000000000 -0800
-@@ -38,6 +38,9 @@
-  * Data register.
-  */
- 
-+#ifndef _I386_FPU_H_
-+#define _I386_FPU_H_
-+
- typedef struct fp_data_reg {
-     unsigned short		mant;
-     unsigned short		mant1	:16,
-@@ -120,7 +123,10 @@
- 					:3;
- } fp_control_t;
- 
-+#ifndef _GUARD_I386_SEL_H_
-+#define _GUARD_I386_SEL_H_
- #import <architecture/i386/sel.h>
-+#endif
- 
- /*
-  * Floating point 'environment'
-@@ -151,3 +157,5 @@
-     fp_env_t			environ;
-     fp_stack_t			stack;
- } fp_state_t;
-+
-+#endif
---- ./frame.h.orig	2003-08-12 17:09:53.000000000 -0700
-+++ ./frame.h	2006-03-15 20:35:30.000000000 -0800
-@@ -38,6 +38,9 @@
-  *	Created.
-  */
- 
-+#ifndef _I386_FRAME_H_
-+#define _I386_FRAME_H_
-+
- /*
-  * Format of the error code
-  * generated by the hardware
-@@ -62,7 +65,10 @@
-     } pgfault;
- } err_code_t;
- 
-+#ifndef _GUARD_I386_SEL_H_
-+#define _GUARD_I386_SEL_H_
- #import <architecture/i386/sel.h>
-+#endif
- 
- /*
-  * The actual hardware exception frame
-@@ -122,3 +128,5 @@
- 
- #define EFL_CLR		0xfff88028
- #define EFL_SET		0x00000002
-+
-+#endif

Modified: trunk/patches/include/mach/machine.diff
===================================================================
--- trunk/patches/include/mach/machine.diff	2006-09-09 21:19:01 UTC (rev 139)
+++ trunk/patches/include/mach/machine.diff	2006-09-09 21:19:15 UTC (rev 140)
@@ -1,11 +1,11 @@
---- ./machine.h.orig	2005-05-12 15:39:36.000000000 -0700
-+++ ./machine.h	2006-03-15 20:35:31.000000000 -0800
+--- ./machine.h.orig	2006-09-09 13:45:52.000000000 -0700
++++ ./machine.h	2006-09-09 13:48:22.000000000 -0700
 @@ -80,32 +80,9 @@
  #ifndef	_MACH_MACHINE_H_
  #define _MACH_MACHINE_H_
  
--#import <mach/machine/vm_types.h>
--#import <mach/boolean.h>
+-#include <mach/machine/vm_types.h>
+-#include <mach/boolean.h>
 -
 -/*
 - *	For each host, there is a maximum possible number of

Deleted: trunk/patches/ld/ld-indirect-symbols.diff
===================================================================
--- trunk/patches/ld/ld-indirect-symbols.diff	2006-09-09 21:19:01 UTC (rev 139)
+++ trunk/patches/ld/ld-indirect-symbols.diff	2006-09-09 21:19:15 UTC (rev 140)
@@ -1,14 +0,0 @@
---- symbols.c.orig	2005-03-06 19:49:49.000000000 -0800
-+++ symbols.c	2005-03-06 19:55:53.000000000 -0800
-@@ -2502,6 +2502,11 @@
- 		    }
- 		}
- 		if(resolve_flat == TRUE){
-+                    if(twolevel_namespace == TRUE &&
-+                         (((struct mach_header *)(cur_obj->obj_addr))->
-+                         flags & MH_TWOLEVEL) != MH_TWOLEVEL){
-+                        continue; /* with for loop */
-+                    }
- 		    /* lookup the symbol and see if it has already been seen */
- 		    hash_pointer = lookup_symbol(symbol_name);
- 		    if(*hash_pointer == NULL){

Modified: trunk/patches/misc/redo_prebinding.nogetattrlist.diff
===================================================================
--- trunk/patches/misc/redo_prebinding.nogetattrlist.diff	2006-09-09 21:19:01 UTC (rev 139)
+++ trunk/patches/misc/redo_prebinding.nogetattrlist.diff	2006-09-09 21:19:15 UTC (rev 140)
@@ -1,15 +1,15 @@
---- redo_prebinding.c.orig	2006-03-16 08:58:09.000000000 -0800
-+++ redo_prebinding.c	2006-03-16 08:59:35.000000000 -0800
+--- ./redo_prebinding.c.orig	2006-09-09 13:49:18.000000000 -0700
++++ ./redo_prebinding.c	2006-09-09 13:50:19.000000000 -0700
 @@ -82,7 +82,7 @@
   */
  #include <mach-o/redo_prebinding.h>
  #endif /* defined(LIBRARY_API) */
 -
 +#include <config.h>
- #import <stdio.h>
- #import <stdlib.h>
- #import <string.h>
-@@ -9262,7 +9262,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -9263,7 +9263,7 @@
  	errors++;
  }
  #endif /* defined(LIBRARY_API) */
@@ -18,7 +18,7 @@
  #include <sys/attr.h>
  /*
   * Structure defining what's returned from getattrlist.  It returns all the
-@@ -9336,7 +9336,15 @@
+@@ -9337,7 +9337,15 @@
  
  	return(FALSE);
  }

Modified: trunk/patches/misc/redo_prebinding.nomalloc.diff
===================================================================
--- trunk/patches/misc/redo_prebinding.nomalloc.diff	2006-09-09 21:19:01 UTC (rev 139)
+++ trunk/patches/misc/redo_prebinding.nomalloc.diff	2006-09-09 21:19:15 UTC (rev 140)
@@ -1,10 +1,11 @@
---- ./redo_prebinding.c.orig	2005-11-14 17:34:50.000000000 -0800
-+++ ./redo_prebinding.c	2006-03-15 20:35:31.000000000 -0800
-@@ -88,7 +88,6 @@
- #import <string.h>
- #import <limits.h>
- #import <libc.h>
--#import <malloc/malloc.h>
- #import <sys/types.h>
- #import <sys/stat.h>
- #import <mach-o/stab.h>
+--- ./redo_prebinding.c.orig	2006-09-09 13:50:19.000000000 -0700
++++ ./redo_prebinding.c	2006-09-09 13:50:50.000000000 -0700
+@@ -88,7 +88,7 @@
+ #include <string.h>
+ #include <limits.h>
+ #include <libc.h>
+-#include <malloc/malloc.h>
++//#include <malloc/malloc.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <mach-o/stab.h>

    

[Odcctools-changes] [140] trunk/patches

source_changes＠macosforge.org