Don't build base libraries and BIOS with -fPIC after all.

diff --git a/misoclib/soc/__init__.py b/misoclib/soc/__init__.py
index 0280cba7975c72c012f51bea63313e78fdece83c..ef7c454549c2d3d23d216114eeb9a1ab8bc8f608 100644 (file)
--- a/misoclib/soc/__init__.py
+++ b/misoclib/soc/__init__.py
@@ -146,7 +146,7 @@ class SoC(Module):
         if size is not None:
             self.add_memory_region(name, address, size)
 
-    def register_rom(self, interface, rom_size=0x10000):
+    def register_rom(self, interface, rom_size=0xa000):
         self.add_wb_slave(mem_decoder(self.mem_map["rom"]), interface)
         self.add_memory_region("rom", self.cpu_reset_address, rom_size)
 

diff --git a/misoclib/soc/cpuif.py b/misoclib/soc/cpuif.py
index e3ce49ed7f658bed201cdd920e76be4b3fb43cce..e75cf7af7983a648f9c046f5da28d3fdb567ba2e 100644 (file)
--- a/misoclib/soc/cpuif.py
+++ b/misoclib/soc/cpuif.py
@@ -9,7 +9,7 @@ def get_cpu_mak(cpu_type):
         clang = ""
     elif cpu_type == "or1k":
         triple = "or1k-linux"
-        cpuflags = "-fPIC -mhard-mul -mhard-div"
+        cpuflags = "-mhard-mul -mhard-div"
         clang = "1"
     else:
         raise ValueError("Unsupported CPU type: "+cpu_type)

diff --git a/software/bios/linker.ld b/software/bios/linker.ld
index 90a7d2b7c729e9f979e91b154a3810061ecb67f9..74e83e3a653a4c640be750d7965ad84c75daed74 100644 (file)
--- a/software/bios/linker.ld
+++ b/software/bios/linker.ld
@@ -1,8 +1,6 @@
 INCLUDE generated/output_format.ld
 ENTRY(_start)
 
-__DYNAMIC = 0;
-
 INCLUDE generated/regions.ld
 
 SECTIONS
@@ -14,17 +12,6 @@ SECTIONS
                _etext = .;
        } > rom
 
-       .got :
-       {
-               _GLOBAL_OFFSET_TABLE_ = .;
-               *(.got)
-       } > rom
-
-       .got.plt :
-       {
-               *(.got.plt)
-       } > rom
-
        .rodata :
        {
                . = ALIGN(4);