Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build in specific Linux environment #106

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix build in specific Linux environment #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec6f0c5
fix(Makefile): call generic objcopy,strip and enforce arch via argument
steveej May 23, 2017
3c32ffb
fix(x86_64 target): specificy linker as "gcc"
steveej May 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ release_boot := $(boot_outdir)/release/libboot.a

grub_cfg := src/arch/$(arch)/grub.cfg

TIMESTAMP := $(shell /bin/date "+%Y-%m-%d-%H:%M:%S")
TIMESTAMP := $(shell date "+%Y-%m-%d-%H:%M:%S")

# wildcard paths
wild_iso := target/$(target)/%/sos-$(arch).iso
Expand Down Expand Up @@ -101,7 +101,7 @@ $(boot):
@cd boot && xargo rustc --target $(boot_target) -- \
--emit=obj=target/$(boot_target)/debug/boot32.o
# # Place 32-bit bootstrap code into a 64-bit ELF
@x86_64-elf-objcopy -O elf64-x86-64 $(boot_outdir)/debug/boot32.o \
@objcopy -O elf64-x86-64 $(boot_outdir)/debug/boot32.o \
$(boot_outdir)/debug/boot.o
# @x86_64-elf-objcopy --strip-debug -G _start boot/target/boot.o
@cd $(boot_outdir)/debug && ar -crus libboot.a boot.o
Expand All @@ -110,8 +110,8 @@ $(release_boot):
@cd boot && xargo rustc --target $(boot_target) -- --release \
--emit=obj=target/$(boot_target)release/boot32.o
# # Place 32-bit bootstrap code into a 64-bit ELF
@x86_64-elf-objcopy -O elf64-x86-64 $(boot_outdir)/release/boot32.o $(boot_outdir)/release/boot.o
@x86_64-elf-objcopy --strip-debug -G _start $(boot_outdir)/release/boot.o
@objcopy -O elf64-x86-64 $(boot_outdir)/release/boot32.o $(boot_outdir)/release/boot.o
@objcopy -O elf64-x86-64 --strip-debug -G _start $(boot_outdir)/release/boot.o
@cd $(boot_outdir)/release && ar -crus libboot.a boot.o

$(release_kernel): $(release_boot)
Expand All @@ -131,11 +131,11 @@ $(kernel): $(boot)
@xargo build --target $(target)

$(kernel).debug: $(kernel)
@x86_64-elf-objcopy --only-keep-debug $(kernel) $(kernel).debug
@objcopy -O elf64-x86-64 --only-keep-debug $(kernel) $(kernel).debug

$(kernel).bin: $(kernel) $(kernel).debug
@x86_64-elf-strip -g -o $(kernel).bin $(kernel)
@x86_64-elf-objcopy --add-gnu-debuglink=$(kernel).debug $(kernel)
@strip -O elf64-x86-64 -g -o $(kernel).bin $(kernel)
@objcopy -O elf64-x86-64 --add-gnu-debuglink=$(kernel).debug $(kernel)

gdb: $(kernel).bin $(kernel).debug ##@utilities Connect to a running QEMU instance with gdb.
@rust-os-gdb -ex "target remote tcp:127.0.0.1:1234" $(kernel)
1 change: 1 addition & 0 deletions x86_64-sos-kernel-gnu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"relocation-model": "static",
"os": "sos",
"arch": "x86_64",
"linker": "gcc",
"linker-flavor": "gcc",
"pre-link-args": {
"gcc": [ "-Tsrc/arch/x86_64/linker.ld"
Expand Down