diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:15 +0000 |
| commit | 62a5715c0af49b62b331c2538025a8ab5ce6c6e5 (patch) | |
| tree | d4ddd30e61ba20eca4a3ba0f63f2e33c8573dfa0 /include/iprt | |
| parent | Releasing progress-linux version 7.0.18-dfsg-2~progress7.99u1. (diff) | |
| download | virtualbox-62a5715c0af49b62b331c2538025a8ab5ce6c6e5.tar.xz virtualbox-62a5715c0af49b62b331c2538025a8ab5ce6c6e5.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 |