From a80d07add50e6f405e991f95fdee67ce85feff9b Mon Sep 17 00:00:00 2001 From: drahn Date: Fri, 30 Apr 2021 16:13:00 +0000 Subject: [PATCH] Fix linkage error due to fp* functions. ok kettenis@ --- lib/libc/arch/riscv64/gen/fpgetmask.c | 3 +-- lib/libc/arch/riscv64/gen/fpgetsticky.c | 3 +-- lib/libc/arch/riscv64/gen/fpsetmask.c | 3 +-- lib/libc/arch/riscv64/gen/fpsetround.c | 3 +-- lib/libc/arch/riscv64/gen/fpsetsticky.c | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/libc/arch/riscv64/gen/fpgetmask.c b/lib/libc/arch/riscv64/gen/fpgetmask.c index 4d8fac984e2..60bd60334a7 100644 --- a/lib/libc/arch/riscv64/gen/fpgetmask.c +++ b/lib/libc/arch/riscv64/gen/fpgetmask.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpgetmask.c,v 1.2 2021/04/29 17:19:18 kettenis Exp $ */ +/* $OpenBSD: fpgetmask.c,v 1.3 2021/04/30 16:13:00 drahn Exp $ */ /* * Copyright (c) 2018 Mark Kettenis * @@ -22,4 +22,3 @@ fpgetmask(void) { return 0; } -DEF_WEAK(fpgetmask); diff --git a/lib/libc/arch/riscv64/gen/fpgetsticky.c b/lib/libc/arch/riscv64/gen/fpgetsticky.c index 81a14b0dcda..300d4021d0b 100644 --- a/lib/libc/arch/riscv64/gen/fpgetsticky.c +++ b/lib/libc/arch/riscv64/gen/fpgetsticky.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpgetsticky.c,v 1.1 2021/04/29 17:19:18 kettenis Exp $ */ +/* $OpenBSD: fpgetsticky.c,v 1.2 2021/04/30 16:13:00 drahn Exp $ */ /* * Copyright (c) 2021 Mark Kettenis * @@ -26,4 +26,3 @@ fpgetsticky(void) __asm volatile ("frflags %0" : "=r"(fflags)); return fflags; } -DEF_WEAK(fpgetsticky); diff --git a/lib/libc/arch/riscv64/gen/fpsetmask.c b/lib/libc/arch/riscv64/gen/fpsetmask.c index d4b1edd5d79..3d9a8d901e2 100644 --- a/lib/libc/arch/riscv64/gen/fpsetmask.c +++ b/lib/libc/arch/riscv64/gen/fpsetmask.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetmask.c,v 1.2 2021/04/29 17:19:18 kettenis Exp $ */ +/* $OpenBSD: fpsetmask.c,v 1.3 2021/04/30 16:13:00 drahn Exp $ */ /* * Copyright (c) 2018 Mark Kettenis * @@ -22,4 +22,3 @@ fpsetmask(fp_except mask) { return 0; } -DEF_WEAK(fpsetmask); diff --git a/lib/libc/arch/riscv64/gen/fpsetround.c b/lib/libc/arch/riscv64/gen/fpsetround.c index e9e26b32466..e0c574c65b0 100644 --- a/lib/libc/arch/riscv64/gen/fpsetround.c +++ b/lib/libc/arch/riscv64/gen/fpsetround.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetround.c,v 1.1 2021/04/29 17:19:18 kettenis Exp $ */ +/* $OpenBSD: fpsetround.c,v 1.2 2021/04/30 16:13:00 drahn Exp $ */ /* * Copyright (c) 2021 Mark Kettenis * @@ -28,4 +28,3 @@ fpsetround(fp_rnd rnd_dir) /* Truncating to 2 bits means both RNE and RMM become FP_RN. */ return frm & 0x3; } -DEF_WEAK(fpsetround); diff --git a/lib/libc/arch/riscv64/gen/fpsetsticky.c b/lib/libc/arch/riscv64/gen/fpsetsticky.c index a7069c38b75..06a7bf1cf98 100644 --- a/lib/libc/arch/riscv64/gen/fpsetsticky.c +++ b/lib/libc/arch/riscv64/gen/fpsetsticky.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetsticky.c,v 1.1 2021/04/29 17:19:18 kettenis Exp $ */ +/* $OpenBSD: fpsetsticky.c,v 1.2 2021/04/30 16:13:00 drahn Exp $ */ /* * Copyright (c) 2021 Mark Kettenis * @@ -26,4 +26,3 @@ fpsetsticky(fp_except sticky) __asm volatile ("fsflags %0, %1" : "=r"(fflags) : "r"(sticky)); return fflags; } -DEF_WEAK(fpsetsticky); -- 2.20.1