The branch stable/14 has been updated by dim:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=50e1230228d8bf7aeb1beb11f29c2e55338940df

commit 50e1230228d8bf7aeb1beb11f29c2e55338940df
Author:     Ryan Libby <rli...@freebsd.org>
AuthorDate: 2024-06-25 17:40:14 +0000
Commit:     Dimitry Andric <d...@freebsd.org>
CommitDate: 2025-08-17 18:30:42 +0000

    libmsun: remove duplicates after cdefs.h added inline to __always_inline
    
    Reviewed by:    kib, olce
    Sponsored by:   Dell EMC Isilon
    Differential Revision:  https://reviews.freebsd.org/D45712
    
    (cherry picked from commit 07cc7ea7386c5428cef9e8f06d4ebd8144dec311)
---
 lib/msun/ld128/e_rem_pio2l.h | 2 +-
 lib/msun/ld128/s_logl.c      | 2 +-
 lib/msun/ld80/e_rem_pio2l.h  | 2 +-
 lib/msun/ld80/s_logl.c       | 2 +-
 lib/msun/src/e_rem_pio2.c    | 2 +-
 lib/msun/src/e_rem_pio2f.c   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/msun/ld128/e_rem_pio2l.h b/lib/msun/ld128/e_rem_pio2l.h
index 5d1f9bde92da..c10eb36d0c24 100644
--- a/lib/msun/ld128/e_rem_pio2l.h
+++ b/lib/msun/ld128/e_rem_pio2l.h
@@ -55,7 +55,7 @@ pio2_2t =  2.0670321098263988236496903051604844e-43L, /*  
0x127044533e63a0105df5
 pio2_3  =  2.0670321098263988236499468110329591e-43L,  /*  
0x127044533e63a0105e00000000000.0p-254 */
 pio2_3t = -2.5650587247459238361625433492959285e-65L;  /* 
-0x159c4ec64ddaeb5f78671cbfb2210.0p-327 */
 
-static inline __always_inline int
+static __always_inline int
 __ieee754_rem_pio2l(long double x, long double *y)
 {
        union IEEEl2bits u,u1;
diff --git a/lib/msun/ld128/s_logl.c b/lib/msun/ld128/s_logl.c
index 4d32462e5653..e9133ec66fd2 100644
--- a/lib/msun/ld128/s_logl.c
+++ b/lib/msun/ld128/s_logl.c
@@ -444,7 +444,7 @@ struct ld {
 #endif
 
 #ifdef STRUCT_RETURN
-static inline __always_inline void
+static __always_inline void
 k_logl(long double x, struct ld *rp)
 #else
 long double
diff --git a/lib/msun/ld80/e_rem_pio2l.h b/lib/msun/ld80/e_rem_pio2l.h
index 88412c3d0cf9..b64c9b6ff4f4 100644
--- a/lib/msun/ld80/e_rem_pio2l.h
+++ b/lib/msun/ld80/e_rem_pio2l.h
@@ -67,7 +67,7 @@ pio2_2t =  6.36831716351095013979e-25L,       /*  
0xc51701b839a25205.0p-144 */
 pio2_3t = -2.75299651904407171810e-37L;        /* -0xbb5bf6c7ddd660ce.0p-185 */
 #endif
 
-static inline __always_inline int
+static __always_inline int
 __ieee754_rem_pio2l(long double x, long double *y)
 {
        union IEEEl2bits u,u1;
diff --git a/lib/msun/ld80/s_logl.c b/lib/msun/ld80/s_logl.c
index 2c5d1e2dd08f..7141abe086d5 100644
--- a/lib/msun/ld80/s_logl.c
+++ b/lib/msun/ld80/s_logl.c
@@ -444,7 +444,7 @@ struct ld {
 #endif
 
 #ifdef STRUCT_RETURN
-static inline __always_inline void
+static __always_inline void
 k_logl(long double x, struct ld *rp)
 #else
 long double
diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c
index 266ab24097f2..05ae45153aeb 100644
--- a/lib/msun/src/e_rem_pio2.c
+++ b/lib/msun/src/e_rem_pio2.c
@@ -46,7 +46,7 @@ pio2_3  =  2.02226624871116645580e-21, /* 0x3BA3198A, 
0x2E000000 */
 pio2_3t =  8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
 
 #ifdef INLINE_REM_PIO2
-static __inline __always_inline
+static __always_inline
 #endif
 int
 __ieee754_rem_pio2(double x, double *y)
diff --git a/lib/msun/src/e_rem_pio2f.c b/lib/msun/src/e_rem_pio2f.c
index 744060f18010..11e460c1af33 100644
--- a/lib/msun/src/e_rem_pio2f.c
+++ b/lib/msun/src/e_rem_pio2f.c
@@ -38,7 +38,7 @@ pio2_1  =  1.57079631090164184570e+00, /* 0x3FF921FB, 
0x50000000 */
 pio2_1t =  1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */
 
 #ifdef INLINE_REM_PIO2F
-static __inline __always_inline
+static __always_inline
 #endif
 int
 __ieee754_rem_pio2f(float x, double *y)

Reply via email to