From a4e14f10589bed53e9f128a6831e590f36c795ff Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Wed, 29 Jul 2015 12:09:05 +0300
Subject: [PATCH] Don't build base libraries and BIOS with -fPIC after all.

---
 misoclib/soc/__init__.py |  2 +-
 misoclib/soc/cpuif.py    |  2 +-
 software/bios/linker.ld  | 13 -------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/misoclib/soc/__init__.py b/misoclib/soc/__init__.py
index 0280cba79..ef7c45454 100644
--- 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 e3ce49ed7..e75cf7af7 100644
--- 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 90a7d2b7c..74e83e3a6 100644
--- 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);