From 00b08605a3adcdc11ca7918a2edecf1babd175a6 Mon Sep 17 00:00:00 2001 From: James Graves <james.c.graves.jr@gmail.com> Date: Mon, 3 Aug 2020 14:37:32 -0500 Subject: [PATCH] Also weaken `__floattidf` Fixes link error with ion shell. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a607bec7..644ed9fa 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ $(BUILD)/debug/libc.so: $(BUILD)/debug/librelibc.a $(BUILD)/pthreads-emb/libpthr $(BUILD)/debug/librelibc.a: $(SRC) CARGO_INCREMENTAL=0 $(CARGO) rustc $(CARGOFLAGS) -- --emit link=$@ $(RUSTCFLAGS) # FIXME: Remove the following line. It's only required since xargo automatically links with compiler_builtins, which conflicts with the compiler_builtins that rustc always links with. - $(OBJCOPY) $@ -W __divti3 -W __muloti4 -W __udivti3 + $(OBJCOPY) $@ -W __divti3 -W __muloti4 -W __udivti3 -W __floattidf touch $@ $(BUILD)/debug/crt0.o: $(SRC) @@ -152,7 +152,7 @@ $(BUILD)/release/libc.so: $(BUILD)/release/librelibc.a $(BUILD)/pthreads-emb/lib $(BUILD)/release/librelibc.a: $(SRC) CARGO_INCREMENTAL=0 $(CARGO) rustc --release $(CARGOFLAGS) -- --emit link=$@ $(RUSTCFLAGS) # FIXME: Remove the following line. It's only required since xargo automatically links with compiler_builtins, which conflicts with the compiler_builtins that rustc always links with. - $(OBJCOPY) $@ -W __divti3 -W __muloti4 -W __udivti3 + $(OBJCOPY) $@ -W __divti3 -W __muloti4 -W __udivti3 -W __floattidf touch $@ $(BUILD)/release/crt0.o: $(SRC) -- GitLab