git: 25db7bd2fac1 - main - libgcc_s: fix nonsense defines

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=25db7bd2fac18bc6083939a5300d1ae5f0d50b74

commit 25db7bd2fac18bc6083939a5300d1ae5f0d50b74
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-05-17 18:49:24 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-05-17 19:05:36 +0000

    libgcc_s: fix nonsense defines
    
    These symbols are present on amd64 or i386.
    
    Reported by:    kaktus, jhibbits
    Fixes:          98c8caafffb65 libgcc_s: 80-bit long double function are x86-only
---
 lib/libgcc_s/Symbol.map | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map
index 00b0ed789cf1..e8f7e824adaf 100644
--- a/lib/libgcc_s/Symbol.map
+++ b/lib/libgcc_s/Symbol.map
@@ -154,17 +154,17 @@ GCC_3.4.4 {
 GCC_4.0.0 {
 	__divdc3;
 	__divsc3;
-#if defined(__amd64__) && define(__i386__)
+#if defined(__amd64__) || defined(__i386__)
 	__divxc3;
 #endif
 	__muldc3;
 	__mulsc3;
-#if defined(__amd64__) && define(__i386__)
+#if defined(__amd64__) || defined(__i386__)
 	__mulxc3;
 #endif
 	__powidf2;
 	__powisf2;
-#if defined(__amd64__) && define(__i386__)
+#if defined(__amd64__) || defined(__i386__)
 	__powixf2;
 #endif
 };
@@ -172,7 +172,7 @@ GCC_4.0.0 {
 GCC_4.2.0 {
 	__floatundidf;
 	__floatundisf;
-#if defined(__amd64__) && define(__i386__)
+#if defined(__amd64__) || defined(__i386__)
 	__floatundixf;
 #endif
 	_Unwind_GetIPInfo;