aboutsummaryrefslogtreecommitdiff
path: root/newlib
diff options
context:
space:
mode:
Diffstat (limited to 'newlib')
-rw-r--r--newlib/Makefile.in21
-rw-r--r--newlib/libc/include/sys/reent.h11
-rw-r--r--newlib/libc/locale/getlocalename_l.c15
-rw-r--r--newlib/libc/locale/locale.c46
-rw-r--r--newlib/libc/locale/setlocale.h5
-rw-r--r--newlib/libc/machine/riscv/rv_string.h (renamed from newlib/libc/machine/riscv/sys/string.h)8
-rw-r--r--newlib/libc/machine/riscv/stpcpy.c2
-rw-r--r--newlib/libc/machine/riscv/strcmp.S9
-rw-r--r--newlib/libc/machine/riscv/strcpy.c2
-rw-r--r--newlib/libc/machine/riscv/strlen.c2
-rw-r--r--newlib/libc/machine/riscv/sys/asm.h4
-rw-r--r--newlib/libc/machine/riscv/xlenint.h14
-rw-r--r--newlib/libm/machine/amdgcn/amdgcn_veclib.h17
13 files changed, 113 insertions, 43 deletions
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index a1319a8..52b5d80 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -856,7 +856,7 @@ check_PROGRAMS =
@HAVE_LIBC_MACHINE_PRU_TRUE@am__append_113 = libc/machine/pru/setjmp.s
@HAVE_LIBC_MACHINE_RISCV_TRUE@am__append_114 = \
@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/memmove.S libc/machine/riscv/memmove-stub.c libc/machine/riscv/memset.S libc/machine/riscv/memcpy-asm.S libc/machine/riscv/memcpy.c libc/machine/riscv/strlen.c \
-@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/strcpy.c libc/machine/riscv/strcmp.S libc/machine/riscv/setjmp.S libc/machine/riscv/ieeefp.c libc/machine/riscv/ffs.c
+@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/strcpy.c libc/machine/riscv/stpcpy.c libc/machine/riscv/strcmp.S libc/machine/riscv/setjmp.S libc/machine/riscv/ieeefp.c libc/machine/riscv/ffs.c
@HAVE_LIBC_MACHINE_RL78_TRUE@am__append_115 = libc/machine/rl78/setjmp.S
@HAVE_LIBC_MACHINE_RX_TRUE@am__append_116 = \
@@ -2183,6 +2183,7 @@ am__objects_51 = libc/ssp/libc_a-chk_fail.$(OBJEXT) \
@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/libc_a-memcpy.$(OBJEXT) \
@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/libc_a-strlen.$(OBJEXT) \
@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/libc_a-strcpy.$(OBJEXT) \
+@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/libc_a-stpcpy.$(OBJEXT) \
@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/libc_a-strcmp.$(OBJEXT) \
@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/libc_a-setjmp.$(OBJEXT) \
@HAVE_LIBC_MACHINE_RISCV_TRUE@ libc/machine/riscv/libc_a-ieeefp.$(OBJEXT) \
@@ -9178,6 +9179,9 @@ libc/machine/riscv/libc_a-strlen.$(OBJEXT): \
libc/machine/riscv/libc_a-strcpy.$(OBJEXT): \
libc/machine/riscv/$(am__dirstamp) \
libc/machine/riscv/$(DEPDIR)/$(am__dirstamp)
+libc/machine/riscv/libc_a-stpcpy.$(OBJEXT): \
+ libc/machine/riscv/$(am__dirstamp) \
+ libc/machine/riscv/$(DEPDIR)/$(am__dirstamp)
libc/machine/riscv/libc_a-strcmp.$(OBJEXT): \
libc/machine/riscv/$(am__dirstamp) \
libc/machine/riscv/$(DEPDIR)/$(am__dirstamp)
@@ -13141,6 +13145,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/riscv/$(DEPDIR)/libc_a-memmove.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/riscv/$(DEPDIR)/libc_a-memset.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/riscv/$(DEPDIR)/libc_a-setjmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/riscv/$(DEPDIR)/libc_a-stpcpy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/riscv/$(DEPDIR)/libc_a-strcmp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/riscv/$(DEPDIR)/libc_a-strcpy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/riscv/$(DEPDIR)/libc_a-strlen.Po@am__quote@
@@ -34800,6 +34805,20 @@ libc/machine/riscv/libc_a-strcpy.obj: libc/machine/riscv/strcpy.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/riscv/libc_a-strcpy.obj `if test -f 'libc/machine/riscv/strcpy.c'; then $(CYGPATH_W) 'libc/machine/riscv/strcpy.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/riscv/strcpy.c'; fi`
+libc/machine/riscv/libc_a-stpcpy.o: libc/machine/riscv/stpcpy.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/riscv/libc_a-stpcpy.o -MD -MP -MF libc/machine/riscv/$(DEPDIR)/libc_a-stpcpy.Tpo -c -o libc/machine/riscv/libc_a-stpcpy.o `test -f 'libc/machine/riscv/stpcpy.c' || echo '$(srcdir)/'`libc/machine/riscv/stpcpy.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libc/machine/riscv/$(DEPDIR)/libc_a-stpcpy.Tpo libc/machine/riscv/$(DEPDIR)/libc_a-stpcpy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libc/machine/riscv/stpcpy.c' object='libc/machine/riscv/libc_a-stpcpy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/riscv/libc_a-stpcpy.o `test -f 'libc/machine/riscv/stpcpy.c' || echo '$(srcdir)/'`libc/machine/riscv/stpcpy.c
+
+libc/machine/riscv/libc_a-stpcpy.obj: libc/machine/riscv/stpcpy.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/riscv/libc_a-stpcpy.obj -MD -MP -MF libc/machine/riscv/$(DEPDIR)/libc_a-stpcpy.Tpo -c -o libc/machine/riscv/libc_a-stpcpy.obj `if test -f 'libc/machine/riscv/stpcpy.c'; then $(CYGPATH_W) 'libc/machine/riscv/stpcpy.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/riscv/stpcpy.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libc/machine/riscv/$(DEPDIR)/libc_a-stpcpy.Tpo libc/machine/riscv/$(DEPDIR)/libc_a-stpcpy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libc/machine/riscv/stpcpy.c' object='libc/machine/riscv/libc_a-stpcpy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/riscv/libc_a-stpcpy.obj `if test -f 'libc/machine/riscv/stpcpy.c'; then $(CYGPATH_W) 'libc/machine/riscv/stpcpy.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/riscv/stpcpy.c'; fi`
+
libc/machine/riscv/libc_a-ieeefp.o: libc/machine/riscv/ieeefp.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machine/riscv/libc_a-ieeefp.o -MD -MP -MF libc/machine/riscv/$(DEPDIR)/libc_a-ieeefp.Tpo -c -o libc/machine/riscv/libc_a-ieeefp.o `test -f 'libc/machine/riscv/ieeefp.c' || echo '$(srcdir)/'`libc/machine/riscv/ieeefp.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libc/machine/riscv/$(DEPDIR)/libc_a-ieeefp.Tpo libc/machine/riscv/$(DEPDIR)/libc_a-ieeefp.Po
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 0cba166..5ce5387 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -370,7 +370,7 @@ struct _misc_reent
_mbstate_t _wcrtomb_state;
_mbstate_t _wcsrtombs_state;
#ifdef _MB_CAPABLE
- char _getlocalename_l_buf[32 /*ENCODING + 1*/];
+ char _getlocalename_l_buf[7 /* _LC_LAST */ * 32 /*ENCODING + 1*/];
#endif
};
@@ -570,7 +570,9 @@ struct _reent
#define _REENT_WCSRTOMBS_STATE(ptr) ((ptr)->_misc->_wcsrtombs_state)
#define _REENT_L64A_BUF(ptr) ((ptr)->_misc->_l64a_buf)
#define _REENT_GETDATE_ERR_P(ptr) (&((ptr)->_misc->_getdate_err))
+#ifdef _MB_CAPABLE
#define _REENT_GETLOCALENAME_L_BUF(ptr) ((ptr)->_misc->_getlocalename_l_buf)
+#endif
#define _REENT_SIGNAL_BUF(ptr) ((ptr)->_signal_buf)
#else /* !_REENT_SMALL */
@@ -641,10 +643,13 @@ struct _reent
_mbstate_t _mbrtoc16_state;
_mbstate_t _mbrtoc32_state;
#endif
+#ifdef _MB_CAPABLE
/* No errors are defined for getlocalename_l. So we can't use
buffer allocation which might lead to an ENOMEM error. We
have to use a "static" buffer here instead. */
- char _getlocalename_l_buf[32 /* ENCODING_LEN + 1 */];
+ char _getlocalename_l_buf[7 /* _LC_LAST */
+ * 32 /* ENCODING_LEN + 1 */];
+#endif
} _reent;
#ifdef _REENT_BACKWARD_BINARY_COMPAT
struct
@@ -764,7 +769,9 @@ struct _reent
#define _REENT_L64A_BUF(ptr) ((ptr)->_new._reent._l64a_buf)
#define _REENT_SIGNAL_BUF(ptr) ((ptr)->_new._reent._signal_buf)
#define _REENT_GETDATE_ERR_P(ptr) (&((ptr)->_new._reent._getdate_err))
+#ifdef _MB_CAPABLE
#define _REENT_GETLOCALENAME_L_BUF(ptr)((ptr)->_new._reent._getlocalename_l_buf)
+#endif
#endif /* !_REENT_SMALL */
diff --git a/newlib/libc/locale/getlocalename_l.c b/newlib/libc/locale/getlocalename_l.c
index 7060c8d..1f18f82 100644
--- a/newlib/libc/locale/getlocalename_l.c
+++ b/newlib/libc/locale/getlocalename_l.c
@@ -44,7 +44,7 @@ shall remain valid until the locale object locobj is used in a call to
No errors are defined.
PORTABILITY
-<<getlocalename_l>> is POSIX-1.2008 since Base Specification Issue 8
+<<getlocalename_l>> is POSIX-1.2024
*/
#include <newlib.h>
@@ -53,18 +53,25 @@ PORTABILITY
const char *
_getlocalename_l_r (struct _reent *ptr, int category, struct __locale_t *locobj)
{
- if (category <= LC_ALL || category > LC_MESSAGES)
+ if (category < LC_ALL || category > LC_MESSAGES)
return NULL;
#ifndef _MB_CAPABLE
return "C";
#else
+ if (category == LC_ALL)
+ {
+ if (locobj == LC_GLOBAL_LOCALE)
+ return __currentlocale (__get_global_locale (),
+ _REENT_GETLOCALENAME_L_BUF (ptr));
+ return __currentlocale (locobj, locobj->locale_string);
+ }
if (locobj == LC_GLOBAL_LOCALE)
{
/* getlocalename_l is supposed to return the value in a
thread-safe manner. This requires to copy over the
category string into thread-local storage. */
- strcpy (_REENT_GETLOCALENAME_L_BUF (ptr),
- __get_global_locale ()->categories[category]);
+ return strcpy (_REENT_GETLOCALENAME_L_BUF (ptr),
+ __get_global_locale ()->categories[category]);
}
return locobj->categories[category];
#endif
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index b16ec15..9e950a5 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -199,6 +199,7 @@ static char *categories[_LC_LAST] = {
*/
#ifndef DEFAULT_LOCALE
#define DEFAULT_LOCALE "C"
+#define DEFAULT_LOCALE_IS_C
#endif
#ifdef _MB_CAPABLE
@@ -211,6 +212,9 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
const struct __locale_t __C_locale =
{
{ "C", "C", "C", "C", "C", "C", "C", },
+#ifdef _MB_CAPABLE
+ "C",
+#endif
__ascii_wctomb,
__ascii_mbtowc,
0,
@@ -247,6 +251,13 @@ const struct __locale_t __C_locale =
struct __locale_t __global_locale =
{
{ "C", "C", DEFAULT_LOCALE, "C", "C", "C", "C", },
+#ifdef _MB_CAPABLE
+# ifdef DEFAULT_LOCALE_IS_C
+ "C",
+# else
+ "C/" DEFAULT_LOCALE "/C/C/C/C",
+# endif
+#endif
#ifdef __CYGWIN__
__utf8_wctomb,
__utf8_mbtowc,
@@ -285,16 +296,6 @@ struct __locale_t __global_locale =
#endif /* __HAVE_LOCALE_INFO__ */
};
-#ifdef _MB_CAPABLE
-/* Renamed from current_locale_string to make clear this is only the
- *global* string for setlocale (LC_ALL, NULL). There's no equivalent
- functionality for uselocale. */
-static char global_locale_string[_LC_LAST * (ENCODING_LEN + 1/*"/"*/ + 1)]
- = "C";
-static char *currentlocale (void);
-
-#endif /* _MB_CAPABLE */
-
char *
_setlocale_r (struct _reent *p,
int category,
@@ -323,7 +324,7 @@ _setlocale_r (struct _reent *p,
if (locale == NULL)
return category != LC_ALL ? __get_global_locale ()->categories[category]
- : global_locale_string;
+ : __get_global_locale ()->locale_string;
/*
* Default to the current locale for everything.
@@ -420,7 +421,8 @@ _setlocale_r (struct _reent *p,
{
ret = __loadlocale (__get_global_locale (), category,
new_categories[category]);
- currentlocale ();
+ __currentlocale (__get_global_locale (),
+ __get_global_locale ()->locale_string);
return ret;
}
@@ -444,31 +446,31 @@ _setlocale_r (struct _reent *p,
return NULL;
}
}
- return currentlocale ();
+ return __currentlocale (__get_global_locale (),
+ __get_global_locale ()->locale_string);
#endif /* _MB_CAPABLE */
}
#ifdef _MB_CAPABLE
-static char *
-currentlocale ()
+char *
+__currentlocale (struct __locale_t *locobj, char *locale_string)
{
int i;
- strcpy (global_locale_string, __get_global_locale ()->categories[1]);
+ strcpy (locale_string, locobj->categories[1]);
for (i = 2; i < _LC_LAST; ++i)
- if (strcmp (__get_global_locale ()->categories[1],
- __get_global_locale ()->categories[i]))
+ if (strcmp (locobj->categories[1],
+ locobj->categories[i]))
{
for (i = 2; i < _LC_LAST; ++i)
{
- (void)strcat(global_locale_string, "/");
- (void)strcat(global_locale_string,
- __get_global_locale ()->categories[i]);
+ (void)strcat(locale_string, "/");
+ (void)strcat(locale_string, locobj->categories[i]);
}
break;
}
- return global_locale_string;
+ return locale_string;
}
extern void __set_ctype (struct __locale_t *, const char *charset);
diff --git a/newlib/libc/locale/setlocale.h b/newlib/libc/locale/setlocale.h
index e91034a..572b198 100644
--- a/newlib/libc/locale/setlocale.h
+++ b/newlib/libc/locale/setlocale.h
@@ -183,6 +183,10 @@ struct __lc_cats
struct __locale_t
{
char categories[_LC_LAST][ENCODING_LEN + 1];
+#ifdef _MB_CAPABLE
+ char locale_string[_LC_LAST
+ * (ENCODING_LEN + 1/*"/"*/ + 1)];
+#endif
int (*wctomb) (struct _reent *, char *, wchar_t,
mbstate_t *);
int (*mbtowc) (struct _reent *, wchar_t *,
@@ -200,6 +204,7 @@ struct __locale_t
};
#ifdef _MB_CAPABLE
+char *__currentlocale (struct __locale_t *, char *);
extern char *__loadlocale (struct __locale_t *, int, char *);
extern const char *__get_locale_env(struct _reent *, int);
#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/machine/riscv/sys/string.h b/newlib/libc/machine/riscv/rv_string.h
index b65635c..362f66a 100644
--- a/newlib/libc/machine/riscv/sys/string.h
+++ b/newlib/libc/machine/riscv/rv_string.h
@@ -9,11 +9,11 @@
http://www.opensource.org/licenses.
*/
-#ifndef _SYS_STRING_H
-#define _SYS_STRING_H
+#ifndef _RV_STRING_H
+#define _RV_STRING_H
#include <stdbool.h>
-#include "asm.h"
+#include "xlenint.h"
#if __riscv_zbb
#include <riscv_bitmanip.h>
@@ -121,4 +121,4 @@ static __inline char *__libc_strcpy(char *dst, const char *src, bool ret_start)
}
-#endif
+#endif /* _RV_STRING_H */
diff --git a/newlib/libc/machine/riscv/stpcpy.c b/newlib/libc/machine/riscv/stpcpy.c
index 9243457..14c3222 100644
--- a/newlib/libc/machine/riscv/stpcpy.c
+++ b/newlib/libc/machine/riscv/stpcpy.c
@@ -1,5 +1,5 @@
-#include <string.h>
#include <stdbool.h>
+#include "rv_string.h"
char *stpcpy(char *dst, const char *src)
{
diff --git a/newlib/libc/machine/riscv/strcmp.S b/newlib/libc/machine/riscv/strcmp.S
index 12c39db..cc29b7b 100644
--- a/newlib/libc/machine/riscv/strcmp.S
+++ b/newlib/libc/machine/riscv/strcmp.S
@@ -188,9 +188,16 @@ strcmp:
foundnull 1 3
foundnull 2 3
#endif
+#ifdef __riscv_cmodel_large
+ # Put the data within the funciton for large code model to prevent
+ # the data put too far.
+.align 3
+mask:
+.dword 0x7f7f7f7f7f7f7f7f
+#endif
.size strcmp, .-strcmp
-#if SZREG == 8
+#if SZREG == 8 && !defined(__riscv_cmodel_large)
.section .srodata.cst8,"aM",@progbits,8
.align 3
mask:
diff --git a/newlib/libc/machine/riscv/strcpy.c b/newlib/libc/machine/riscv/strcpy.c
index f770493..a05ec1c 100644
--- a/newlib/libc/machine/riscv/strcpy.c
+++ b/newlib/libc/machine/riscv/strcpy.c
@@ -9,8 +9,8 @@
http://www.opensource.org/licenses.
*/
-#include <string.h>
#include <stdbool.h>
+#include "rv_string.h"
char *strcpy(char *dst, const char *src)
{
diff --git a/newlib/libc/machine/riscv/strlen.c b/newlib/libc/machine/riscv/strlen.c
index 7e5d416..9bfd2a1 100644
--- a/newlib/libc/machine/riscv/strlen.c
+++ b/newlib/libc/machine/riscv/strlen.c
@@ -11,7 +11,7 @@
#include <string.h>
#include <stdint.h>
-#include "sys/asm.h"
+#include "rv_string.h"
size_t strlen(const char *str)
{
diff --git a/newlib/libc/machine/riscv/sys/asm.h b/newlib/libc/machine/riscv/sys/asm.h
index 0a354b2..8c8aeb3 100644
--- a/newlib/libc/machine/riscv/sys/asm.h
+++ b/newlib/libc/machine/riscv/sys/asm.h
@@ -12,8 +12,6 @@
#ifndef _SYS_ASM_H
#define _SYS_ASM_H
-#include <stdint.h>
-
/*
* Macros to handle different pointer/register sizes for 32/64-bit code
*/
@@ -22,13 +20,11 @@
# define SZREG 8
# define REG_S sd
# define REG_L ld
-typedef uint64_t uintxlen_t;
#elif __riscv_xlen == 32
# define PTRLOG 2
# define SZREG 4
# define REG_S sw
# define REG_L lw
-typedef uint32_t uintxlen_t;
#else
# error __riscv_xlen must equal 32 or 64
#endif
diff --git a/newlib/libc/machine/riscv/xlenint.h b/newlib/libc/machine/riscv/xlenint.h
new file mode 100644
index 0000000..86363a8
--- /dev/null
+++ b/newlib/libc/machine/riscv/xlenint.h
@@ -0,0 +1,14 @@
+#ifndef _XLENINT_H
+#define _XLENINT_H
+
+#include <stdint.h>
+
+#if __riscv_xlen == 64
+typedef uint64_t uintxlen_t;
+#elif __riscv_xlen == 32
+typedef uint32_t uintxlen_t;
+#else
+# error __riscv_xlen must equal 32 or 64
+#endif
+
+#endif /* _XLENINT_H */
diff --git a/newlib/libm/machine/amdgcn/amdgcn_veclib.h b/newlib/libm/machine/amdgcn/amdgcn_veclib.h
index bd67740..9e9d3eb 100644
--- a/newlib/libm/machine/amdgcn/amdgcn_veclib.h
+++ b/newlib/libm/machine/amdgcn/amdgcn_veclib.h
@@ -85,8 +85,21 @@ typedef union {
#define RESIZE_VECTOR(to_t, from) \
({ \
- __auto_type __from = (from); \
- *((to_t *) &__from); \
+ to_t __to; \
+ if (VECTOR_WIDTH (to_t) < VECTOR_WIDTH (__typeof (from))) \
+ asm ("; no-op cast %0" : "=v"(__to) : "0"(from)); \
+ else \
+ { \
+ unsigned long __mask = -1L; \
+ int lanes = VECTOR_WIDTH (__typeof (from)); \
+ __mask <<= lanes; \
+ __builtin_choose_expr ( \
+ V_SF_SI_P (to_t), \
+ ({asm ("v_mov_b32 %0, 0" : "=v"(__to) : "0"(from), "e"(__mask));}), \
+ ({asm ("v_mov_b32 %H0, 0\n\t" \
+ "v_mov_b32 %L0, 0" : "=v"(__to) : "0"(from), "e"(__mask));})); \
+ } \
+ __to; \
})
/* Bit-wise cast vector FROM to type TO_T. */
generated by cgit v1.1 at 2025-04-05 09:31:02 +0000