[Scummvm-git-logs] scummvm master -> 610cef76cda117ff6728a9f09f8f07d5759b12de

[sev-]

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:
dc7e6a5282 CONFIGURE: Define HAVE_AMD64 when applicable
610cef76cd HPL1: Do not attempt compiling x86/amd64 assembly on other architectures


Commit: dc7e6a5282929ce0a9baa546fdd8d15694a60466
    https://github.com/scummvm/scummvm/commit/dc7e6a5282929ce0a9baa546fdd8d15694a60466
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-23T18:42:52+01:00

Commit Message:
CONFIGURE: Define HAVE_AMD64 when applicable

Changed paths:
    configure


diff --git a/configure b/configure
index 653d0b8ba30..6a7012ca21e 100755
--- a/configure
+++ b/configure
@@ -262,6 +262,7 @@ _has_fseeko64=no
 _endian=unknown
 _need_memalign=yes
 _have_x86=no
+_have_amd64=no
 
 # Add (virtual) features
 add_feature 16bit "16bit color" "_16bit"
@@ -2573,6 +2574,8 @@ case $_host_cpu in
 		;;
 	amd64 | x86_64)
 		echo "x86_64"
+		_have_amd64=yes
+		define_in_config_h_if_yes $_have_amd64 'HAVE_AMD64'
 		;;
 	wasm32)
 		echo "wasm32"


Commit: 610cef76cda117ff6728a9f09f8f07d5759b12de
    https://github.com/scummvm/scummvm/commit/610cef76cda117ff6728a9f09f8f07d5759b12de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-23T18:46:53+01:00

Commit Message:
HPL1: Do not attempt compiling x86/amd64 assembly on other architectures

Changed paths:
    engines/hpl1/engine/libraries/newton/core/dgTypes.cpp


diff --git a/engines/hpl1/engine/libraries/newton/core/dgTypes.cpp b/engines/hpl1/engine/libraries/newton/core/dgTypes.cpp
index 790e2eea1df..2074198a28d 100644
--- a/engines/hpl1/engine/libraries/newton/core/dgTypes.cpp
+++ b/engines/hpl1/engine/libraries/newton/core/dgTypes.cpp
@@ -176,7 +176,7 @@ dgCpuClass dgApi dgGetCpuType() {
 
 }
 
-#else
+#elif defined(HAVE_X86) || defined(HAVE_AMD64)
 /*  #define cpuid(func,ax,bx,cx,dx) __asm__ __volatile__ ("cpuid": "=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) : "a" (func)); */
 
 void cpuid(dgUnsigned32 op, dgUnsigned32 reg[4]) {
@@ -223,6 +223,14 @@ dgCpuClass dgApi dgGetCpuType() {
 
 	return dgNoSimdPresent;
 }
+
+#else // defined(HAVE_X86) || defined(HAVE_AMD64)
+
+dgCpuClass dgApi dgGetCpuType() {
+	return dgNoSimdPresent;
+}
+
+
 #endif
 
 static inline dgInt32 cmp_vertex(const dgFloat64 *const v1,