From 9fe5ab0b773fee33a8af3406b3e7b3fcd2303d76 Mon Sep 17 00:00:00 2001 From: brian Date: Fri, 30 Jan 2004 07:06:05 +0000 Subject: [PATCH] 2003/09/10 03:14:19 darcs-hash:20040130070605-aa32f-9af1d3bf0d9b499ac6bf894fbf2283ba69d37c81.gz --- Makefile | 2 +- Makefile.upstream | 1 + upstream/darwin-linker/links.sh | 108 -------------------------- upstream/darwin-linker/patches/cctools.patch | 14 +--- 4 files changed, 3 insertions(+), 122 deletions(-) diff --git a/Makefile b/Makefile index 76fda31..5060835 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ JVM: build/JVM/xwt.jar Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext --static" Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext" Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe -Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="-lSystem -lmathCommon.A upstream/install/powerpc-apple-darwin/lib/crt1.o" +Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="-lSystem -lmathCommon.A" ############################################################################# diff --git a/Makefile.upstream b/Makefile.upstream index bdf1a7d..0a3aaa8 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -18,6 +18,7 @@ url_jpeg-6b := http://www.ijg.org/files/jpegsrc.v6b.tar.gz url_jikes-1.18 := http://www.megacz.com/tmp/jikes-1.18.tgz #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor + rm -rf upstream/darwin-linker/src cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz cd upstream/darwin-linker/src/cctools; for A in ../../patches/*.patch; do patch -p0 < $$A; done cp upstream/darwin-linker/src/cctools/ld/fake-mach.c upstream/darwin-linker/src/cctools/libstuff diff --git a/upstream/darwin-linker/links.sh b/upstream/darwin-linker/links.sh index 0da8a14..aa12689 100755 --- a/upstream/darwin-linker/links.sh +++ b/upstream/darwin-linker/links.sh @@ -187,115 +187,7 @@ ln -s ../../../../install/powerpc-apple-darwin/include/architecture/adb_kb_map.h ln -s ../../../../install/powerpc-apple-darwin/include/architecture/arch_types.h architecture/arch_types.h ln -s ../../../../install/powerpc-apple-darwin/include/architecture/ascii_codes.h architecture/ascii_codes.h ln -s ../../../../install/powerpc-apple-darwin/include/architecture/byte_order.h architecture/byte_order.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/disklabel.h sys/disklabel.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/dir.h sys/dir.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/callout.h sys/callout.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/cdefs.h sys/cdefs.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/acct.h sys/acct.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/attr.h sys/attr.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/buf.h sys/buf.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/clist.h sys/clist.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/conf.h sys/conf.h ln -s ../../../../install/powerpc-apple-darwin/include/sys/appleapiopts.h sys/appleapiopts.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/dirent.h sys/dirent.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/resourcevar.h sys/resourcevar.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/select.h sys/select.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ioctl_compat.h sys/ioctl_compat.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ipc.h sys/ipc.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/queue.h sys/queue.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/disktab.h sys/disktab.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/disk.h sys/disk.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/dkstat.h sys/dkstat.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/dmap.h sys/dmap.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/domain.h sys/domain.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/errno.h sys/errno.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ev.h sys/ev.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/exec.h sys/exec.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/fcntl.h sys/fcntl.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/file.h sys/file.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/filedesc.h sys/filedesc.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/filio.h sys/filio.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/gmon.h sys/gmon.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ioccom.h sys/ioccom.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ioctl.h sys/ioctl.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/kern_event.h sys/kern_event.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ktrace.h sys/ktrace.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/kernel.h sys/kernel.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/loadable_fs.h sys/loadable_fs.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/lock.h sys/lock.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/lockf.h sys/lockf.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/mach_swapon.h sys/mach_swapon.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/malloc.h sys/malloc.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/kdebug.h sys/kdebug.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/linker_set.h sys/linker_set.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/md5.h sys/md5.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/mbuf.h sys/mbuf.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/mman.h sys/mman.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/mount.h sys/mount.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/msgbuf.h sys/msgbuf.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/mtio.h sys/mtio.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/namei.h sys/namei.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/netport.h sys/netport.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/param.h sys/param.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/paths.h sys/paths.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/proc.h sys/proc.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/protosw.h sys/protosw.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ptrace.h sys/ptrace.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/random.h sys/random.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/reboot.h sys/reboot.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/resource.h sys/resource.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/semaphore.h sys/semaphore.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/shm.h sys/shm.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/signal.h sys/signal.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/signalvar.h sys/signalvar.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/socket.h sys/socket.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/socketvar.h sys/socketvar.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/sockio.h sys/sockio.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/stat.h sys/stat.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/syscall.h sys/syscall.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/sysctl.h sys/sysctl.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/syslimits.h sys/syslimits.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/syslog.h sys/syslog.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/systm.h sys/systm.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/termios.h sys/termios.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/time.h sys/time.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/timeb.h sys/timeb.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/times.h sys/times.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/tprintf.h sys/tprintf.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/trace.h sys/trace.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/tty.h sys/tty.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ttychars.h sys/ttychars.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ttycom.h sys/ttycom.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ttydefaults.h sys/ttydefaults.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ttydev.h sys/ttydev.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/types.h sys/types.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ubc.h sys/ubc.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ucred.h sys/ucred.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/uio.h sys/uio.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/un.h sys/un.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/unistd.h sys/unistd.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/unpcb.h sys/unpcb.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/user.h sys/user.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/utfconv.h sys/utfconv.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/utsname.h sys/utsname.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ux_exception.h sys/ux_exception.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vadvise.h sys/vadvise.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vcmd.h sys/vcmd.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/version.h sys/version.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vlimit.h sys/vlimit.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vm.h sys/vm.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vmmeter.h sys/vmmeter.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vmparam.h sys/vmparam.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vnode.h sys/vnode.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vnode_if.h sys/vnode_if.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vstat.h sys/vstat.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/wait.h sys/wait.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/kern_control.h sys/kern_control.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/quota.h sys/quota.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/sem.h sys/sem.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/sys_domain.h sys/sys_domain.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/ucontext.h sys/ucontext.h -ln -s ../../../../install/powerpc-apple-darwin/include/sys/vnioctl.h sys/vnioctl.h ln -s ../../../../install/powerpc-apple-darwin/include/mach_debug/mach_debug_types.defs mach_debug/mach_debug_types.defs ln -s ../../../../install/powerpc-apple-darwin/include/mach_debug/mach_debug_types.h mach_debug/mach_debug_types.h ln -s ../../../../install/powerpc-apple-darwin/include/mach_debug/mach_debug.h mach_debug/mach_debug.h diff --git a/upstream/darwin-linker/patches/cctools.patch b/upstream/darwin-linker/patches/cctools.patch index 3489e7b..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 -+#include - - /* - * 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; +} -- 1.7.10.4