[Scummvm-git-logs] scummvm master -> f316caa3096043c6c166389ec6279c42e09f32b2

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1c922e6e77 CONFIGURE: Don't use DWARF in nasm when linking using gold
f316caa309 ANDROID: Define dwp binary like others


Commit: 1c922e6e77740e3cf05cf79a20ba114b7060fc5c
    https://github.com/scummvm/scummvm/commit/1c922e6e77740e3cf05cf79a20ba114b7060fc5c
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-12-31T20:50:05+01:00

Commit Message:
CONFIGURE: Don't use DWARF in nasm when linking using gold

This raises `internal error in relocate_section, at ../../gold/i386.cc:3683`

Changed paths:
    configure


diff --git a/configure b/configure
index cbd66642f1c..b443aa9ec71 100755
--- a/configure
+++ b/configure
@@ -5618,6 +5618,10 @@ if test "$_have_x86" = yes ; then
 				;;
 				*)
 					append_var NASMFLAGS "-f elf"
+					if $LD $LDFLAGS -Wl,--version | grep 'GNU gold'; then
+						# gold throws an internal error when nasm uses dwarf, force older stabs in this case
+						append_var NASMFLAGS "-F stabs"
+					fi
 				;;
 			esac
 			_nasm=yes


Commit: f316caa3096043c6c166389ec6279c42e09f32b2
    https://github.com/scummvm/scummvm/commit/f316caa3096043c6c166389ec6279c42e09f32b2
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-12-31T20:50:05+01:00

Commit Message:
ANDROID: Define dwp binary like others

Changed paths:
    configure


diff --git a/configure b/configure
index b443aa9ec71..1bb1b25b65c 100755
--- a/configure
+++ b/configure
@@ -1935,6 +1935,7 @@ if test "$_host_os" = android; then
 	# These values can get overriden below by environments variables
 	_ar="$_android_toolchain/bin/$_ar"
 	_as="$_android_toolchain/bin/$_as"
+	_dwp="$_android_toolchain/bin/$_dwp"
 	_ranlib="$_android_toolchain/bin/$_ranlib"
 	_strip="$_android_toolchain/bin/$_strip"
 	if test -z "$STRINGS"; then