From c4aa91d9d58a47eb90798ae1ae6647953d3745a2 Mon Sep 17 00:00:00 2001
From: Michal Idziorek <m.i@gmx.at>
Date: Sat, 22 Nov 2014 16:43:51 +0100
Subject: support for ELF (with 1*text and 1*data)!

---
 userspace/Makefile         |  5 +----
 userspace/linker.ld        | 28 ----------------------------
 userspace/sys/oldlinker.ld | 25 -------------------------
 3 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 userspace/linker.ld
 delete mode 100644 userspace/sys/oldlinker.ld

(limited to 'userspace')

diff --git a/userspace/Makefile b/userspace/Makefile
index a0817e3..79c43d6 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -1,6 +1,5 @@
 CC=i686-foolos-gcc
 CFLAGS=-w
-LDFLAGS=-T linker.ld
 
 PROGS=shell simple brainfuck add
 
@@ -14,8 +13,7 @@ ext2.img: $(PROGS)
 	echo "hello one" > mnt/miguel/test1.txt
 	echo "hello two" > mnt/test2.txt
 	cp $^ mnt
-#	cp shell.bin mnt
-	cp ~/temp/fool-os-stuff/binutils-fool-build/binutils/elfedit mnt
+#	cp ~/temp/fool-os-stuff/binutils-fool-build/binutils/elfedit mnt
 	sync
 	sudo umount mnt
 	rm mnt -rf
@@ -29,7 +27,6 @@ shell: shell.o
 simple: simple.o
 add: add.o
 
-
 clean:
 	-rm *.o $(PROGS) ext2.img
 
diff --git a/userspace/linker.ld b/userspace/linker.ld
deleted file mode 100644
index 99ae573..0000000
--- a/userspace/linker.ld
+++ /dev/null
@@ -1,28 +0,0 @@
-/* OUTPUT_FORMAT(binary) */
-
-SECTIONS
-{
-    . = 0x800000;
-
-    /*
-
-  .text : ALIGN(0x1000) {
-	_TEXT_START_ = .;
-	*(.text)
-	_TEXT_END_ = .;
-  }
-
-  .data : ALIGN(0x1000) {
-      _DATA_START_ = .;
-      *(.data)
-      _DATA_END_ = .;
-  }
-
-  .bss : ALIGN(0x1000) {
-      _BSS_START_ = .;
-      *(.bss)
-      _BSS_END_ = .;
-  } 
-      */
-
-}
diff --git a/userspace/sys/oldlinker.ld b/userspace/sys/oldlinker.ld
deleted file mode 100644
index 4eee8eb..0000000
--- a/userspace/sys/oldlinker.ld
+++ /dev/null
@@ -1,25 +0,0 @@
-OUTPUT_FORMAT(binary)
-
-SECTIONS
-{
-    . = 0x800000;
-
-  .text : ALIGN(0x1000) {
-	_TEXT_START_ = .;
-	*(.text)
-	_TEXT_END_ = .;
-  }
-
-  .data : ALIGN(0x1000) {
-      _DATA_START_ = .;
-      *(.data)
-      _DATA_END_ = .;
-  }
-
-  .bss : ALIGN(0x1000) {
-      _BSS_START_ = .;
-      *(.bss)
-      _BSS_END_ = .;
-  } 
-
-}
-- 
cgit v1.2.3