Merge commit '1a9974d08bc1478a98f52b2ea95475a583747724' into HEAD [#2912]

4 files changed, 65 insertions, 6 deletions

diff --git a/gcc/rust/ChangeLog b/gcc/rust/ChangeLog
index 25b8ddf..6c88612 100644
--- a/gcc/rust/ChangeLog
+++ b/gcc/rust/ChangeLog
@@ -1,3 +1,63 @@
+2023-09-28  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* backend/rust-constexpr.cc (rs_fold_indirect_ref): Remove unused
+	variables.
+
+2023-09-21  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* rust-session-manager.cc (Session::init): Call
+	targetrustm.rust_os_info.
+	* rust-target.def (rust_os_info): New hook.
+
+2023-09-21  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* rust-lang.cc (rust_add_target_info): Remove sorry.
+	* rust-session-manager.cc: Replace include of target.h with
+	include of tm.h and rust-target.h.
+	(Session::init): Call targetrustm.rust_cpu_info.
+	* rust-target.def (rust_cpu_info): New hook.
+	* rust-target.h (rust_add_target_info): Declare.
+
+2023-09-21  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* rust-target-def.h: New file.
+	* rust-target.def: New file.
+	* rust-target.h: New file.
+
+2023-09-11  Parthib  <94271200+Parthib314@users.noreply.github.com>
+
+	* Make-lang.in: Removed rust-gcc-diagnostics object file.
+	* rust-diagnostics.cc (rust_be_get_quotechars): Added from original file.
+		(rust_be_internal_error_at): Likewise.
+		(rust_be_error_at): Likewise.
+		(class rust_error_code_rule): Likewise.
+		(rust_be_warning_at): Likewise.
+		(rust_be_fatal_error): Likewise.
+		(rust_be_inform): Likewise.
+		(rust_be_debug_p): Likewise.
+	* rust-gcc-diagnostics.cc: Removed.
+
+2023-09-07  David Malcolm  <dmalcolm@redhat.com>
+
+	* rust-diagnostics.cc (rust_error_at): New overload.
+	* rust-diagnostics.h (struct ErrorCode): New struct.
+	(rust_error_at): New.
+	(rust_be_error_at): Likewise.
+	* rust-gcc-diagnostics.cc (class rust_error_code_rule): New class.
+	(rust_be_error_at): New function.
+	* typecheck/rust-casts.cc (TypeCastRules::emit_cast_error): Emit E0054
+	when reporting invalid cast error.
+
+2023-07-05  Robin Dapp  <rdapp@ventanamicro.com>
+	    Juzhe-Zhong  <juzhe.zhong@rivai.ai>
+
+	* backend/rust-tree.cc (c_common_type_for_mode): Ditto.
+
+2023-06-22  Paul E. Murphy  <murphyp@linux.ibm.com>
+
+	* rust-object-export.cc [TARGET_AIX]: Rename and update usage to
+	TARGET_AIX_OS.
+
 2023-04-06  Owen Avery  <powerboat9.gamer@gmail.com>
 
 	* parse/rust-parse-impl.h
diff --git a/gcc/rust/backend/rust-constexpr.cc b/gcc/rust/backend/rust-constexpr.cc
index 9e19566..55c2ccd 100644
--- a/gcc/rust/backend/rust-constexpr.cc
+++ b/gcc/rust/backend/rust-constexpr.cc
@@ -741,7 +741,6 @@ rs_fold_indirect_ref (const constexpr_ctx *ctx, location_t loc, tree type,
 {
   tree sub = op0;
   tree subtype;
-  poly_uint64 const_op01;
 
   /* STRIP_NOPS, but stop if REINTERPRET_CAST_P.  */
   while (CONVERT_EXPR_P (sub) || TREE_CODE (sub) == NON_LVALUE_EXPR
diff --git a/gcc/rust/backend/rust-tree.cc b/gcc/rust/backend/rust-tree.cc
index 3790465..a2c9c3f 100644
--- a/gcc/rust/backend/rust-tree.cc
+++ b/gcc/rust/backend/rust-tree.cc
@@ -5374,8 +5374,8 @@ c_common_type_for_mode (machine_mode mode, int unsignedp)
   else if (GET_MODE_CLASS (mode) == MODE_VECTOR_BOOL
 	   && valid_vector_subparts_p (GET_MODE_NUNITS (mode)))
     {
-      unsigned int elem_bits
-	= vector_element_size (GET_MODE_BITSIZE (mode), GET_MODE_NUNITS (mode));
+      unsigned int elem_bits = vector_element_size (GET_MODE_PRECISION (mode),
+						    GET_MODE_NUNITS (mode));
       tree bool_type = build_nonstandard_boolean_type (elem_bits);
       return build_vector_type_for_mode (bool_type, mode);
     }
diff --git a/gcc/rust/rust-object-export.cc b/gcc/rust/rust-object-export.cc
index e2d7765..21f66a3 100644
--- a/gcc/rust/rust-object-export.cc
+++ b/gcc/rust/rust-object-export.cc
@@ -45,8 +45,8 @@
 #define RUST_EXPORT_SECTION_NAME ".rust_export"
 #endif
 
-#ifndef TARGET_AIX
-#define TARGET_AIX 0
+#ifndef TARGET_AIX_OS
+#define TARGET_AIX_OS 0
 #endif
 
 /* Return whether or not GCC has reported any errors.  */
@@ -90,7 +90,7 @@ rust_write_export_data (const char *bytes, unsigned int size)
     {
       gcc_assert (targetm_common.have_named_sections);
       sec = get_section (RUST_EXPORT_SECTION_NAME,
-			 TARGET_AIX ? SECTION_EXCLUDE : SECTION_DEBUG, NULL);
+			 TARGET_AIX_OS ? SECTION_EXCLUDE : SECTION_DEBUG, NULL);
     }
 
   switch_to_section (sec);