From: brian <brian@brianweb.net>
Date: Wed, 12 May 2004 04:07:55 +0000 (-0700)
Subject: g77/linpack
X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=commitdiff_plain;h=f26168c62381bad692b6ccd782ba73336bfce180

g77/linpack

darcs-hash:20040512040755-24bed-47c92c97dd557c0a4823f2876e8f3b1156841158.gz
---

diff --git a/Makefile b/Makefile
index c744751..8a6af84 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ tasks = upstream/tasks
 flags = -march=mips1
 MIPS_CC = mips-unknown-elf-gcc
 MIPS_CXX = mips-unknown-elf-g++
+MIPS_G77 = mips-unknown-elf-g77
 
 # Be VERY careful about changing any of these as they can break binary 
 # compatibility and create hard to find bugs
@@ -233,6 +234,7 @@ rebuild-constants: $(tasks)/build_newlib
 build/tests/Env.class: build/org/ibex/nestedvm/Runtime.class build/org/ibex/nestedvm/Interpreter.class
 
 # Generic Hello Worldish test
+test_COMPILERFLAGS = -o unixruntime
 test: build/tests/Test.class
 	$(JAVA) -cp build tests.Test "arg 1" "arg 2" "arg 3"
 inttest: build/tests/Test.mips build/org/ibex/nestedvm/Interpreter.class
@@ -261,7 +263,7 @@ Paranoia_CFLAGS = "-Wno-error"
 Paranoia_LDFLAGS = -lm
 paranoiatest: build/tests/Paranoia.class
 	$(JAVA) -cp build tests.Paranoia
-
+	
 #
 # Freetype Stuff
 #
diff --git a/upstream/Makefile b/upstream/Makefile
index 1d61401..30bfa0a 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -5,12 +5,9 @@ version_gpc = 20030830
 version_texinputs = 1.0
 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-gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz
-url_gcc-g77 = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz
-url_texinputs = http://www.megacz.com/tmp/texinputs-$(version_texinputs).tgz
 patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch
 configure_gcc = --target=mips-unknown-elf --disable-threads --with-gnu-ld --with-gnu-as --with-newlib=yes --enable-sjlj-exceptions --enable-languages="c"
-configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++,pascal,f77"
+configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++"
 
 version_binutils = 2.14
 url_binutils = ftp://ftp.gnu.org/gnu/binutils/binutils-$(version_binutils).tar.gz
@@ -28,6 +25,8 @@ url_regex = ftp://ftp.zoo.toronto.edu/pub/regex.shar
 version_bcel = 5.1
 url_bcel = http://mirrors.mix5.com/apache/jakarta/bcel/binaries/bcel-$(version_bcel).tar.gz
 
+url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
+
 .SECONDARY: # This is broken in gmake < 3.79.1
 
 upstream = $(shell pwd)
@@ -105,7 +104,7 @@ tasks/download_%:
 	cd download && wget --passive-ftp -N $(url_$*)
 	touch $@
 
-tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-gpc tasks/download_gcc-g77
+tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++
 	touch $@
 
 tasks/extract_%: tasks/download_%
@@ -120,10 +119,6 @@ tasks/extract_gcc: tasks/download_gcc
 	mkdir -p build
 	cd build && gzip -dc ../download/gcc-core-$(version_gcc).tar.gz | tar xf -
 	cd build && gzip -dc ../download/gcc-g++-$(version_gcc).tar.gz | tar xf -
-	cd build && gzip -dc ../download/gcc-g77-$(version_gcc).tar.gz | tar xf -
-	cd build && gzip -dc ../download/gpc-$(version_gpc).tar.gz | tar xf - && \
-			rm -rf gcc-$(version_gcc)/gcc/p/; mv gpc-$(version_gpc)/p gcc-$(version_gcc)/gcc/p
-	rmdir build/gpc-$(version_gpc)
 	touch $@
 
 tasks/patch_%: tasks/extract_%