diff --git a/breakpad.sh b/breakpad.sh
index 31df9b2..a9d1e28 100755
--- a/breakpad.sh
+++ b/breakpad.sh
@@ -8,7 +8,7 @@ fi
 cd breakpad
 
 if [ ! -d "depot_tools" ]; then
-  git clone --depth=1 --branch=master https://chromium.googlesource.com/chromium/tools/depot_tools.git depot_tools
+  git clone --depth=1 --branch=main https://chromium.googlesource.com/chromium/tools/depot_tools.git depot_tools
 fi
 
 if [ ! -d "src" ]; then
@@ -31,7 +31,7 @@ fi
 
 cd build
 
-../src/configure --enable-m32 CXXFLAGS="-g -O2 -D_GLIBCXX_USE_CXX11_ABI=0"
+../src/configure --enable-m32 CFLAGS="-Wno-error=deprecated" CXXFLAGS="-Wno-error=deprecated -g -O2 -D_GLIBCXX_USE_CXX11_ABI=0" CPPFLAGS=-m32
 
 make src/tools/linux/dump_syms/dump_syms
 make src/client/linux/libbreakpad_client.a
diff --git a/extension/AMBuilder b/extension/AMBuilder
index bca0acb..09ceefe 100644
--- a/extension/AMBuilder
+++ b/extension/AMBuilder
@@ -56,6 +56,7 @@ def BuildEverything():
 			'linux/crc32.cc',
 			'linux/dump_symbols.cc',
 			'linux/elf_symbols_to_module.cc',
+			'linux/breakpad_getcontext.S',
 		])
 
 	if AMBuild.target['platform'] in ['linux']:
diff --git a/extension/extension.cpp b/extension/extension.cpp
index f46ea62..8adbccd 100644
--- a/extension/extension.cpp
+++ b/extension/extension.cpp
@@ -562,12 +562,12 @@ class UploadThread: public IThread
 		{
 			StderrInhibitor stdrrInhibitor;
 
-			if (!WriteSymbolFile(debugFile, debug_dirs, options, outputStream)) {
+			if (!WriteSymbolFile(debugFileDir, debugFile, "Linux", debug_dirs, options, outputStream)) {
 				outputStream.str("");
 				outputStream.clear();
 
 				// Try again without debug dirs.
-				if (!WriteSymbolFile(debugFile, {}, options, outputStream)) {
+				if (!WriteSymbolFile(debugFileDir, debugFile, "Linux", {}, options, outputStream)) {
 					if (log) fprintf(log, "Failed to process symbol file\n");
 					return false;
 				}
diff --git a/test/AMBuilder b/test/AMBuilder
index 4147c6d..0e7d8ad 100644
--- a/test/AMBuilder
+++ b/test/AMBuilder
@@ -50,6 +50,7 @@ def BuildEverything():
 			'linux/crc32.cc',
 			'linux/dump_symbols.cc',
 			'linux/elf_symbols_to_module.cc',
+			'linux/breakpad_getcontext.S',
 		])
 
 	if AMBuild.target['platform'] in ['linux']:
diff --git a/test/test.cpp b/test/test.cpp
index 1a3ef1e..613bf94 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -294,12 +294,12 @@ int main(int argc, char *argv[])
 			{
 				StderrInhibitor stdrrInhibitor;
 
-				if (!WriteSymbolFile(debugFile, debug_dirs, options, outputStream)) {
+				if (!WriteSymbolFile(debugFileDir, debugFile, "Linux", debug_dirs, options, outputStream)) {
 					outputStream.str("");
 					outputStream.clear();
 
 					// Try again without debug dirs.
-					if (!WriteSymbolFile(debugFile, {}, options, outputStream)) {
+					if (!WriteSymbolFile(debugFileDir, debugFile, "Linux", {}, options, outputStream)) {
 						// TODO: Something.
 						continue;
 					}