From 6d77398c95146ba9eb3362b7856979bc6c95b149 Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Fri, 9 Aug 2024 20:15:28 -0700 Subject: [PATCH] Update linker scripts to avoid hardcoded /opt/riscv --- fpga/zsbl/Makefile | 2 +- fpga/zsbl/linker1000.x | 1 - tests/custom/boot/Makefile | 2 +- tests/custom/cacheTest/Makefile | 2 +- tests/custom/crt0/Makefile | 2 +- tests/custom/fpga-blink-led/Makefile | 2 +- tests/custom/fpga-test-dram/Makefile | 2 +- tests/custom/fpga-test-sdc/Makefile | 2 +- tests/custom/james_mm/Makefile | 2 +- tests/custom/linker.x | 1 - tests/custom/linker1000.x | 1 - tests/custom/linker8000-0000.x | 1 - tests/custom/lpddrtest/Makefile | 2 +- tests/custom/mibench_qsort/Makefile | 2 +- tests/custom/sieve/Makefile | 2 +- tests/custom/simple/Makefile | 2 +- 16 files changed, 12 insertions(+), 16 deletions(-) diff --git a/fpga/zsbl/Makefile b/fpga/zsbl/Makefile index 85bfc67eb..fa22eb607 100644 --- a/fpga/zsbl/Makefile +++ b/fpga/zsbl/Makefile @@ -24,7 +24,7 @@ LIBRARY_FILES := MARCH :=-march=rv64imfdc_zifencei MABI :=-mabi=lp64d -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -L $(RISCV)/riscv64-unknown-elf/lib LINKER :=linker1000.x diff --git a/fpga/zsbl/linker1000.x b/fpga/zsbl/linker1000.x index 6d9e948a6..b479e73dd 100644 --- a/fpga/zsbl/linker1000.x +++ b/fpga/zsbl/linker1000.x @@ -2,7 +2,6 @@ OUTPUT_FORMAT("elf64-littleriscv", "elf64-littleriscv", "elf64-littleriscv") OUTPUT_ARCH(riscv) ENTRY(_start) -SEARCH_DIR("/opt/riscv/riscv64-unknown-elf/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ diff --git a/tests/custom/boot/Makefile b/tests/custom/boot/Makefile index 6fe9d2256..d4ebaa7f7 100644 --- a/tests/custom/boot/Makefile +++ b/tests/custom/boot/Makefile @@ -23,7 +23,7 @@ LIBRARY_FILES := MARCH :=-march=rv64imfdc MABI :=-mabi=lp64d -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -L $(RISCV)/riscv64-unknown-elf/lib LINKER :=$(ROOT)/linker1000.x diff --git a/tests/custom/cacheTest/Makefile b/tests/custom/cacheTest/Makefile index f5ad40232..393cfd0ec 100644 --- a/tests/custom/cacheTest/Makefile +++ b/tests/custom/cacheTest/Makefile @@ -7,7 +7,7 @@ LIBRARY_FILES := crt0 MARCH :=-march=rv64imfdc MABI :=-mabi=lp64d LINKER := ${ROOT}/linker8000-0000.x -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map -L $(RISCV)/riscv64-unknown-elf/lib CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany -mstrict-align -O2 CC=riscv64-unknown-elf-gcc diff --git a/tests/custom/crt0/Makefile b/tests/custom/crt0/Makefile index 0b6a3af23..ec6d662cf 100644 --- a/tests/custom/crt0/Makefile +++ b/tests/custom/crt0/Makefile @@ -6,7 +6,7 @@ LIBRARY_FILES := MARCH :=-march=rv64imfdc MABI :=-mabi=lp64d -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -L $(RISCV)/riscv64-unknown-elf/lib LINKER := ${ROOT}/linker.x AFLAGS =$(MARCH) $(MABI) -W diff --git a/tests/custom/fpga-blink-led/Makefile b/tests/custom/fpga-blink-led/Makefile index df7544416..3ccf1927d 100644 --- a/tests/custom/fpga-blink-led/Makefile +++ b/tests/custom/fpga-blink-led/Makefile @@ -23,7 +23,7 @@ LIBRARY_FILES := MARCH :=-march=rv64imfdc MABI :=-mabi=lp64d -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -L $(RISCV)/riscv64-unknown-elf/lib LINKER :=$(ROOT)/linker1000.x diff --git a/tests/custom/fpga-test-dram/Makefile b/tests/custom/fpga-test-dram/Makefile index df7544416..3ccf1927d 100644 --- a/tests/custom/fpga-test-dram/Makefile +++ b/tests/custom/fpga-test-dram/Makefile @@ -23,7 +23,7 @@ LIBRARY_FILES := MARCH :=-march=rv64imfdc MABI :=-mabi=lp64d -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -L $(RISCV)/riscv64-unknown-elf/lib LINKER :=$(ROOT)/linker1000.x diff --git a/tests/custom/fpga-test-sdc/Makefile b/tests/custom/fpga-test-sdc/Makefile index 32affba87..a5e24a56e 100644 --- a/tests/custom/fpga-test-sdc/Makefile +++ b/tests/custom/fpga-test-sdc/Makefile @@ -23,7 +23,7 @@ LIBRARY_FILES := MARCH :=-march=rv64imfdc MABI :=-mabi=lp64d -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -L $(RISCV)/riscv64-unknown-elf/lib LINKER :=$(ROOT)/linker1000.x diff --git a/tests/custom/james_mm/Makefile b/tests/custom/james_mm/Makefile index d13a3ad8d..adc5c1ef6 100644 --- a/tests/custom/james_mm/Makefile +++ b/tests/custom/james_mm/Makefile @@ -6,7 +6,7 @@ LIBRARY_FILES := crt0 MARCH :=-march=rv64imfdc MABI :=-mabi=lp64d -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map -L $(RISCV)/riscv64-unknown-elf/lib LINKER := ${ROOT}/linker8000-0000.x CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany -mstrict-align -O2 diff --git a/tests/custom/linker.x b/tests/custom/linker.x index f448109cc..95618b722 100644 --- a/tests/custom/linker.x +++ b/tests/custom/linker.x @@ -2,7 +2,6 @@ OUTPUT_FORMAT("elf64-littleriscv", "elf64-littleriscv", "elf64-littleriscv") OUTPUT_ARCH(riscv) ENTRY(_start) -SEARCH_DIR("/opt/riscv/riscv64-unknown-elf/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ diff --git a/tests/custom/linker1000.x b/tests/custom/linker1000.x index 6d9e948a6..b479e73dd 100644 --- a/tests/custom/linker1000.x +++ b/tests/custom/linker1000.x @@ -2,7 +2,6 @@ OUTPUT_FORMAT("elf64-littleriscv", "elf64-littleriscv", "elf64-littleriscv") OUTPUT_ARCH(riscv) ENTRY(_start) -SEARCH_DIR("/opt/riscv/riscv64-unknown-elf/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ diff --git a/tests/custom/linker8000-0000.x b/tests/custom/linker8000-0000.x index 548c9d45c..3635f8d27 100644 --- a/tests/custom/linker8000-0000.x +++ b/tests/custom/linker8000-0000.x @@ -2,7 +2,6 @@ OUTPUT_FORMAT("elf64-littleriscv", "elf64-littleriscv", "elf64-littleriscv") OUTPUT_ARCH(riscv) ENTRY(_start) -SEARCH_DIR("/opt/riscv/riscv64-unknown-elf/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ diff --git a/tests/custom/lpddrtest/Makefile b/tests/custom/lpddrtest/Makefile index 71710fcb5..50d2aae07 100644 --- a/tests/custom/lpddrtest/Makefile +++ b/tests/custom/lpddrtest/Makefile @@ -7,7 +7,7 @@ LIBRARY_FILES := crt0 MARCH :=-march=rv64imfdczicbom MABI :=-mabi=lp64d LINKER := ${ROOT}/linker8000-0000.x -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map -L $(RISCV)/riscv64-unknown-elf/lib CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany -mstrict-align -O2 CC=riscv64-unknown-elf-gcc diff --git a/tests/custom/mibench_qsort/Makefile b/tests/custom/mibench_qsort/Makefile index a738265da..0f9bba726 100644 --- a/tests/custom/mibench_qsort/Makefile +++ b/tests/custom/mibench_qsort/Makefile @@ -6,7 +6,7 @@ LIBRARY_FILES := crt0 MARCH :=-march=rv64ic MABI :=-mabi=lp64 -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map -L $(RISCV)/riscv64-unknown-elf/lib LINKER := ${ROOT}/linker8000-0000.x CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany -mstrict-align -O2 diff --git a/tests/custom/sieve/Makefile b/tests/custom/sieve/Makefile index c000b04eb..4c7c675af 100644 --- a/tests/custom/sieve/Makefile +++ b/tests/custom/sieve/Makefile @@ -6,7 +6,7 @@ LIBRARY_FILES := crt0 MARCH :=-march=rv64ic MABI :=-mabi=lp64 -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map -L $(RISCV)/riscv64-unknown-elf/lib LINKER := ${ROOT}/linker8000-0000.x CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany -mstrict-align -O2 diff --git a/tests/custom/simple/Makefile b/tests/custom/simple/Makefile index 2c8c2bdab..6281df7d8 100644 --- a/tests/custom/simple/Makefile +++ b/tests/custom/simple/Makefile @@ -7,7 +7,7 @@ LIBRARY_FILES := crt0 MARCH :=-march=rv64imfdczicbom MABI :=-mabi=lp64d LINKER := ${ROOT}/linker8000-0000.x -LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map +LINK_FLAGS :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map -L $(RISCV)/riscv64-unknown-elf/lib CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany -mstrict-align -O2 CC=riscv64-unknown-elf-gcc