diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:06 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:06 +0000 |
| commit | d9533c342dd90bb3404ecfba87ad3703e038bb6d (patch) | |
| tree | 01cfef67ccc5acb2f347a1af9b2168be816a0afa /include/iprt | |
| parent | Adding debian version 7.0.18-dfsg-2. (diff) | |
| download | virtualbox-d9533c342dd90bb3404ecfba87ad3703e038bb6d.tar.xz virtualbox-d9533c342dd90bb3404ecfba87ad3703e038bb6d.zip | |
Merging upstream version 7.0.20-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include/iprt')
| -rw-r--r-- | include/iprt/asmdefs.mac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/iprt/asmdefs.mac b/include/iprt/asmdefs.mac index 1fd057bb..73d4ccfd 100644 --- a/include/iprt/asmdefs.mac +++ b/include/iprt/asmdefs.mac @@ -1264,7 +1264,11 @@ BEGINPROC_EXPORTED %1, 0 ; %macro RT_NOCRT_BEGINPROC 1 %ifdef RT_WITH_NOCRT_ALIASES + %ifdef IN_RT_STATIC +BEGINPROC RT_NOCRT(%1), 1 ; Do our own IBT_ENDBRxx after aliasing/ + %else BEGINPROC_EXPORTED RT_NOCRT(%1), 1 ; Do our own IBT_ENDBRxx after aliasing/ + %endif %ifdef ASM_FORMAT_ELF ; ELF %ifdef RT_WITH_NOCRT_UNDERSCORE_ALIASES @@ -1285,7 +1289,11 @@ GLOBALNAME %1 %endif IBT_ENDBRxx %else ; !RT_WITH_NOCRT_ALIASES + %ifdef IN_RT_STATIC +BEGINPROC RT_NOCRT(%1), 0 + %else BEGINPROC_EXPORTED RT_NOCRT(%1), 0 + %endif %endif ; !RT_WITH_NOCRT_ALIASES %endmacro ; RT_NOCRT_BEGINPROC |