From eb4b46e17f51cdf955e1d0c669661b9580de80f1 Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 27 Aug 2022 08:30:18 +0000 Subject: [PATCH] Use ENTRY_NB() instead of ENTRY() Since llvm 13, there are compiler warnings in libm on amd64 and i386 due to .weak overriding an earlier .globl. Use ENTRY_NB() instead of ENTRY() to avoid emitting the .globl. ok deraadt jca (for amd64) ok guenther --- lib/libm/arch/amd64/e_scalb.S | 4 ++-- lib/libm/arch/amd64/s_significand.S | 4 ++-- lib/libm/arch/amd64/s_significandf.S | 4 ++-- lib/libm/arch/i387/e_scalb.S | 4 ++-- lib/libm/arch/i387/s_significand.S | 4 ++-- lib/libm/arch/i387/s_significandf.S | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/libm/arch/amd64/e_scalb.S b/lib/libm/arch/amd64/e_scalb.S index a43318e7e54..0ff2fbf1b3e 100644 --- a/lib/libm/arch/amd64/e_scalb.S +++ b/lib/libm/arch/amd64/e_scalb.S @@ -1,4 +1,4 @@ -/* $OpenBSD: e_scalb.S,v 1.5 2018/07/03 22:43:34 mortimer Exp $ */ +/* $OpenBSD: e_scalb.S,v 1.6 2022/08/27 08:30:18 tb Exp $ */ /* * Written by J.T. Conklin . * Public domain. @@ -8,7 +8,7 @@ #include "abi.h" -ENTRY(scalb) +ENTRY_NB(scalb) RETGUARD_SETUP(scalb, r11) XMM_TWO_ARG_DOUBLE_PROLOGUE fldl ARG_DOUBLE_TWO diff --git a/lib/libm/arch/amd64/s_significand.S b/lib/libm/arch/amd64/s_significand.S index 78f221fda1a..5f9de30f675 100644 --- a/lib/libm/arch/amd64/s_significand.S +++ b/lib/libm/arch/amd64/s_significand.S @@ -1,4 +1,4 @@ -/* $OpenBSD: s_significand.S,v 1.5 2018/07/03 22:43:34 mortimer Exp $ */ +/* $OpenBSD: s_significand.S,v 1.6 2022/08/27 08:30:18 tb Exp $ */ /* * Written by J.T. Conklin . * Public domain. @@ -8,7 +8,7 @@ #include "abi.h" -ENTRY(significand) +ENTRY_NB(significand) RETGUARD_SETUP(significand, r11) XMM_ONE_ARG_DOUBLE_PROLOGUE fldl ARG_DOUBLE_ONE diff --git a/lib/libm/arch/amd64/s_significandf.S b/lib/libm/arch/amd64/s_significandf.S index c80dd2e2588..1897e6df3bb 100644 --- a/lib/libm/arch/amd64/s_significandf.S +++ b/lib/libm/arch/amd64/s_significandf.S @@ -1,4 +1,4 @@ -/* $OpenBSD: s_significandf.S,v 1.5 2018/07/03 22:43:34 mortimer Exp $ */ +/* $OpenBSD: s_significandf.S,v 1.6 2022/08/27 08:30:18 tb Exp $ */ /* * Written by J.T. Conklin . * Public domain. @@ -8,7 +8,7 @@ #include "abi.h" -ENTRY(significandf) +ENTRY_NB(significandf) RETGUARD_SETUP(significandf, r11) XMM_ONE_ARG_FLOAT_PROLOGUE flds ARG_FLOAT_ONE diff --git a/lib/libm/arch/i387/e_scalb.S b/lib/libm/arch/i387/e_scalb.S index e020fcf58b3..30700b839c2 100644 --- a/lib/libm/arch/i387/e_scalb.S +++ b/lib/libm/arch/i387/e_scalb.S @@ -1,4 +1,4 @@ -/* $OpenBSD: e_scalb.S,v 1.5 2016/09/12 19:47:02 guenther Exp $ */ +/* $OpenBSD: e_scalb.S,v 1.6 2022/08/27 08:30:18 tb Exp $ */ /* * Written by J.T. Conklin . * Public domain. @@ -6,7 +6,7 @@ #include "DEFS.h" -ENTRY(scalb) +ENTRY_NB(scalb) fldl 12(%esp) fldl 4(%esp) fscale diff --git a/lib/libm/arch/i387/s_significand.S b/lib/libm/arch/i387/s_significand.S index 159c92a098a..d9e57fd8011 100644 --- a/lib/libm/arch/i387/s_significand.S +++ b/lib/libm/arch/i387/s_significand.S @@ -1,4 +1,4 @@ -/* $OpenBSD: s_significand.S,v 1.5 2018/03/12 04:27:48 guenther Exp $ */ +/* $OpenBSD: s_significand.S,v 1.6 2022/08/27 08:30:18 tb Exp $ */ /* * Written by J.T. Conklin . * Public domain. @@ -6,7 +6,7 @@ #include -ENTRY(significand) +ENTRY_NB(significand) fldl 4(%esp) fxtract fstp %st(1) diff --git a/lib/libm/arch/i387/s_significandf.S b/lib/libm/arch/i387/s_significandf.S index c35dcfce58c..e43d9d8377d 100644 --- a/lib/libm/arch/i387/s_significandf.S +++ b/lib/libm/arch/i387/s_significandf.S @@ -1,4 +1,4 @@ -/* $OpenBSD: s_significandf.S,v 1.5 2018/03/12 04:27:48 guenther Exp $ */ +/* $OpenBSD: s_significandf.S,v 1.6 2022/08/27 08:30:18 tb Exp $ */ /* * Written by J.T. Conklin . * Public domain. @@ -6,7 +6,7 @@ #include -ENTRY(significandf) +ENTRY_NB(significandf) flds 4(%esp) fxtract fstp %st(1) -- 2.20.1