Use a linker script

Author: RobDangerous

kmake/Data/kompjuta/kompjuta.ld

@@ -0,0 +1,35 @@
+ENTRY(_start)
+
+MEMORY {
+  RAM (rwx) : ORIGIN = 0x00010000, LENGTH = 256M
+}
+
+SECTIONS {
+  .text : ALIGN(16) {
+    KEEP(*(.text.start))
+    *(.text*)
+    *(.rodata*)
+  } > RAM
+
+  .eh_frame : { *(.eh_frame*) } > RAM
+
+  .data : ALIGN(16) {
+    __data_start = .;
+    *(.data*)
+    __data_end = .;
+  } > RAM
+
+  .bss (NOLOAD) : ALIGN(16) {
+    __bss_start = .;
+    *(.bss*)
+    *(COMMON)
+    __bss_end = .;
+  } > RAM
+
+  . = ALIGN(16);
+  __heap_base = .;
+  __heap_end  = ORIGIN(RAM) + LENGTH(RAM) - 1M;
+
+  __stack_bottom = __heap_end;
+  __stack_top = __heap_end + 1M;
+}

kmake/src/Exporters/KompjutaExporter.ts

@@ -4,6 +4,8 @@ import { NinjaExporter } from 'kmake/Exporters/NinjaExporter';
 import { MakeExporter } from 'kmake/Exporters/MakeExporter';
 import { CLionExporter } from 'kmake/Exporters/CLionExporter';
 import { CompilerCommandsExporter } from 'kmake/Exporters/CompileCommandsExporter';
+import * as fs from 'kmake/fsextra';
+import * as path from 'path';
 
 export class KompjutaExporter extends Exporter {
 	ninja: NinjaExporter;
@@ -14,17 +16,23 @@ export class KompjutaExporter extends Exporter {
 	constructor(options: any) {
 		super(options);
 
-		let flags = '--target=riscv64-unknown-elf -march=rv64imfd -mabi=lp64d -Os -ffreestanding -fno-builtin -nostdlib -nostartfiles -mno-relax "-Wl,--no-relax"';
+		const cFlags = '--target=riscv64-unknown-elf -march=rv64imfd -mabi=lp64d -Os -ffreestanding -fno-builtin -ffunction-sections -fdata-sections -nostdlib -mno-relax';
+		const linkerFlags = '--target=riscv64-unknown-elf -march=rv64imfd -mabi=lp64d -Os -ffreestanding -fno-builtin -ffunction-sections -fdata-sections -nostdlib -mno-relax "-Wl,--no-relax,--gc-sections,-Map,link.map,-T,kompjuta.ld"';
 
-		let outputExtension = '.elf';
+		const outputExtension = '.elf';
 
-		this.ninja = new NinjaExporter(options, 'clang', 'clang++', flags, flags, flags, outputExtension);
-		this.make = new MakeExporter(options, 'clang', 'clang++', flags, flags, flags, outputExtension);
+		this.ninja = new NinjaExporter(options, 'clang', 'clang++', cFlags, cFlags, linkerFlags, outputExtension);
+		this.make = new MakeExporter(options, 'clang', 'clang++', cFlags, cFlags, linkerFlags, outputExtension);
 		this.clion = new CLionExporter(options);
 		this.compileCommands = new CompilerCommandsExporter(options);
 	}
 
 	async exportSolution(project: Project, from: string, to: string, platform: string, vrApi: any, options: any) {
+		const textData = require('fs').getEmbeddedData();
+		let outputPath = path.resolve(to, options.buildPath);
+		fs.ensureDirSync(outputPath);
+		fs.writeFileSync(path.join(outputPath, 'kompjuta.ld'), textData['kompjuta_kompjuta_ld']);
+
 		this.ninja.exportSolution(project, from, to, platform, vrApi, options);
 		this.make.exportSolution(project, from, to, platform, vrApi, options);
 		this.clion.exportSolution(project, from, to, platform, vrApi, options);

lib/kmake/Exporters/KompjutaExporter.js

@@ -1447,6 +1447,24 @@
             '<@(_outputs)',
           ],
         },
+        {
+          'action_name': 'kompjuta_kompjuta_ld',
+          'process_outputs_as_sources': 1,
+          'inputs': [
+            'tools/text_to_header.py',
+            'kmake/Data/kompjuta/kompjuta.ld'
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/kompjuta_kompjuta_ld.h',
+          ],
+          'action': [
+            '<(python)',
+            'tools/text_to_header.py',
+            'kompjuta_kompjuta_ld',
+            'kmake/Data/kompjuta/kompjuta.ld',
+            '<@(_outputs)',
+          ],
+        },
       ],
     }, # node_lib_target_name
     { # fuzz_env

lib/kmake/Exporters/KompjutaExporter.js.map

@@ -73,6 +73,8 @@
 #include "android_main_androidmanifest_xml.h"
 #include "android_main_res_values_strings_xml.h"
 
+#include "kompjuta_kompjuta_ld.h"
+
 #if defined(__MINGW32__) || defined(_MSC_VER)
 # include <io.h>
 #endif
@@ -3833,6 +3835,8 @@ static void GetEmbeddedData(const FunctionCallbackInfo<Value>& args) {
   data->Set(env->context(), FIXED_ONE_BYTE_STRING(isolate, "android_main_androidmanifest_xml"), FIXED_ONE_BYTE_STRING(isolate, android_main_androidmanifest_xml)).Check();
   data->Set(env->context(), FIXED_ONE_BYTE_STRING(isolate, "android_main_res_values_strings_xml"), FIXED_ONE_BYTE_STRING(isolate, android_main_res_values_strings_xml)).Check();
 
+  data->Set(env->context(), FIXED_ONE_BYTE_STRING(isolate, "kompjuta_kompjuta_ld"), FIXED_ONE_BYTE_STRING(isolate, komjuta_kompjuta_ld)).Check();
+
   args.GetReturnValue().Set(data);
 }