309f195119
- Update to 0.27.0 * Vulkan Renderer * Multiplayer Savegames * Tips & Tricks Page * Naval Overhaul * Observer Flares * New random maps: Foothills, Migration, Coast Range * New skirmish map: Isthmus of Corint * Updated skirmish maps: Watering Holes, Sporades Islands * New and updated art - Remove obsolete patches: * avoid_duplicate_global_symbol_from_asm.patch * no-version-check.patch * PrepareZoneForGC.patch * premake-no-automatic-rpath.patch * fix-gcc13-build.patch * fix-fmt10-build.patch * fix-boost-1.85-build.patch - Add patch (as source as it is appliad via premake build script) * premake-disable-rpath.patch (replaces premake-no-automatic-rpath.patch) OBS-URL: https://build.opensuse.org/request/show/1245851 OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=142
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
From 6872cc5f672da6fce5facebf697415208fe34b12 Mon Sep 17 00:00:00 2001
|
|
From: StefanBruens <stefan.bruens@rwth-aachen.de>
|
|
Date: Fri, 1 Nov 2019 21:07:33 +0100
|
|
Subject: [PATCH] Use local label in inline asm, avoid symbol duplication
|
|
|
|
The global label "unsupported" may lead to duplicated symbols
|
|
when the function is inlined in multiple places. This may happen
|
|
in any case, but using LTO exposes this problem reliably.
|
|
|
|
See https://github.com/ARMmbed/mbed-crypto/issues/312
|
|
---
|
|
build/premake/premake5/contrib/mbedtls/library/padlock.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/build/premake/premake5/contrib/mbedtls/library/padlock.c b/build/premake/premake5/contrib/mbedtls/library/padlock.c
|
|
index b85ff9cd2c..bb0a1ef419 100644
|
|
--- a/build/premake/premake5/contrib/mbedtls/library/padlock.c
|
|
+++ b/build/premake/premake5/contrib/mbedtls/library/padlock.c
|
|
@@ -58,10 +58,10 @@ int mbedtls_padlock_has_support( int feature )
|
|
"cpuid \n\t"
|
|
"cmpl $0xC0000001, %%eax \n\t"
|
|
"movl $0, %%edx \n\t"
|
|
- "jb unsupported \n\t"
|
|
+ "jb 1f \n\t"
|
|
"movl $0xC0000001, %%eax \n\t"
|
|
"cpuid \n\t"
|
|
- "unsupported: \n\t"
|
|
+ "1: \n\t"
|
|
"movl %%edx, %1 \n\t"
|
|
"movl %2, %%ebx \n\t"
|
|
: "=m" (ebx), "=m" (edx)
|