diff options
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/call.s | 16 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/call.s | 19 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 1 |
5 files changed, 51 insertions, 0 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/call.s b/bridges/source/cpp_uno/gcc3_linux_intel/call.s index 6be583247733..0a5870defcf3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/call.s +++ b/bridges/source/cpp_uno/gcc3_linux_intel/call.s @@ -290,3 +290,19 @@ privateSnippetExecutorClass: .align 4 .LEFDEc: .section .note.GNU-stack,"",@progbits + .section .note.gnu.property,"a" + .p2align 2 + .long 1f - 0f + .long 4f - 1f + .long 5 +0: + .string "GNU" +1: + .p2align 2 + .long 0xc0000002 + .long 3f - 2f +2: + .long 0x3 +3: + .p2align 2 +4: diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s index 53bfea8b254f..e7ff106244a8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s @@ -22,6 +22,9 @@ .type privateSnippetExecutor, @function privateSnippetExecutor: .LFB3: +#if defined(END_BRANCH_INS_SUPPORT) + endbr64 +#endif pushq %rbp .LCFI0: movq %rsp, %rbp @@ -121,3 +124,19 @@ privateSnippetExecutor: .align 8 .LEFDE1: .section .note.GNU-stack,"",@progbits + .section .note.gnu.property,"a" + .p2align 3 + .long 1f - 0f + .long 4f - 1f + .long 5 +0: + .string "GNU" +1: + .p2align 3 + .long 0xc0000002 + .long 3f - 2f +2: + .long 0x3 +3: + .p2align 3 +4: diff --git a/config_host.mk.in b/config_host.mk.in index f787994bd840..8b4f723399ab 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -266,6 +266,7 @@ export GTK4_CFLAGS=$(gb_SPACE)@GTK4_CFLAGS@ export GTK4_LIBS=$(gb_SPACE)@GTK4_LIBS@ export USING_X11=@USING_X11@ export HAMCREST_JAR=@HAMCREST_JAR@ +export HAVE_ASM_END_BRANCH_INS_SUPPORT=@HAVE_ASM_END_BRANCH_INS_SUPPORT@ export HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@ export HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=@HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW@ export HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@ diff --git a/configure.ac b/configure.ac index 9ef7dbe9c7b6..0d3dec0eeaf1 100644 --- a/configure.ac +++ b/configure.ac @@ -8040,6 +8040,20 @@ _ACEOF CPPFLAGS="$save_CPPFLAGS" + AC_MSG_CHECKING([if CET endbranch is recognized]) +cat > endbr.s <<_ACEOF +endbr32 +_ACEOF + HAVE_ASM_END_BRANCH_INS_SUPPORT= + if $CXX -c endbr.s -o endbr.o >/dev/null 2>&5; then + AC_MSG_RESULT([yes]) + HAVE_ASM_END_BRANCH_INS_SUPPORT=TRUE + else + AC_MSG_RESULT([no]) + fi + rm -f endbr.s endbr.o + AC_SUBST(HAVE_ASM_END_BRANCH_INS_SUPPORT) + AC_LANG_POP([C++]) fi diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 74f744658e15..d34464030d5e 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -44,6 +44,7 @@ $(call gb_Helper_abbreviate_dirs,\ -x assembler-with-cpp \ $(T_LTOFLAGS) \ $(gb_AFLAGS) \ + $(if $(HAVE_ASM_END_BRANCH_INS_SUPPORT),-DEND_BRANCH_INS_SUPPORT) \ -c $(3) \ -o $(1)) \ $(INCLUDE) && \ |