From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:05:27 +0000 (+0000)
Subject: 2003/09/07 11:13:12
X-Git-Tag: RC3~679
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=c6184486434c34ac5304ce27a8ef4485f9b5fb5a

2003/09/07 11:13:12

darcs-hash:20040130070527-2ba56-f72cc5a3b2f8c83df3105ad6d3f1d52c0f8f92a0.gz
---

diff --git a/upstream/darwin-linker/patches/cctools.patch b/upstream/darwin-linker/patches/cctools.patch
index 498a051..04b1475 100644
--- a/upstream/darwin-linker/patches/cctools.patch
+++ b/upstream/darwin-linker/patches/cctools.patch
@@ -2095,41 +2095,6 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
 +		return msg_result;
 +    }
 +}
---- ar/archive.c	30 Apr 2002 07:37:17 -0000	1.1.1.1
-+++ ar/archive.c	7 Sep 2003 08:55:11 -0000
-@@ -69,6 +69,7 @@
- 
- #include <sys/param.h>
- #include <sys/stat.h>
-+#include <stuff/ofile.h>
- 
- #include <ar.h>
- #include <dirent.h>
-@@ -268,21 +269,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);
 --- ar/contents.c	30 Apr 2002 07:37:17 -0000	1.1.1.1
 +++ ar/contents.c	7 Sep 2003 08:55:11 -0000
 @@ -76,7 +76,6 @@
@@ -2324,3 +2289,55 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym
  
  ifeq "NO" "$(USE_DEPENDENCY_FILE)"
  .c.o:
+--- archive.c	30 Apr 2002 07:37:17 -0000	1.1.1.1
++++ archive.c	7 Sep 2003 10:12:52 -0000
+@@ -69,6 +69,7 @@
+ 
+ #include <sys/param.h>
+ #include <sys/stat.h>
++#include <stuff/ofile.h>
+ 
+ #include <ar.h>
+ #include <dirent.h>
+@@ -261,32 +262,25 @@
+ 		 * a space, use extended format 1.
+ 		 */
+ 		lname = strlen(name);
+-		if (options & AR_TR) {
++			printf("nameX: %s\n", name);
++			fflush(stdout);
++
++			printf("name: %s\n", name);
++			fflush(stdout);
+ 			if (lname > OLDARMAXNAME) {
+ 				(void)fflush(stdout);
+ 				warnx("warning: %s truncated to %.*s",
+ 				    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)0,
+ 			    (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,
+-			    (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,
+-			    (unsigned int)(u_short)sb->st_uid,
+-			    (unsigned int)(u_short)sb->st_gid,
+-			    sb->st_mode, sb->st_size, ARFMAG);
+-		}
++
++			printf("done\n");
++			fflush(stdout);
+ 		size = sb->st_size;
+ 	} else {
+ 		lname = chdr.lname;