* [PATCH 0/2] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
@ 2021-03-23 22:39 H.J. Lu
2021-03-23 22:39 ` [PATCH 1/2] " H.J. Lu
2021-03-23 22:39 ` [PATCH 2/2] " H.J. Lu
0 siblings, 2 replies; 5+ messages in thread
From: H.J. Lu @ 2021-03-23 22:39 UTC (permalink / raw)
To: gcc-patches; +Cc: Jakub Jelinek
Check if host supports multi-byte NOPs before enabling CET on host.
This fixes:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99703
H.J. Lu (2):
GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
config/cet.m4 | 19 +++++++++++--
gcc/configure | 45 +++++++++++++++++++++---------
libbacktrace/configure | 29 +++++++++++++++++++
libcc1/configure | 45 +++++++++++++++++++++---------
libcpp/configure | 29 +++++++++++++++++++
libdecnumber/configure | 29 +++++++++++++++++++
libiberty/configure | 29 +++++++++++++++++++
lto-plugin/configure | 63 +++++++++++++++++++++++++++++++-----------
8 files changed, 243 insertions(+), 45 deletions(-)
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
2021-03-23 22:39 [PATCH 0/2] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs H.J. Lu
@ 2021-03-23 22:39 ` H.J. Lu
2021-05-02 13:27 ` PING^1 " H.J. Lu
2021-03-23 22:39 ` [PATCH 2/2] " H.J. Lu
1 sibling, 1 reply; 5+ messages in thread
From: H.J. Lu @ 2021-03-23 22:39 UTC (permalink / raw)
To: gcc-patches; +Cc: Jakub Jelinek
Check if host supports multi-byte NOPs before enabling CET on host.
config/
PR binutils/27397
* cet.m4 (GCC_CET_HOST_FLAGS): Check if host supports multi-byte
NOPs.
libiberty/
PR binutils/27397
* configure: Regenerated.
---
config/cet.m4 | 19 ++++++++++++++++---
libiberty/configure | 29 +++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/config/cet.m4 b/config/cet.m4
index c67fb4f35b6..7718be1afe8 100644
--- a/config/cet.m4
+++ b/config/cet.m4
@@ -130,6 +130,18 @@ fi
if test x$may_have_cet = xyes; then
if test x$cross_compiling = xno; then
AC_TRY_RUN([
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+ ],
+ [have_multi_byte_nop=yes],
+ [have_multi_byte_nop=no])
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ AC_TRY_RUN([
static void
foo (void)
{
@@ -155,9 +167,10 @@ main ()
bar ();
return 0;
}
- ],
- [have_cet=no],
- [have_cet=yes])
+ ],
+ [have_cet=no],
+ [have_cet=yes])
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
fi
diff --git a/libiberty/configure b/libiberty/configure
index 2ea7c119809..fc0c953dd1a 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -5396,6 +5396,34 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ have_multi_byte_nop=yes
+else
+ have_multi_byte_nop=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
static void
foo (void)
{
@@ -5432,6 +5460,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
fi
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
2021-03-23 22:39 [PATCH 0/2] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs H.J. Lu
2021-03-23 22:39 ` [PATCH 1/2] " H.J. Lu
@ 2021-03-23 22:39 ` H.J. Lu
1 sibling, 0 replies; 5+ messages in thread
From: H.J. Lu @ 2021-03-23 22:39 UTC (permalink / raw)
To: gcc-patches; +Cc: Jakub Jelinek
Check if host supports multi-byte NOPs before enabling CET on host.
gcc/
PR bootstrap/99703
* configure: Regenerated.
libbacktrace/
PR bootstrap/99703
* configure: Regenerated.
libcc1/
PR bootstrap/99703
* configure: Regenerated.
libcpp/
PR bootstrap/99703
* configure: Regenerated.
libdecnumber/
PR bootstrap/99703
* configure: Regenerated.
lto-plugin/
PR bootstrap/99703
* configure: Regenerated.
---
gcc/configure | 45 +++++++++++++++++++++---------
libbacktrace/configure | 29 +++++++++++++++++++
libcc1/configure | 45 +++++++++++++++++++++---------
libcpp/configure | 29 +++++++++++++++++++
libdecnumber/configure | 29 +++++++++++++++++++
lto-plugin/configure | 63 +++++++++++++++++++++++++++++++-----------
6 files changed, 198 insertions(+), 42 deletions(-)
diff --git a/gcc/configure b/gcc/configure
index 9bb436ce7bd..1d5cbeb7465 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -19392,7 +19392,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 19405 "configure"
+#line 19395 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19498,7 +19498,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 19511 "configure"
+#line 19501 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22237,16 +22237,6 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux
need_lib_prefix=no
@@ -22368,7 +22358,7 @@ linux*oldld* | linux*aout* | linux*coff*)
# project, but have not yet been accepted: they are GCC-local changes
# for the time being. (See
# https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html)
-linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -31951,6 +31941,34 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+ have_multi_byte_nop=yes
+else
+ have_multi_byte_nop=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
static void
foo (void)
{
@@ -31987,6 +32005,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
fi
diff --git a/libbacktrace/configure b/libbacktrace/configure
index 9b66bf5563a..a2f33c0f35d 100755
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -12517,6 +12517,34 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ have_multi_byte_nop=yes
+else
+ have_multi_byte_nop=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
static void
foo (void)
{
@@ -12553,6 +12581,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
fi
diff --git a/libcc1/configure b/libcc1/configure
index 021ec265526..b198b0b9074 100755
--- a/libcc1/configure
+++ b/libcc1/configure
@@ -10777,7 +10777,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10790 "configure"
+#line 10780 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10883,7 +10883,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10896 "configure"
+#line 10886 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14028,16 +14028,6 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux
need_lib_prefix=no
@@ -14159,7 +14149,7 @@ linux*oldld* | linux*aout* | linux*coff*)
# project, but have not yet been accepted: they are GCC-local changes
# for the time being. (See
# https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html)
-linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -14663,6 +14653,34 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ have_multi_byte_nop=yes
+else
+ have_multi_byte_nop=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
static void
foo (void)
{
@@ -14699,6 +14717,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
fi
diff --git a/libcpp/configure b/libcpp/configure
index 7e28606f605..9674cd9c7a7 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -7668,6 +7668,34 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ have_multi_byte_nop=yes
+else
+ have_multi_byte_nop=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
static void
foo (void)
{
@@ -7704,6 +7732,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
fi
diff --git a/libdecnumber/configure b/libdecnumber/configure
index 6b62f8ba665..da5302f9315 100755
--- a/libdecnumber/configure
+++ b/libdecnumber/configure
@@ -5321,6 +5321,34 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ have_multi_byte_nop=yes
+else
+ have_multi_byte_nop=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
static void
foo (void)
{
@@ -5357,6 +5385,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
fi
diff --git a/lto-plugin/configure b/lto-plugin/configure
index baa84adbb6c..26aad9dd699 100755
--- a/lto-plugin/configure
+++ b/lto-plugin/configure
@@ -5791,6 +5791,34 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+int
+main ()
+{
+ asm ("endbr32");
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ have_multi_byte_nop=yes
+else
+ have_multi_byte_nop=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ have_cet=no
+ if test x$have_multi_byte_nop = xyes; then
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
static void
foo (void)
{
@@ -5827,6 +5855,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
fi
@@ -8429,23 +8458,25 @@ _LT_EOF
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
$as_echo "$lt_cv_ld_force_load" >&6; }
- case $host_os in
- rhapsody* | darwin1.[012])
+ # Allow for Darwin 4-7 (macOS 10.0-10.3) although these are not expect to
+ # build without first building modern cctools / linker.
+ case $host_cpu-$host_os in
+ *-rhapsody* | *-darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
+ *-darwin1.*)
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ *-darwin*)
+ # darwin 5.x (macOS 10.1) onwards we only need to adjust when the
+ # deployment target is forced to an earlier version.
+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in
+ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*)
+ ;;
10.[012][,.]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ *)
+ ;;
+ esac
;;
esac
if test "$lt_cv_apple_cc_single_mod" = "yes"; then
@@ -11950,7 +11981,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11963 "configure"
+#line 11984 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12056,7 +12087,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12069 "configure"
+#line 12090 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* PING^1 [PATCH 1/2] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
2021-03-23 22:39 ` [PATCH 1/2] " H.J. Lu
@ 2021-05-02 13:27 ` H.J. Lu
2021-05-03 8:23 ` Richard Biener
0 siblings, 1 reply; 5+ messages in thread
From: H.J. Lu @ 2021-05-02 13:27 UTC (permalink / raw)
To: GCC Patches, Richard Biener, Jeff Law; +Cc: Jakub Jelinek
On Tue, Mar 23, 2021 at 3:39 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> Check if host supports multi-byte NOPs before enabling CET on host.
>
> config/
>
> PR binutils/27397
> * cet.m4 (GCC_CET_HOST_FLAGS): Check if host supports multi-byte
> NOPs.
>
> libiberty/
>
> PR binutils/27397
> * configure: Regenerated.
> ---
> config/cet.m4 | 19 ++++++++++++++++---
> libiberty/configure | 29 +++++++++++++++++++++++++++++
> 2 files changed, 45 insertions(+), 3 deletions(-)
>
> diff --git a/config/cet.m4 b/config/cet.m4
> index c67fb4f35b6..7718be1afe8 100644
> --- a/config/cet.m4
> +++ b/config/cet.m4
> @@ -130,6 +130,18 @@ fi
> if test x$may_have_cet = xyes; then
> if test x$cross_compiling = xno; then
> AC_TRY_RUN([
> +int
> +main ()
> +{
> + asm ("endbr32");
> + return 0;
> +}
> + ],
> + [have_multi_byte_nop=yes],
> + [have_multi_byte_nop=no])
> + have_cet=no
> + if test x$have_multi_byte_nop = xyes; then
> + AC_TRY_RUN([
> static void
> foo (void)
> {
> @@ -155,9 +167,10 @@ main ()
> bar ();
> return 0;
> }
> - ],
> - [have_cet=no],
> - [have_cet=yes])
> + ],
> + [have_cet=no],
> + [have_cet=yes])
> + fi
> if test x$enable_cet = xno -a x$have_cet = xyes; then
> AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
> fi
> diff --git a/libiberty/configure b/libiberty/configure
> index 2ea7c119809..fc0c953dd1a 100755
> --- a/libiberty/configure
> +++ b/libiberty/configure
> @@ -5396,6 +5396,34 @@ else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> +int
> +main ()
> +{
> + asm ("endbr32");
> + return 0;
> +}
> +
> +_ACEOF
> +if ac_fn_c_try_run "$LINENO"; then :
> + have_multi_byte_nop=yes
> +else
> + have_multi_byte_nop=no
> +fi
> +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> + conftest.$ac_objext conftest.beam conftest.$ac_ext
> +fi
> +
> + have_cet=no
> + if test x$have_multi_byte_nop = xyes; then
> + if test "$cross_compiling" = yes; then :
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
> +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> +as_fn_error $? "cannot run test program while cross compiling
> +See \`config.log' for more details" "$LINENO" 5; }
> +else
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h. */
> +
> static void
> foo (void)
> {
> @@ -5432,6 +5460,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> conftest.$ac_objext conftest.beam conftest.$ac_ext
> fi
>
> + fi
> if test x$enable_cet = xno -a x$have_cet = xyes; then
> as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
> fi
> --
> 2.30.2
>
This patch has been checked into binutils, which also fixes:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99703
Any objections to sync cet.m4 with binutils next week?
--
H.J.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: PING^1 [PATCH 1/2] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
2021-05-02 13:27 ` PING^1 " H.J. Lu
@ 2021-05-03 8:23 ` Richard Biener
0 siblings, 0 replies; 5+ messages in thread
From: Richard Biener @ 2021-05-03 8:23 UTC (permalink / raw)
To: H.J. Lu; +Cc: GCC Patches, Jeff Law, Jakub Jelinek
On Sun, May 2, 2021 at 3:27 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> On Tue, Mar 23, 2021 at 3:39 PM H.J. Lu <hjl.tools@gmail.com> wrote:
> >
> > Check if host supports multi-byte NOPs before enabling CET on host.
> >
> > config/
> >
> > PR binutils/27397
> > * cet.m4 (GCC_CET_HOST_FLAGS): Check if host supports multi-byte
> > NOPs.
> >
> > libiberty/
> >
> > PR binutils/27397
> > * configure: Regenerated.
> > ---
> > config/cet.m4 | 19 ++++++++++++++++---
> > libiberty/configure | 29 +++++++++++++++++++++++++++++
> > 2 files changed, 45 insertions(+), 3 deletions(-)
> >
> > diff --git a/config/cet.m4 b/config/cet.m4
> > index c67fb4f35b6..7718be1afe8 100644
> > --- a/config/cet.m4
> > +++ b/config/cet.m4
> > @@ -130,6 +130,18 @@ fi
> > if test x$may_have_cet = xyes; then
> > if test x$cross_compiling = xno; then
> > AC_TRY_RUN([
> > +int
> > +main ()
> > +{
> > + asm ("endbr32");
> > + return 0;
> > +}
> > + ],
> > + [have_multi_byte_nop=yes],
> > + [have_multi_byte_nop=no])
> > + have_cet=no
> > + if test x$have_multi_byte_nop = xyes; then
> > + AC_TRY_RUN([
> > static void
> > foo (void)
> > {
> > @@ -155,9 +167,10 @@ main ()
> > bar ();
> > return 0;
> > }
> > - ],
> > - [have_cet=no],
> > - [have_cet=yes])
> > + ],
> > + [have_cet=no],
> > + [have_cet=yes])
> > + fi
> > if test x$enable_cet = xno -a x$have_cet = xyes; then
> > AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
> > fi
> > diff --git a/libiberty/configure b/libiberty/configure
> > index 2ea7c119809..fc0c953dd1a 100755
> > --- a/libiberty/configure
> > +++ b/libiberty/configure
> > @@ -5396,6 +5396,34 @@ else
> > cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> > /* end confdefs.h. */
> >
> > +int
> > +main ()
> > +{
> > + asm ("endbr32");
> > + return 0;
> > +}
> > +
> > +_ACEOF
> > +if ac_fn_c_try_run "$LINENO"; then :
> > + have_multi_byte_nop=yes
> > +else
> > + have_multi_byte_nop=no
> > +fi
> > +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> > + conftest.$ac_objext conftest.beam conftest.$ac_ext
> > +fi
> > +
> > + have_cet=no
> > + if test x$have_multi_byte_nop = xyes; then
> > + if test "$cross_compiling" = yes; then :
> > + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
> > +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> > +as_fn_error $? "cannot run test program while cross compiling
> > +See \`config.log' for more details" "$LINENO" 5; }
> > +else
> > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> > +/* end confdefs.h. */
> > +
> > static void
> > foo (void)
> > {
> > @@ -5432,6 +5460,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> > conftest.$ac_objext conftest.beam conftest.$ac_ext
> > fi
> >
> > + fi
> > if test x$enable_cet = xno -a x$have_cet = xyes; then
> > as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
> > fi
> > --
> > 2.30.2
> >
>
> This patch has been checked into binutils, which also fixes:
>
> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99703
>
> Any objections to sync cet.m4 with binutils next week?
I think syncing is fine at any point.
> --
> H.J.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-03 8:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-23 22:39 [PATCH 0/2] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs H.J. Lu
2021-03-23 22:39 ` [PATCH 1/2] " H.J. Lu
2021-05-02 13:27 ` PING^1 " H.J. Lu
2021-05-03 8:23 ` Richard Biener
2021-03-23 22:39 ` [PATCH 2/2] " H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).