update backtrace

brugal · Jun 8, 2022 · 378eb02 · 378eb02
1 parent fd6c371
commit 378eb02
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/FIXME b/FIXME
@@ -2406,7 +2406,14 @@ Q_GetCpFromUtf8  invalid number of bytes specified in utf8 character 255
 * 32-bit windows build:  cl_cgame build error (string format)
 
 * czm*.dm_68 armor/health bug
-* backtrace binutils upgrade
+
+* since 12.5test9 not in 12.5test7
+
+  renderer_opengl1_x86_64.dll crash
+
+  set mme_savedepth 1
+  video avi wav
+
 
 ----
 

diff --git a/Makefile.local b/Makefile.local
@@ -1,4 +1,4 @@
-VERSION=12.5test23
+VERSION=12.5test24
 
 USE_CODEC_VORBIS=1
 USE_FREETYPE=1

diff --git a/backtrace/backtrace.c b/backtrace/backtrace.c
@@ -4,7 +4,7 @@
 
         http://www.codingnow.com
 
-    Copyright (C) 2019-2020, Angelo Cano
+    Copyright (C) 2019-2022, Angelo Cano
 
  	Use, modification and distribution are subject to the "New BSD License"
  	as listed at <url: http://www.opensource.org/licenses/bsd-license.php >.
@@ -23,7 +23,7 @@
  */
 
 #define PACKAGE "wolfcamql-backtrace"
-#define PACKAGE_VERSION "1.4"
+#define PACKAGE_VERSION "1.5"
 
 #include <windows.h>
 #include <imagehlp.h>
@@ -137,14 +137,14 @@ lookup_section(bfd *abfd, asection *sec, void *opaque_data)
 	if (data->func)
 		return;
 
-	if (!(bfd_get_section_flags(abfd, sec) & SEC_ALLOC))
+	if (!(bfd_section_flags(sec) & SEC_ALLOC))
 		return;
 
-	bfd_vma vma = bfd_get_section_vma(abfd, sec);
+	bfd_vma vma = bfd_section_vma(sec);
 
 	counter = data->counter - (data->module_base - data->preferred_base);
 
-	if (counter < vma || vma + bfd_get_section_size(sec) <= counter)
+	if (counter < vma || vma + bfd_section_size(sec) <= counter)
 		return;
 
 	offset = counter - vma;

diff --git a/backtrace/compile-32.sh b/backtrace/compile-32.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-BINUTILS_DIR=`pwd`/build/32/binutils-2.33.1
+BINUTILS_DIR=`pwd`/build/32/binutils-2.38
 
 i686-w64-mingw32-windres -i resource.rc -o build/resource32.o
 

diff --git a/backtrace/compile-64.sh b/backtrace/compile-64.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-BINUTILS_DIR=`pwd`/build/64/binutils-2.33.1
+BINUTILS_DIR=`pwd`/build/64/binutils-2.38
 
 x86_64-w64-mingw32-windres -i resource.rc -o build/resource64.o
 

diff --git a/backtrace/resource.rc b/backtrace/resource.rc
@@ -2,8 +2,8 @@
 
 // DLL version information.
 VS_VERSION_INFO    VERSIONINFO
-FILEVERSION        1,4,0,0
-PRODUCTVERSION     1,4,0,0
+FILEVERSION        1,5,0,0
+PRODUCTVERSION     1,5,0,0
 FILEFLAGSMASK      VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS        VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "wolfcamql"
       VALUE "FileDescription", "wolfcamql backtrace library"
-      VALUE "FileVersion", "1.4.0.0"
+      VALUE "FileVersion", "1.5.0.0"
       VALUE "InternalName", "backtrace.dll"
-      VALUE "LegalCopyright", "(C) 2019-2020 Angelo Cano"
+      VALUE "LegalCopyright", "(C) 2019-2022 Angelo Cano"
       VALUE "OriginalFilename", "backtrace.dll"
       VALUE "ProductName", "wolfcamql backtrace library"
-      VALUE "ProductVersion", "1.4.0.0"
+      VALUE "ProductVersion", "1.5.0.0"
     END
   END
   BLOCK "VarFileInfo"

diff --git a/code/libs/win32/backtrace.dll b/code/libs/win32/backtrace.dll
diff --git a/code/libs/win64/backtrace64.dll b/code/libs/win64/backtrace64.dll
diff --git a/version.txt b/version.txt
@@ -1,4 +1,4 @@
-12.5test23
+12.5test24
 
 * ioquake3 patches
 
@@ -141,6 +141,7 @@
 * update freetype to version 2.12.1
 * check demo file extension for protocol number if it's not set in config strings
 * update libcurl to version 7.83.1
+* update backtrace library
 
 ---------------------------------
 12.4  2020-12-04