Removed the linker script from the test module: it was unneeded

diff --git a/test_module/linker.ld b/test_module/linker.ld
deleted file mode 100644 (file)
index f94ccb2..0000000
--- a/test_module/linker.ld
+++ /dev/null
@@ -1,44 +0,0 @@
-ENTRY(_start)
-
-SECTIONS {
-       . = 1M;
-
-       . = ALIGN(4K);
-       .text ALIGN(4K) : AT(ADDR(.text)) {
-               *(.text)
-               *(.text*)
-               *(.gnu.linkonce.t*)
-               . = ALIGN(8);
-               *(.init)
-               . = ALIGN(8);
-               *(.fini)
-               . = ALIGN(8);
-               *(.ctors)
-               . = ALIGN(8);
-               *(.dtors)
-       }
-       .rodata ALIGN(4K) : AT(ADDR(.rodata)) {
-               *(.rodata)
-               *(.rodata*)
-               *(.gnu.linkonce.r*)
-       }
-       .eh_frame ALIGN(4K) : AT(ADDR(.eh_frame)) {
-               *(.eh_frame)
-       }
-       .data ALIGN(4K) : AT(ADDR(.data)) {
-               *(.data)
-               *(.data*)
-               *(.gnu.linkonce.d*)
-       }
-       .bss ALIGN(4K) : AT(ADDR(.bss)) {
-               *(.bss)
-               *(COMMON)
-               *(.bss*)
-               *(.gnu.linkonce.b*)
-       }
-       . = ALIGN(4K);
-
-       /DISCARD/ : {
-               *(.comment)
-       }
-}

diff --git a/test_module/module.mk b/test_module/module.mk
index ddfcc324769eedc4a62a965266bb2db88f2aed1c..dd51dd4c4c9a50b0b91fd89eb06f84a2d7d74e30 100644 (file)
--- a/test_module/module.mk
+++ b/test_module/module.mk
@@ -14,7 +14,7 @@ TO_ISO += isodir/boot/$(EXEC_NAME)
 TO_CLEAN += $(OUT_DIR) $(DEP_DIR)
 
 LOCAL_CXXFLAGS := $(CXXFLAGS)
-LOCAL_LDFLAGS := $(LDFLAGS) -T test_module/linker.ld -z max-page-size=0x1000
+LOCAL_LDFLAGS := $(LDFLAGS)
 
 CPPOBJS := $(patsubst $(SRC_DIR)%,$(OUT_DIR)%.o,$(shell find $(SRC_DIR) -name '*.cpp'))
 ASMOBJS := $(patsubst $(SRC_DIR)%,$(OUT_DIR)%.o,$(shell find $(SRC_DIR) -name '*.S'))