misc cleanup

darcs-hash:20040520123648-24bed-f3171f46c8d8996de749f1a306d5374a5ab912ca.gz

diff --git a/src/org/ibex/nestedvm/crt0.c b/src/org/ibex/nestedvm/crt0.c
index a85cdbc..7e2c69e 100644 (file)
--- a/src/org/ibex/nestedvm/crt0.c
+++ b/src/org/ibex/nestedvm/crt0.c
@@ -1,7 +1,5 @@
 #include <stddef.h>
 
-extern int _gp[];
-
 extern int main(int argc, char **argv, char **envp);
 extern void exit(int status);
 extern int atexit(void (*f)());

diff --git a/src/org/ibex/nestedvm/linker.ld b/src/org/ibex/nestedvm/linker.ld
index 13330f1..ca67d9c 100644 (file)
--- a/src/org/ibex/nestedvm/linker.ld
+++ b/src/org/ibex/nestedvm/linker.ld
@@ -46,11 +46,12 @@ SECTIONS {
   . = ALIGN(16);
    _gp = . + 0x8000;
   .sdata : {
-    *(.rosdata*) *(.sdata*) *(.gnu.linkonce.s*)
+    *(.rosdata*) *(.sdata*) *(.gnu.linkonce.s) *(.gnu.linkonce.s.*)
   }
   .sbss : {
-    *(.sbss*) *(.scommon*)
+    *(.sbss*) *(.scommon*) *(.gnu.linkonce.sb*)
   }
+
   .bss : {
     *(.bss*) *(.gnu.linkonce.b*) *(COMMON) 
   }

diff --git a/src/tests/SpeedTest.java b/src/tests/SpeedTest.java
index 667d9a2..35941c1 100644 (file)
--- a/src/tests/SpeedTest.java
+++ b/src/tests/SpeedTest.java
@@ -2,8 +2,8 @@ package tests;
 
 import org.ibex.nestedvm.Runtime;
 
-import java.io.*;
-import java.util.*;
+//import java.io.*;
+//import java.util.*;
 
 class SpeedTest {
     private static long start,end;