From e9adb63dafeac5e878c7a0af6a26812e8e20c96f Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <contact@guillaume-gomez.fr>
Date: Fri, 31 Jul 2026 17:39:49 +0200
Subject: [PATCH 1/3] Update GCC version

---
 libgccjit.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libgccjit.version b/libgccjit.version
index de698d236f2..37af6404836 100644
--- a/libgccjit.version
+++ b/libgccjit.version
@@ -1 +1 @@
-b794cb99508e7eccd40fa42bb310d5781e09899b
+f4e8afdf96ef77e2cb2cb07db370379b7f5c4f6f

From cd9781b7156fbd971dab3fe13afabf1552239d88 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <contact@guillaume-gomez.fr>
Date: Fri, 31 Jul 2026 17:47:32 +0200
Subject: [PATCH 2/3] Update `gccjit` version to `4.0.0`

---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 292f1c43670..060509e51a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -56,18 +56,18 @@ dependencies = [
 
 [[package]]
 name = "gccjit"
-version = "3.7.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37885008422371f81d654ddfbf9b8ab3c5e1b0b54146bf5ff4b74ae91812e8ba"
+checksum = "be5dafc4e649cb4a363e95a5960ef50b0c6f1b8e136ff8eb2e928b40353b5d8b"
 dependencies = [
  "gccjit_sys",
 ]
 
 [[package]]
 name = "gccjit_sys"
-version = "1.7.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e00d0323f55a3b71b302620571d44cd45fd05b4eb6bba6dd7f716095b8ab8cf"
+checksum = "ab6a00a243aba2a45442bfd72b28d871137d4dac094f13de7f48cf9705112ffe"
 dependencies = [
  "libc",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 1cc0db7896a..63a20d46b9d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ default = ["master"]
 [dependencies]
 object = { version = "0.37.0", default-features = false, features = ["std", "read"] }
 tempfile = "3.20"
-gccjit = { version = "3.7.0", features = ["dlopen"] }
+gccjit = { version = "4.0.0", features = ["dlopen"] }
 #gccjit = { git = "https://github.com/rust-lang/gccjit.rs", branch = "error-dlopen", features = ["dlopen"] }
 
 # Local copy.

From d3f4209d8c31ca453eef0e114bc6eb03763042ae Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <contact@guillaume-gomez.fr>
Date: Fri, 31 Jul 2026 17:47:40 +0200
Subject: [PATCH 3/3] Update code to new `gccjit` version

---
 src/intrinsic/llvm.rs | 10 ++++++----
 src/type_.rs          |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/intrinsic/llvm.rs b/src/intrinsic/llvm.rs
index bdd5a71533a..6ad19d5af09 100644
--- a/src/intrinsic/llvm.rs
+++ b/src/intrinsic/llvm.rs
@@ -1,5 +1,7 @@
 use std::borrow::Cow;
 
+#[cfg(feature = "master")]
+use gccjit::TypeAttribute;
 use gccjit::{CType, Context, Field, Function, FunctionPtrType, RValue, ToRValue, Type};
 use rustc_codegen_ssa::traits::BuilderMethods;
 
@@ -23,7 +25,7 @@ fn encode_key_128_type<'a, 'gcc, 'tcx>(
         &[field1, field2, field3, field4, field5, field6, field7],
     );
     #[cfg(feature = "master")]
-    encode_type.as_type().set_packed();
+    encode_type.as_type().add_attribute(TypeAttribute::Packed);
     (encode_type.as_type(), field1, field2)
 }
 
@@ -45,7 +47,7 @@ fn encode_key_256_type<'a, 'gcc, 'tcx>(
         &[field1, field2, field3, field4, field5, field6, field7, field8],
     );
     #[cfg(feature = "master")]
-    encode_type.as_type().set_packed();
+    encode_type.as_type().add_attribute(TypeAttribute::Packed);
     (encode_type.as_type(), field1, field2)
 }
 
@@ -58,7 +60,7 @@ fn aes_output_type<'a, 'gcc, 'tcx>(
     let aes_output_type = builder.context.new_struct_type(None, "AesOutput", &[field1, field2]);
     let typ = aes_output_type.as_type();
     #[cfg(feature = "master")]
-    typ.set_packed();
+    typ.add_attribute(TypeAttribute::Packed);
     (typ, field1, field2)
 }
 
@@ -81,7 +83,7 @@ fn wide_aes_output_type<'a, 'gcc, 'tcx>(
         &[field1, field2, field3, field4, field5, field6, field7, field8, field9],
     );
     #[cfg(feature = "master")]
-    aes_output_type.as_type().set_packed();
+    aes_output_type.as_type().add_attribute(TypeAttribute::Packed);
     (aes_output_type.as_type(), field1, field2)
 }
 
diff --git a/src/type_.rs b/src/type_.rs
index 514bcbe3bff..f008be67e39 100644
--- a/src/type_.rs
+++ b/src/type_.rs
@@ -2,7 +2,7 @@
 use std::convert::TryInto;
 
 #[cfg(feature = "master")]
-use gccjit::CType;
+use gccjit::{CType, TypeAttribute};
 use gccjit::{RValue, Struct, Type};
 use rustc_abi::{AddressSpace, Align, Integer, Size};
 use rustc_codegen_ssa::common::TypeKind;
@@ -116,7 +116,7 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
         let typ = self.context.new_struct_type(None, "struct", &fields).as_type();
         if packed {
             #[cfg(feature = "master")]
-            typ.set_packed();
+            typ.add_attribute(TypeAttribute::Packed);
         }
         self.struct_types.borrow_mut().insert(types, typ);
         typ
@@ -333,7 +333,7 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
         typ.set_fields(None, &fields);
         if packed {
             #[cfg(feature = "master")]
-            typ.as_type().set_packed();
+            typ.as_type().add_attribute(TypeAttribute::Packed);
         }
     }