[gcc/devel/rust/master] Merge commit 'f37c55c14bc1176ef9a15fe584fb6d1bf2e6162f' into HEAD [#1913]

2024-05-07 Thread Thomas Schwinge via Gcc-cvs 
https://gcc.gnu.org/g:f96582527ef42d0a02b68aa956d51c2ed40fb8b6

commit f96582527ef42d0a02b68aa956d51c2ed40fb8b6
Merge: af14cc24cb5f f37c55c14bc1
Author: Thomas Schwinge 
Date:   Fri Mar 22 01:04:40 2024 +0100

Merge commit 'f37c55c14bc1176ef9a15fe584fb6d1bf2e6162f' into HEAD [#1913]

Diff:

 contrib/gcc_update  |   4 +
 libgrust/Makefile.in|   5 +
 libgrust/aclocal.m4 |   3 +
 libgrust/configure  | 193 ++--
 libgrust/configure.ac   |  14 +-
 libgrust/libproc_macro_internal/Makefile.in |   5 +
 6 files changed, 213 insertions(+), 11 deletions(-)

diff --cc libgrust/configure
index 54adb827096e,5388a0e22a6a..b1d4c8f7fc0f
--- a/libgrust/configure
+++ b/libgrust/configure
@@@ -17175,9 -17343,10 +17343,10 @@@ for ac_config_target in $ac_config_targ
  do
case $ac_config_target in
  "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
  "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
  "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
 -"libproc_macro/Makefile") CONFIG_FILES="$CONFIG_FILES 
libproc_macro/Makefile" ;;
 +"libproc_macro_internal/Makefile") CONFIG_FILES="$CONFIG_FILES 
libproc_macro_internal/Makefile" ;;
  
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --cc libgrust/libproc_macro_internal/Makefile.in
index 0eccade78d48,9ff1dd69cc37..68aa46106899
--- a/libgrust/libproc_macro_internal/Makefile.in
+++ b/libgrust/libproc_macro_internal/Makefile.in
@@@ -88,11 -88,14 +88,14 @@@ POST_UNINSTALL = 
  build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
 -subdir = libproc_macro
 +subdir = libproc_macro_internal
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
+   $(top_srcdir)/../config/cet.m4 \
$(top_srcdir)/../config/depstand.m4 \
+   $(top_srcdir)/../config/enable.m4 \
$(top_srcdir)/../config/lead-dot.m4 \
+   $(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../config/override.m4 \
$(top_srcdir)/../config/toolexeclibdir.m4 \

[gcc/devel/rust/master] Merge commit 'f37c55c14bc1176ef9a15fe584fb6d1bf2e6162f^' into HEAD

2024-05-07 Thread Thomas Schwinge via Gcc-cvs 
https://gcc.gnu.org/g:af14cc24cb5f1a3b1a3abd6c289cb33ee8768bb8

commit af14cc24cb5f1a3b1a3abd6c289cb33ee8768bb8
Merge: 77d55deb8bb7 203efd5097b8
Author: Thomas Schwinge 
Date:   Fri Mar 22 00:30:43 2024 +0100

Merge commit 'f37c55c14bc1176ef9a15fe584fb6d1bf2e6162f^' into HEAD

Diff:

 gcc/config/riscv/riscv-vector-builtins-avail.h |  12 -
 .../riscv/riscv-vector-builtins-functions.def  | 949 ++---
 gcc/config/riscv/riscv-vector-builtins.cc  |   6 +-
 gcc/config/riscv/riscv-vector-builtins.h   |  10 -
 gcc/config/riscv/t-riscv   |   1 -
 5 files changed, 475 insertions(+), 503 deletions(-)