From: brian <brian@brianweb.net>
Date: Sat, 16 Dec 2006 00:49:15 +0000 (-0800)
Subject: conflict resolution
X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=commitdiff_plain;h=08bca61c10581469e047e23a0899f0eb4f4e9a82

conflict resolution

darcs-hash:20061216004915-24bed-bc13da381ba6a33c6a8e251da2e3c315af3e7cff.gz
---

diff --git a/upstream/Makefile b/upstream/Makefile
index bbec862..fd037e0 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -2,9 +2,9 @@
 
 version_gcc = 3.3.3
 
-url_gcc-core = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz
-url_gcc-c++ = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz
-url_gcc-g77 = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz
+url_gcc-core = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz
+url_gcc-c++ = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz
+url_gcc-g77 = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz
 
 patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch
 
@@ -22,7 +22,7 @@ patches_binutils = binutils-no64.patch binutils-nocompilein.patch
 configure_binutils = --target=mips-unknown-elf
 
 version_newlib = 1.11.0
-url_newlib = http://mirrors.rcn.net/pub/sourceware/newlib/newlib-$(version_newlib).tar.gz
+url_newlib = ftp://sources.redhat.com/pub/newlib/newlib-$(version_newlib).tar.gz
 patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-nomemcpy.patch newlib-unix.patch
 configure_newlib = --enable-multilib --target=mips-unknown-elf