X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=upstream%2Fdarwin-linker%2Fpatches%2Fcctools.patch;h=59236eec822cf88499c26a34201497180a7f629d;hp=0ce718bae7de4a5f2c0e5c9f2c5532838b651229;hb=9fe5ab0b773fee33a8af3406b3e7b3fcd2303d76;hpb=f3963fe569c7563fad38667e40a3884165e67021

diff --git a/upstream/darwin-linker/patches/cctools.patch b/upstream/darwin-linker/patches/cctools.patch
index 0ce718b..59236ee 100644
--- a/upstream/darwin-linker/patches/cctools.patch
+++ b/upstream/darwin-linker/patches/cctools.patch
@@ -1,15 +1,3 @@
-diff -rub ./include/architecture/i386/fpu.h ./include/architecture/i386/fpu.h
---- ./include/architecture/i386/fpu.h	Thu May  6 19:24:30 1999
-+++ ./include/architecture/i386/fpu.h	Mon Aug 25 12:56:22 2003
-@@ -121,7 +121,7 @@
- 					:3;
- } fp_control_t;
- 
--#import <architecture/i386/sel.h>
-+#include <architecture/i386/sel.h>
- 
- /*
-  * Floating point 'environment'
 diff -rub ./include/architecture/i386/frame.h ./include/architecture/i386/frame.h
 --- ./include/architecture/i386/frame.h	Thu May  6 19:24:33 1999
 +++ ./include/architecture/i386/frame.h	Mon Aug 25 12:56:22 2003
@@ -2198,7 +2186,7 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
 +/** Returns a string appropriate to the error argument given. */
 +char* mach_error_string( int error_value )
 +{
-+	char errorString[] = "Some fake mach error string.";
++	char *errorString = "Some fake mach error string.";
 +	
 +	return errorString;
 +}
@@ -2292,7 +2280,7 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
 +	return KERN_SUCCESS;
 +}
 --- ar/archive.c	30 Apr 2002 07:37:17 -0000	1.1.1.1
-+++ ar/archive.c	8 Sep 2003 00:44:40 -0000
++++ ar/archive.c	8 Sep 2003 01:51:24 -0000
 @@ -69,6 +69,7 @@
  
  #include <sys/param.h>
@@ -2301,7 +2289,16 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
  
  #include <ar.h>
  #include <dirent.h>
-@@ -262,27 +263,37 @@
+@@ -86,7 +87,7 @@
+ #include "extern.h"
+ 
+ typedef struct ar_hdr HDR;
+-static char hb[sizeof(HDR) + 1];	/* real header */
++static char hb[61];	/* real header */
+ 
+ int
+ open_archive(mode)
+@@ -262,30 +263,40 @@
  		 */
  		lname = strlen(name);
  		if (options & AR_TR) {
@@ -2316,21 +2313,25 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
  				(void)fflush(stderr);
  			}
 -			(void)sprintf(hb, HDR3, name, (long int)sb->st_mtimespec.tv_sec,
-+		  strncpy(buf, name, 15);
++			strncpy(buf, name, 15);
 +			(void)sprintf(hb, HDR3, buf, (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, sb->st_size, ARFMAG);
++			    sb->st_mode, (long long)sb->st_size, ARFMAG);
  			lname = 0;
- 		} else if (lname > sizeof(hdr->ar_name) || strchr(name, ' '))
+-		} else if (lname > sizeof(hdr->ar_name) || strchr(name, ' '))
++		} 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),
+-			    sb->st_mode, sb->st_size + ((lname + 3) & ~3),
++			    sb->st_mode, (long long)(sb->st_size + ((lname + 3) & ~3)),
  			    ARFMAG);
- 		else {
+-		else {
++}		else {
 +		  char buf[17];
 +		  int i;
 +		  for(i=0; i<16; i++) buf[i] = ' ';
@@ -2341,4 +2342,28 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
 +			(void)sprintf(hb, HDR2, buf, (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, sb->st_size, ARFMAG);
++			    sb->st_mode, (long long)sb->st_size, ARFMAG);
+ 		}
+ 		size = sb->st_size;
+ 	} else {
+--- misc/libtool.c	Wed Apr 23 15:44:51 2003
++++ misc/libtool.c	Sun Sep  7 18:58:16 2003
+@@ -2177,14 +2177,15 @@
+     
+ 	strcpy(message_buf, message);
+ 	strcat(message_buf, arch_name);
+-
++	/*
+ 	make_alert(ProjectBuilder_port,
+ 	    -1,
+-	    NULL, 0, /* functionName, not used by ProjectBuilder */
++	    NULL, 0,
+ 	    fileName, strlen(fileName)+1 > 1024 ? 1024 : strlen(fileName)+1,
+ 	    NULL, 0,
+ 	    0,
+ 	    message_buf, strlen(message_buf) + 1);
++*/
+ }
+ 
+ /*