Merged main:1d0f40ba05b7 into amd-gfx:edac555a5f87

SC llvm team · SC llvm team · commit ba1f05bbae53 · 2024-12-31T20:48:58.000-05:00
Local branch amd-gfx edac555 Merged main:3026ecaff54b into amd-gfx:116ca8f0b966 Remote branch main 1d0f40b [libc] fix generic __stack_check_fail for fuchsia (llvm#121401)
diff --git a/libc/src/compiler/generic/__stack_chk_fail.cpp b/libc/src/compiler/generic/__stack_chk_fail.cpp
@@ -9,6 +9,7 @@
 #include "src/compiler/__stack_chk_fail.h"
 #include "src/__support/OSUtil/io.h"
 #include "src/stdlib/abort.h"
+#include <stdint.h> // For uintptr_t
 
 extern "C" {
 
diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake
@@ -16,7 +16,7 @@
 
 /* Indicate that this is LLVM compiled from the amd-gfx branch. */
 #define LLVM_HAVE_BRANCH_AMD_GFX
-#define LLVM_MAIN_REVISION 522561
+#define LLVM_MAIN_REVISION 522562
 
 /* Define if LLVM_ENABLE_DUMP is enabled */
 #cmakedefine LLVM_ENABLE_DUMP
