Skip to content

Commit f42e612

Browse files
committed
Merge pull request godotengine#102900 from bruvzg/fix_mingw_bt
Fix MinGW crash handler crashing during trace generation or producing empty trace.
2 parents 09dbebf + 961207d commit f42e612

18 files changed

+156
-681
lines changed

thirdparty/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ Patches:
476476
## libbacktrace
477477

478478
- Upstream: https://github.com/ianlancetaylor/libbacktrace
479-
- Version: git (1db85642e3fca189cf4e076f840a45d6934b2456, 2024)
479+
- Version: git (4d2dd0b172f2c9192f83ba93425f868f2a13c553, 2022)
480480
- License: BSD-3-Clause
481481

482482
Files extracted from upstream source:

thirdparty/libbacktrace/alloc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* alloc.c -- Memory allocation without mmap.
2-
Copyright (C) 2012-2024 Free Software Foundation, Inc.
2+
Copyright (C) 2012-2021 Free Software Foundation, Inc.
33
Written by Ian Lance Taylor, Google.
44
55
Redistribution and use in source and binary forms, with or without

thirdparty/libbacktrace/atomic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* atomic.c -- Support for atomic functions if not present.
2-
Copyright (C) 2013-2024 Free Software Foundation, Inc.
2+
Copyright (C) 2013-2021 Free Software Foundation, Inc.
33
Written by Ian Lance Taylor, Google.
44
55
Redistribution and use in source and binary forms, with or without

thirdparty/libbacktrace/backtrace-supported.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* backtrace-supported.h.in -- Whether stack backtrace is supported.
2-
Copyright (C) 2012-2024 Free Software Foundation, Inc.
2+
Copyright (C) 2012-2021 Free Software Foundation, Inc.
33
Written by Ian Lance Taylor, Google.
44
55
Redistribution and use in source and binary forms, with or without

thirdparty/libbacktrace/backtrace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* backtrace.c -- Entry point for stack backtrace library.
2-
Copyright (C) 2012-2024 Free Software Foundation, Inc.
2+
Copyright (C) 2012-2021 Free Software Foundation, Inc.
33
Written by Ian Lance Taylor, Google.
44
55
Redistribution and use in source and binary forms, with or without

thirdparty/libbacktrace/backtrace.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* backtrace.h -- Public header file for stack backtrace library.
2-
Copyright (C) 2012-2024 Free Software Foundation, Inc.
2+
Copyright (C) 2012-2021 Free Software Foundation, Inc.
33
Written by Ian Lance Taylor, Google.
44
55
Redistribution and use in source and binary forms, with or without

thirdparty/libbacktrace/config.h

+1-17
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
don't. */
2222
#define HAVE_DECL_STRNLEN 1
2323

24-
/* Define to 1 if you have the declaration of `_pgmptr', and to 0 if you
25-
don't. */
26-
#define HAVE_DECL__PGMPTR 1
27-
2824
/* Define to 1 if you have the <dlfcn.h> header file. */
2925
/* #undef HAVE_DLFCN_H */
3026

@@ -52,7 +48,7 @@
5248
/* #undef HAVE_KERN_PROC_ARGS */
5349

5450
/* Define if -llzma is available. */
55-
/* #undef HAVE_LIBLZMA */
51+
#define HAVE_LIBLZMA 1
5652

5753
/* Define to 1 if you have the <link.h> header file. */
5854
/* #undef HAVE_LINK_H */
@@ -90,9 +86,6 @@
9086
/* Define to 1 if you have the <sys/ldr.h> header file. */
9187
/* #undef HAVE_SYS_LDR_H */
9288

93-
/* Define to 1 if you have the <sys/link.h> header file. */
94-
/* #undef HAVE_SYS_LINK_H */
95-
9689
/* Define to 1 if you have the <sys/mman.h> header file. */
9790
/* #undef HAVE_SYS_MMAN_H */
9891

@@ -102,21 +95,12 @@
10295
/* Define to 1 if you have the <sys/types.h> header file. */
10396
#define HAVE_SYS_TYPES_H 1
10497

105-
/* Define to 1 if you have the <tlhelp32.h> header file. */
106-
#define HAVE_TLHELP32_H 1
107-
10898
/* Define to 1 if you have the <unistd.h> header file. */
10999
#define HAVE_UNISTD_H 1
110100

111-
/* Define to 1 if you have the <windows.h> header file. */
112-
#define HAVE_WINDOWS_H 1
113-
114101
/* Define if -lz is available. */
115102
#define HAVE_ZLIB 1
116103

117-
/* Define if -lzstd is available. */
118-
/* #undef HAVE_ZSTD */
119-
120104
/* Define to the sub-directory in which libtool stores uninstalled libraries.
121105
*/
122106
#define LT_OBJDIR ".libs/"

0 commit comments

Comments
 (0)