From 3e027114ff66ae11fbbcefef957e46a3e85b828b Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:05:39 +0000 Subject: [PATCH] 2003/09/08 03:05:24 darcs-hash:20040130070539-2ba56-44239cf4e5b4cccddc8d7eb50d6b1abb1e9f833d.gz --- Makefile.upstream | 14 ++++--- upstream/darwin-linker/patches/cctools.patch | 53 ++++++++++++++++++++++---- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/Makefile.upstream b/Makefile.upstream index 29da789..3fe0c49 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -24,21 +24,25 @@ url_jikes-1.18 := http://www.megacz.com/tmp/jikes-1.18.tgz #ftp:// cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; ../../links.sh make -C upstream/darwin-linker/src/cctools/libstuff make -C upstream/darwin-linker/src/cctools/misc + make -C upstream/darwin-linker/src/cctools/misc libtool.NEW make -C upstream/darwin-linker/src/cctools/ld; true make -C upstream/darwin-linker/src/cctools/as make -C upstream/darwin-linker/src/cctools/ar mkdir -p upstream/install/powerpc-apple-darwin/bin cp upstream/darwin-linker/src/cctools/ld/ld_dir/ld.NEW upstream/install/powerpc-apple-darwin/bin/ld.NEW - echo -e "#!/bin/sh\n"`pwd`/upstream/install/powerpc-apple-darwin/bin/ld.NEW -dylib_file /usr/lib/system/libmathCommon.A.dylib:`pwd`/xwt/upstream/install/powerpc-apple-darwin/lib/libmathCommon.A.dylib -Z -L`pwd`/upstream/install/powerpc-apple-darwin/lib $$@ > upstream/install/powerpc-apple-darwin/bin/ld + echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ld.NEW -dylib_file /usr/lib/system/libmathCommon.A.dylib:"`pwd`"/upstream/install/powerpc-apple-darwin/lib/libmathCommon.A.dylib -Z -L"`pwd`"/upstream/install/powerpc-apple-darwin/lib $$@\n" > upstream/install/powerpc-apple-darwin/bin/ld chmod +x upstream/install/powerpc-apple-darwin/bin/ld + chmod +x upstream/install/powerpc-apple-darwin/bin/ranlib + cp upstream/darwin-linker/src/cctools/misc/libtool.NEW upstream/install/powerpc-apple-darwin/bin/ranlib cp upstream/darwin-linker/src/cctools/misc/strip.NEW upstream/install/powerpc-apple-darwin/bin/strip cp upstream/darwin-linker/src/cctools/as/appc_dir/as upstream/install/powerpc-apple-darwin/bin/as cp upstream/darwin-linker/src/cctools/ar/ar.NEW upstream/install/powerpc-apple-darwin/bin/ar mkdir -p upstream/install/bin - cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/ld powerpc-apple-darwin-ld - cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/as powerpc-apple-darwin-as - cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/ar powerpc-apple-darwin-ar - cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/strip powerpc-apple-darwin-strip + cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ld powerpc-apple-darwin-ld + cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/as powerpc-apple-darwin-as + cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ar powerpc-apple-darwin-ar + cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ranlib powerpc-apple-darwin-ranlib + cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/strip powerpc-apple-darwin-strip echo -e "#!/bin/sh\nc++filt $$@\n" > upstream/install/bin/c++filt3; chmod +x upstream/install/bin/c++filt3 touch $@ diff --git a/upstream/darwin-linker/patches/cctools.patch b/upstream/darwin-linker/patches/cctools.patch index 0ce718b..3489e7b 100644 --- a/upstream/darwin-linker/patches/cctools.patch +++ b/upstream/darwin-linker/patches/cctools.patch @@ -2292,7 +2292,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 @@ -2301,7 +2301,16 @@ diff -bur ./symbols.h /home/megacz/xwt/upstream/darwin-linker/src/cctools/as/sym #include #include -@@ -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 +2325,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 +2354,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); ++*/ + } + + /* -- 1.7.10.4