--enable-cet={yes,no,auto} with default no

Message ID 20180418223136.GU8577@tucnak
State New
Headers show
Series
  • --enable-cet={yes,no,auto} with default no
Related show

Commit Message

Jakub Jelinek April 18, 2018, 10:31 p.m.
On Wed, Apr 18, 2018 at 12:24:15PM -0700, H.J. Lu wrote:
> >> So untested patch would be something like:

> >

> > Yes, this is what I think should be the most appropriate approach.


Here is the patch with slightly tweaked install.texi and the all the
regenerated bits too.

Bootstrapped/regtested on x86_64-linux and i686-linux (without any of
--enable-cet*/--disable-cet, with no -fct-protection -mcet in libraries,
change compared to previous bootstrap), additionally tested
(non-bootstrap build) with --enable-cet=auto, --disable-cet and --enable-cet .
Ok for trunk?

2018-04-18  Jakub Jelinek  <jakub@redhat.com>

	* config/cet.m4 (GCC_CET_FLAGS): Default to --disable-cet, replace
	--enable-cet=default with --enable-cet=auto.

	* doc/install.texi: Document --disable-cet being the default and
	--enable-cet=auto.

	* configure: Regenerated.



	Jakub

Comments

H.J. Lu April 18, 2018, 10:38 p.m. | #1
On Wed, Apr 18, 2018 at 3:31 PM, Jakub Jelinek <jakub@redhat.com> wrote:
> On Wed, Apr 18, 2018 at 12:24:15PM -0700, H.J. Lu wrote:

>> >> So untested patch would be something like:

>> >

>> > Yes, this is what I think should be the most appropriate approach.

>

> Here is the patch with slightly tweaked install.texi and the all the

> regenerated bits too.

>

> Bootstrapped/regtested on x86_64-linux and i686-linux (without any of

> --enable-cet*/--disable-cet, with no -fct-protection -mcet in libraries,

> change compared to previous bootstrap), additionally tested

> (non-bootstrap build) with --enable-cet=auto, --disable-cet and --enable-cet .

> Ok for trunk?

>

> 2018-04-18  Jakub Jelinek  <jakub@redhat.com>

>

>         * config/cet.m4 (GCC_CET_FLAGS): Default to --disable-cet, replace

>         --enable-cet=default with --enable-cet=auto.

>

>         * doc/install.texi: Document --disable-cet being the default and

>         --enable-cet=auto.

>

>         * configure: Regenerated.

>


LGTM.

Thanks.

-- 
H.J.
Uros Bizjak April 19, 2018, 7:12 a.m. | #2
On Thu, Apr 19, 2018 at 12:31 AM, Jakub Jelinek <jakub@redhat.com> wrote:
> On Wed, Apr 18, 2018 at 12:24:15PM -0700, H.J. Lu wrote:

>> >> So untested patch would be something like:

>> >

>> > Yes, this is what I think should be the most appropriate approach.

>

> Here is the patch with slightly tweaked install.texi and the all the

> regenerated bits too.

>

> Bootstrapped/regtested on x86_64-linux and i686-linux (without any of

> --enable-cet*/--disable-cet, with no -fct-protection -mcet in libraries,

> change compared to previous bootstrap), additionally tested

> (non-bootstrap build) with --enable-cet=auto, --disable-cet and --enable-cet .

> Ok for trunk?

>

> 2018-04-18  Jakub Jelinek  <jakub@redhat.com>

>

>         * config/cet.m4 (GCC_CET_FLAGS): Default to --disable-cet, replace

>         --enable-cet=default with --enable-cet=auto.

>

>         * doc/install.texi: Document --disable-cet being the default and

>         --enable-cet=auto.

>

>         * configure: Regenerated.


OK.

Thanks,
Uros.

> --- config/cet.m4.jj    2018-02-19 19:57:05.221280084 +0100

> +++ config/cet.m4       2018-04-18 14:05:31.514859185 +0200

> @@ -3,14 +3,14 @@ dnl GCC_CET_FLAGS

>  dnl    (SHELL-CODE_HANDLER)

>  dnl

>  AC_DEFUN([GCC_CET_FLAGS],[dnl

> -GCC_ENABLE(cet, default, ,[enable Intel CET in target libraries],

> -          permit yes|no|default)

> +GCC_ENABLE(cet, no, ,[enable Intel CET in target libraries],

> +          permit yes|no|auto)

>  AC_MSG_CHECKING([for CET support])

>

>  case "$host" in

>    i[[34567]]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         AC_COMPILE_IFELSE(

> --- gcc/doc/install.texi.jj     2018-02-08 12:21:20.791749480 +0100

> +++ gcc/doc/install.texi        2018-04-18 14:07:19.637901528 +0200

> @@ -2103,10 +2103,11 @@ instrumentation, see @option{-fcf-protec

>  to add @option{-fcf-protection} and, if needed, other target

>  specific options to a set of building options.

>

> -The option is enabled by default on Linux/x86 if target binutils

> -supports @code{Intel CET} instructions.  In this case the target

> -libraries are configured to get additional @option{-fcf-protection}

> -and @option{-mcet} options.

> +The option is disabled by default.  When @code{--enable-cet=auto}

> +is used, it is enabled on Linux/x86 if target binutils

> +supports @code{Intel CET} instructions and disabled otherwise.

> +In this case the target libraries are configured to get additional

> +@option{-fcf-protection} and @option{-mcet} options.

>  @end table

>

>  @subheading Cross-Compiler-Specific Options

>

> --- libatomic/configure (revision 259476)

> +++ libatomic/configure (working copy)

> @@ -1414,8 +1414,7 @@ Optional Features:

>                           (and sometimes confusing) to the casual installer

>    --enable-symvers=STYLE  enables symbol versioning of the shared library

>                            [default=yes]

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -11121,7 +11120,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11124 "configure"

> +#line 11123 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -11227,7 +11226,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11230 "configure"

> +#line 11229 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -15305,12 +15304,12 @@ fi

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -15320,7 +15319,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libbacktrace/configure      (revision 259476)

> +++ libbacktrace/configure      (working copy)

> @@ -1386,8 +1386,7 @@ Optional Features:

>                            optimize for fast installation [default=yes]

>    --disable-libtool-lock  avoid locking (might break parallel builds)

>    --disable-largefile     omit support for large files

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-host-shared    build host code as shared libraries

>

>  Optional Packages:

> @@ -11149,7 +11148,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11152 "configure"

> +#line 11151 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -11255,7 +11254,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11258 "configure"

> +#line 11257 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -11793,12 +11792,12 @@ if test -n "${with_target_subdir}"; then

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -11808,7 +11807,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libgcc/configure    (revision 259476)

> +++ libgcc/configure    (working copy)

> @@ -1316,8 +1316,7 @@ Optional Features:

>                         enable decimal float extension to C.  Selecting 'bid'

>                         or 'dpd' choses which decimal floating point format

>                         to use

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-explicit-exception-frame-registration

>                            register exception tables explicitly at module

>                            start, for use e.g. for compatibility with

> @@ -4781,12 +4780,12 @@ $as_echo "$ac_cv_sjlj_exceptions" >&6; }

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -4796,7 +4795,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libgfortran/configure       (revision 259476)

> +++ libgfortran/configure       (working copy)

> @@ -1425,8 +1425,7 @@ Optional Features:

>    --enable-multilib       build many library versions (default)

>    --disable-dependency-tracking  speeds up one-time build

>    --enable-dependency-tracking   do not reject slow dependency extractors

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --disable-symvers       disable symbol versioning for libgfortran

>    --enable-shared[=PKGS]  build shared libraries [default=yes]

>    --enable-static[=PKGS]  build static libraries [default=yes]

> @@ -5795,12 +5794,12 @@ fi

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -5810,7 +5809,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> @@ -12513,7 +12512,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12516 "configure"

> +#line 12515 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -12619,7 +12618,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12622 "configure"

> +#line 12621 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> --- libgomp/configure   (revision 259476)

> +++ libgomp/configure   (working copy)

> @@ -1452,8 +1452,7 @@ Optional Features:

>    --enable-tls            Use thread-local storage [default=yes]

>    --enable-symvers=STYLE  enables symbol versioning of the shared library

>                            [default=yes]

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -11158,7 +11157,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11161 "configure"

> +#line 11160 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -11264,7 +11263,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11267 "configure"

> +#line 11266 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -16624,12 +16623,12 @@ XCFLAGS="$XCFLAGS$XPCFLAGS"

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -16639,7 +16638,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libitm/configure    (revision 259476)

> +++ libitm/configure    (working copy)

> @@ -1427,8 +1427,7 @@ Optional Features:

>    --enable-tls            Use thread-local storage [default=yes]

>    --enable-symvers=STYLE  enables symbol versioning of the shared library

>                            [default=yes]

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -11797,7 +11796,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11800 "configure"

> +#line 11799 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -11903,7 +11902,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11906 "configure"

> +#line 11905 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -17594,12 +17593,12 @@ XCFLAGS="$XCFLAGS $XPCFLAGS"

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -17609,7 +17608,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libmpx/configure    (revision 259476)

> +++ libmpx/configure    (working copy)

> @@ -1373,8 +1373,7 @@ Optional Features:

>    --enable-fast-install[=PKGS]

>                            optimize for fast installation [default=yes]

>    --disable-libtool-lock  avoid locking (might break parallel builds)

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -11237,7 +11236,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11240 "configure"

> +#line 11239 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -11343,7 +11342,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11346 "configure"

> +#line 11345 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -11589,12 +11588,12 @@ XCFLAGS="-Wall -Wextra"

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -11604,7 +11603,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libobjc/configure   (revision 259476)

> +++ libobjc/configure   (working copy)

> @@ -1352,8 +1352,7 @@ Optional Features:

>    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]

>    --enable-version-specific-runtime-libs    Specify that runtime libraries should be installed in a compiler-specific directory

>    --enable-multilib       build many library versions (default)

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-maintainer-mode  enable make rules and dependencies not useful

>                           (and sometimes confusing) to the casual installer

>    --enable-shared[=PKGS]  build shared libraries [default=yes]

> @@ -3360,12 +3359,12 @@ esac

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -3375,7 +3374,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> @@ -10683,7 +10682,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10686 "configure"

> +#line 10685 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -10789,7 +10788,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10792 "configure"

> +#line 10791 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> --- libquadmath/configure       (revision 259476)

> +++ libquadmath/configure       (working copy)

> @@ -1398,8 +1398,7 @@ Optional Features:

>    --enable-maintainer-mode  enable make rules and dependencies not useful

>                           (and sometimes confusing) to the casual installer

>    --disable-symvers       disable symbol versioning for libquadmath

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-generated-files-in-srcdir

>                            put copies of generated files in source dir intended

>                            for creating source tarballs for users without

> @@ -10576,7 +10575,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10579 "configure"

> +#line 10578 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -10682,7 +10681,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10685 "configure"

> +#line 10684 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -12828,12 +12827,12 @@ fi

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -12843,7 +12842,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libsanitizer/configure      (revision 259476)

> +++ libsanitizer/configure      (working copy)

> @@ -1425,8 +1425,7 @@ Optional Features:

>    --enable-fast-install[=PKGS]

>                            optimize for fast installation [default=yes]

>    --disable-libtool-lock  avoid locking (might break parallel builds)

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -12038,7 +12037,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12041 "configure"

> +#line 12040 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -12144,7 +12143,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12147 "configure"

> +#line 12146 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -16530,12 +16529,12 @@ fi

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -16545,7 +16544,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libssp/configure    (revision 259476)

> +++ libssp/configure    (working copy)

> @@ -1378,8 +1378,7 @@ Optional Features:

>    --enable-multilib       build many library versions (default)

>    --disable-dependency-tracking  speeds up one-time build

>    --enable-dependency-tracking   do not reject slow dependency extractors

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --disable-symvers       disable symbol versioning for libssp

>    --enable-shared[=PKGS]  build shared libraries [default=yes]

>    --enable-static[=PKGS]  build static libraries [default=yes]

> @@ -4086,12 +4085,12 @@ CFLAGS="$save_CFLAGS"

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -4101,7 +4100,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> @@ -10760,7 +10759,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10763 "configure"

> +#line 10762 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -10866,7 +10865,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10869 "configure"

> +#line 10868 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> --- libstdc++-v3/configure      (revision 259476)

> +++ libstdc++-v3/configure      (working copy)

> @@ -1598,8 +1598,7 @@ Optional Features:

>                            enable C++11 threads support [default=auto]

>    --enable-libstdcxx-filesystem-ts

>                            turns on ISO/IEC TS 18822 support [default=auto]

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-version-specific-runtime-libs

>                            Specify that runtime libraries should be installed

>                            in a compiler-specific directory

> @@ -11607,7 +11606,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11610 "configure"

> +#line 11609 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -11713,7 +11712,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11716 "configure"

> +#line 11715 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -15399,7 +15398,7 @@ $as_echo "$glibcxx_cv_atomic_long_long"

>    # Fake what AC_TRY_COMPILE does.

>

>      cat > conftest.$ac_ext << EOF

> -#line 15402 "configure"

> +#line 15401 "configure"

>  int main()

>  {

>    typedef bool atomic_type;

> @@ -15434,7 +15433,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6;

>      rm -f conftest*

>

>      cat > conftest.$ac_ext << EOF

> -#line 15437 "configure"

> +#line 15436 "configure"

>  int main()

>  {

>    typedef short atomic_type;

> @@ -15469,7 +15468,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6;

>      rm -f conftest*

>

>      cat > conftest.$ac_ext << EOF

> -#line 15472 "configure"

> +#line 15471 "configure"

>  int main()

>  {

>    // NB: _Atomic_word not necessarily int.

> @@ -15505,7 +15504,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }

>      rm -f conftest*

>

>      cat > conftest.$ac_ext << EOF

> -#line 15508 "configure"

> +#line 15507 "configure"

>  int main()

>  {

>    typedef long long atomic_type;

> @@ -15586,7 +15585,7 @@ $as_echo "$as_me: WARNING: Performance o

>    # unnecessary for this test.

>

>      cat > conftest.$ac_ext << EOF

> -#line 15589 "configure"

> +#line 15588 "configure"

>  int main()

>  {

>    _Decimal32 d1;

> @@ -15628,7 +15627,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

>    # unnecessary for this test.

>

>      cat > conftest.$ac_ext << EOF

> -#line 15631 "configure"

> +#line 15630 "configure"

>  template<typename T1, typename T2>

>    struct same

>    { typedef T2 type; };

> @@ -15662,7 +15661,7 @@ $as_echo "$enable_int128" >&6; }

>      rm -f conftest*

>

>      cat > conftest.$ac_ext << EOF

> -#line 15665 "configure"

> +#line 15664 "configure"

>  template<typename T1, typename T2>

>    struct same

>    { typedef T2 type; };

> @@ -81146,12 +81145,12 @@ CPU_OPT_BITS_RANDOM=config/${cpu_opt_bit

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -81161,7 +81160,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libvtv/configure    (revision 259476)

> +++ libvtv/configure    (working copy)

> @@ -1405,8 +1405,7 @@ Optional Features:

>    --enable-fast-install[=PKGS]

>                            optimize for fast installation [default=yes]

>    --disable-libtool-lock  avoid locking (might break parallel builds)

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -12069,7 +12068,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12072 "configure"

> +#line 12071 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -12175,7 +12174,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12178 "configure"

> +#line 12177 "configure"

>  #include "confdefs.h"

>

>  #if HAVE_DLFCN_H

> @@ -15464,12 +15463,12 @@ XCFLAGS="-D_GNU_SOURCE -Wall -Wextra -fn

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>

>

> @@ -15479,7 +15478,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>         # Check if target supports multi-byte NOPs

>         # and if assembler supports CET insn.

>         cat confdefs.h - <<_ACEOF >conftest.$ac_ext

>

>

>         Jakub
Richard Biener April 19, 2018, 7:20 a.m. | #3
On Thu, 19 Apr 2018, Jakub Jelinek wrote:

> On Wed, Apr 18, 2018 at 12:24:15PM -0700, H.J. Lu wrote:

> > >> So untested patch would be something like:

> > >

> > > Yes, this is what I think should be the most appropriate approach.

> 

> Here is the patch with slightly tweaked install.texi and the all the

> regenerated bits too.

> 

> Bootstrapped/regtested on x86_64-linux and i686-linux (without any of

> --enable-cet*/--disable-cet, with no -fct-protection -mcet in libraries,

> change compared to previous bootstrap), additionally tested

> (non-bootstrap build) with --enable-cet=auto, --disable-cet and --enable-cet .

> Ok for trunk?


OK.

Richard.

> 2018-04-18  Jakub Jelinek  <jakub@redhat.com>

> 

> 	* config/cet.m4 (GCC_CET_FLAGS): Default to --disable-cet, replace

> 	--enable-cet=default with --enable-cet=auto.

> 

> 	* doc/install.texi: Document --disable-cet being the default and

> 	--enable-cet=auto.

> 

> 	* configure: Regenerated.

> 

> --- config/cet.m4.jj	2018-02-19 19:57:05.221280084 +0100

> +++ config/cet.m4	2018-04-18 14:05:31.514859185 +0200

> @@ -3,14 +3,14 @@ dnl GCC_CET_FLAGS

>  dnl    (SHELL-CODE_HANDLER)

>  dnl

>  AC_DEFUN([GCC_CET_FLAGS],[dnl

> -GCC_ENABLE(cet, default, ,[enable Intel CET in target libraries],

> -	   permit yes|no|default)

> +GCC_ENABLE(cet, no, ,[enable Intel CET in target libraries],

> +	   permit yes|no|auto)

>  AC_MSG_CHECKING([for CET support])

>  

>  case "$host" in

>    i[[34567]]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	AC_COMPILE_IFELSE(

> --- gcc/doc/install.texi.jj	2018-02-08 12:21:20.791749480 +0100

> +++ gcc/doc/install.texi	2018-04-18 14:07:19.637901528 +0200

> @@ -2103,10 +2103,11 @@ instrumentation, see @option{-fcf-protec

>  to add @option{-fcf-protection} and, if needed, other target

>  specific options to a set of building options.

>  

> -The option is enabled by default on Linux/x86 if target binutils

> -supports @code{Intel CET} instructions.  In this case the target

> -libraries are configured to get additional @option{-fcf-protection}

> -and @option{-mcet} options.

> +The option is disabled by default.  When @code{--enable-cet=auto}

> +is used, it is enabled on Linux/x86 if target binutils

> +supports @code{Intel CET} instructions and disabled otherwise.

> +In this case the target libraries are configured to get additional

> +@option{-fcf-protection} and @option{-mcet} options.

>  @end table

>  

>  @subheading Cross-Compiler-Specific Options

> 

> --- libatomic/configure	(revision 259476)

> +++ libatomic/configure	(working copy)

> @@ -1414,8 +1414,7 @@ Optional Features:

>  			  (and sometimes confusing) to the casual installer

>    --enable-symvers=STYLE  enables symbol versioning of the shared library

>                            [default=yes]

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>  

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -11121,7 +11120,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11124 "configure"

> +#line 11123 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -11227,7 +11226,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11230 "configure"

> +#line 11229 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -15305,12 +15304,12 @@ fi

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -15320,7 +15319,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libbacktrace/configure	(revision 259476)

> +++ libbacktrace/configure	(working copy)

> @@ -1386,8 +1386,7 @@ Optional Features:

>                            optimize for fast installation [default=yes]

>    --disable-libtool-lock  avoid locking (might break parallel builds)

>    --disable-largefile     omit support for large files

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-host-shared    build host code as shared libraries

>  

>  Optional Packages:

> @@ -11149,7 +11148,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11152 "configure"

> +#line 11151 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -11255,7 +11254,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11258 "configure"

> +#line 11257 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -11793,12 +11792,12 @@ if test -n "${with_target_subdir}"; then

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -11808,7 +11807,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libgcc/configure	(revision 259476)

> +++ libgcc/configure	(working copy)

> @@ -1316,8 +1316,7 @@ Optional Features:

>  			enable decimal float extension to C.  Selecting 'bid'

>  			or 'dpd' choses which decimal floating point format

>  			to use

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-explicit-exception-frame-registration

>                            register exception tables explicitly at module

>                            start, for use e.g. for compatibility with

> @@ -4781,12 +4780,12 @@ $as_echo "$ac_cv_sjlj_exceptions" >&6; }

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -4796,7 +4795,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libgfortran/configure	(revision 259476)

> +++ libgfortran/configure	(working copy)

> @@ -1425,8 +1425,7 @@ Optional Features:

>    --enable-multilib       build many library versions (default)

>    --disable-dependency-tracking  speeds up one-time build

>    --enable-dependency-tracking   do not reject slow dependency extractors

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --disable-symvers       disable symbol versioning for libgfortran

>    --enable-shared[=PKGS]  build shared libraries [default=yes]

>    --enable-static[=PKGS]  build static libraries [default=yes]

> @@ -5795,12 +5794,12 @@ fi

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -5810,7 +5809,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> @@ -12513,7 +12512,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12516 "configure"

> +#line 12515 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -12619,7 +12618,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12622 "configure"

> +#line 12621 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> --- libgomp/configure	(revision 259476)

> +++ libgomp/configure	(working copy)

> @@ -1452,8 +1452,7 @@ Optional Features:

>    --enable-tls            Use thread-local storage [default=yes]

>    --enable-symvers=STYLE  enables symbol versioning of the shared library

>                            [default=yes]

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>  

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -11158,7 +11157,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11161 "configure"

> +#line 11160 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -11264,7 +11263,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11267 "configure"

> +#line 11266 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -16624,12 +16623,12 @@ XCFLAGS="$XCFLAGS$XPCFLAGS"

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -16639,7 +16638,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libitm/configure	(revision 259476)

> +++ libitm/configure	(working copy)

> @@ -1427,8 +1427,7 @@ Optional Features:

>    --enable-tls            Use thread-local storage [default=yes]

>    --enable-symvers=STYLE  enables symbol versioning of the shared library

>                            [default=yes]

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>  

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -11797,7 +11796,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11800 "configure"

> +#line 11799 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -11903,7 +11902,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11906 "configure"

> +#line 11905 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -17594,12 +17593,12 @@ XCFLAGS="$XCFLAGS $XPCFLAGS"

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -17609,7 +17608,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libmpx/configure	(revision 259476)

> +++ libmpx/configure	(working copy)

> @@ -1373,8 +1373,7 @@ Optional Features:

>    --enable-fast-install[=PKGS]

>                            optimize for fast installation [default=yes]

>    --disable-libtool-lock  avoid locking (might break parallel builds)

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>  

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -11237,7 +11236,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11240 "configure"

> +#line 11239 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -11343,7 +11342,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11346 "configure"

> +#line 11345 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -11589,12 +11588,12 @@ XCFLAGS="-Wall -Wextra"

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -11604,7 +11603,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libobjc/configure	(revision 259476)

> +++ libobjc/configure	(working copy)

> @@ -1352,8 +1352,7 @@ Optional Features:

>    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]

>    --enable-version-specific-runtime-libs    Specify that runtime libraries should be installed in a compiler-specific directory

>    --enable-multilib       build many library versions (default)

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-maintainer-mode  enable make rules and dependencies not useful

>  			  (and sometimes confusing) to the casual installer

>    --enable-shared[=PKGS]  build shared libraries [default=yes]

> @@ -3360,12 +3359,12 @@ esac

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -3375,7 +3374,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> @@ -10683,7 +10682,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10686 "configure"

> +#line 10685 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -10789,7 +10788,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10792 "configure"

> +#line 10791 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> --- libquadmath/configure	(revision 259476)

> +++ libquadmath/configure	(working copy)

> @@ -1398,8 +1398,7 @@ Optional Features:

>    --enable-maintainer-mode  enable make rules and dependencies not useful

>  			  (and sometimes confusing) to the casual installer

>    --disable-symvers       disable symbol versioning for libquadmath

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-generated-files-in-srcdir

>                            put copies of generated files in source dir intended

>                            for creating source tarballs for users without

> @@ -10576,7 +10575,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10579 "configure"

> +#line 10578 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -10682,7 +10681,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10685 "configure"

> +#line 10684 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -12828,12 +12827,12 @@ fi

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -12843,7 +12842,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libsanitizer/configure	(revision 259476)

> +++ libsanitizer/configure	(working copy)

> @@ -1425,8 +1425,7 @@ Optional Features:

>    --enable-fast-install[=PKGS]

>                            optimize for fast installation [default=yes]

>    --disable-libtool-lock  avoid locking (might break parallel builds)

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>  

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -12038,7 +12037,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12041 "configure"

> +#line 12040 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -12144,7 +12143,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12147 "configure"

> +#line 12146 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -16530,12 +16529,12 @@ fi

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -16545,7 +16544,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libssp/configure	(revision 259476)

> +++ libssp/configure	(working copy)

> @@ -1378,8 +1378,7 @@ Optional Features:

>    --enable-multilib       build many library versions (default)

>    --disable-dependency-tracking  speeds up one-time build

>    --enable-dependency-tracking   do not reject slow dependency extractors

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --disable-symvers       disable symbol versioning for libssp

>    --enable-shared[=PKGS]  build shared libraries [default=yes]

>    --enable-static[=PKGS]  build static libraries [default=yes]

> @@ -4086,12 +4085,12 @@ CFLAGS="$save_CFLAGS"

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -4101,7 +4100,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> @@ -10760,7 +10759,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10763 "configure"

> +#line 10762 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -10866,7 +10865,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 10869 "configure"

> +#line 10868 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> --- libstdc++-v3/configure	(revision 259476)

> +++ libstdc++-v3/configure	(working copy)

> @@ -1598,8 +1598,7 @@ Optional Features:

>                            enable C++11 threads support [default=auto]

>    --enable-libstdcxx-filesystem-ts

>                            turns on ISO/IEC TS 18822 support [default=auto]

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>    --enable-version-specific-runtime-libs

>                            Specify that runtime libraries should be installed

>                            in a compiler-specific directory

> @@ -11607,7 +11606,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11610 "configure"

> +#line 11609 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -11713,7 +11712,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 11716 "configure"

> +#line 11715 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -15399,7 +15398,7 @@ $as_echo "$glibcxx_cv_atomic_long_long"

>    # Fake what AC_TRY_COMPILE does.

>  

>      cat > conftest.$ac_ext << EOF

> -#line 15402 "configure"

> +#line 15401 "configure"

>  int main()

>  {

>    typedef bool atomic_type;

> @@ -15434,7 +15433,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6;

>      rm -f conftest*

>  

>      cat > conftest.$ac_ext << EOF

> -#line 15437 "configure"

> +#line 15436 "configure"

>  int main()

>  {

>    typedef short atomic_type;

> @@ -15469,7 +15468,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6;

>      rm -f conftest*

>  

>      cat > conftest.$ac_ext << EOF

> -#line 15472 "configure"

> +#line 15471 "configure"

>  int main()

>  {

>    // NB: _Atomic_word not necessarily int.

> @@ -15505,7 +15504,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }

>      rm -f conftest*

>  

>      cat > conftest.$ac_ext << EOF

> -#line 15508 "configure"

> +#line 15507 "configure"

>  int main()

>  {

>    typedef long long atomic_type;

> @@ -15586,7 +15585,7 @@ $as_echo "$as_me: WARNING: Performance o

>    # unnecessary for this test.

>  

>      cat > conftest.$ac_ext << EOF

> -#line 15589 "configure"

> +#line 15588 "configure"

>  int main()

>  {

>    _Decimal32 d1;

> @@ -15628,7 +15627,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

>    # unnecessary for this test.

>  

>      cat > conftest.$ac_ext << EOF

> -#line 15631 "configure"

> +#line 15630 "configure"

>  template<typename T1, typename T2>

>    struct same

>    { typedef T2 type; };

> @@ -15662,7 +15661,7 @@ $as_echo "$enable_int128" >&6; }

>      rm -f conftest*

>  

>      cat > conftest.$ac_ext << EOF

> -#line 15665 "configure"

> +#line 15664 "configure"

>  template<typename T1, typename T2>

>    struct same

>    { typedef T2 type; };

> @@ -81146,12 +81145,12 @@ CPU_OPT_BITS_RANDOM=config/${cpu_opt_bit

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -81161,7 +81160,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> --- libvtv/configure	(revision 259476)

> +++ libvtv/configure	(working copy)

> @@ -1405,8 +1405,7 @@ Optional Features:

>    --enable-fast-install[=PKGS]

>                            optimize for fast installation [default=yes]

>    --disable-libtool-lock  avoid locking (might break parallel builds)

> -  --enable-cet            enable Intel CET in target libraries

> -                          [default=default]

> +  --enable-cet            enable Intel CET in target libraries [default=no]

>  

>  Optional Packages:

>    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

> @@ -12069,7 +12068,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12072 "configure"

> +#line 12071 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -12175,7 +12174,7 @@ else

>    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

>    lt_status=$lt_dlunknown

>    cat > conftest.$ac_ext <<_LT_EOF

> -#line 12178 "configure"

> +#line 12177 "configure"

>  #include "confdefs.h"

>  

>  #if HAVE_DLFCN_H

> @@ -15464,12 +15463,12 @@ XCFLAGS="-D_GNU_SOURCE -Wall -Wextra -fn

>  if test "${enable_cet+set}" = set; then :

>    enableval=$enable_cet;

>        case "$enableval" in

> -       yes|no|default) ;;

> +       yes|no|auto) ;;

>         *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;

>                            esac

>  

>  else

> -  enable_cet=default

> +  enable_cet=no

>  fi

>  

>  

> @@ -15479,7 +15478,7 @@ $as_echo_n "checking for CET support...

>  case "$host" in

>    i[34567]86-*-linux* | x86_64-*-linux*)

>      case "$enable_cet" in

> -      default)

> +      auto)

>  	# Check if target supports multi-byte NOPs

>  	# and if assembler supports CET insn.

>  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

> 

> 

> 	Jakub

> 

> 


-- 
Richard Biener <rguenther@suse.de>
SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nuernberg)

Patch

--- config/cet.m4.jj	2018-02-19 19:57:05.221280084 +0100
+++ config/cet.m4	2018-04-18 14:05:31.514859185 +0200
@@ -3,14 +3,14 @@  dnl GCC_CET_FLAGS
 dnl    (SHELL-CODE_HANDLER)
 dnl
 AC_DEFUN([GCC_CET_FLAGS],[dnl
-GCC_ENABLE(cet, default, ,[enable Intel CET in target libraries],
-	   permit yes|no|default)
+GCC_ENABLE(cet, no, ,[enable Intel CET in target libraries],
+	   permit yes|no|auto)
 AC_MSG_CHECKING([for CET support])
 
 case "$host" in
   i[[34567]]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	AC_COMPILE_IFELSE(
--- gcc/doc/install.texi.jj	2018-02-08 12:21:20.791749480 +0100
+++ gcc/doc/install.texi	2018-04-18 14:07:19.637901528 +0200
@@ -2103,10 +2103,11 @@  instrumentation, see @option{-fcf-protec
 to add @option{-fcf-protection} and, if needed, other target
 specific options to a set of building options.
 
-The option is enabled by default on Linux/x86 if target binutils
-supports @code{Intel CET} instructions.  In this case the target
-libraries are configured to get additional @option{-fcf-protection}
-and @option{-mcet} options.
+The option is disabled by default.  When @code{--enable-cet=auto}
+is used, it is enabled on Linux/x86 if target binutils
+supports @code{Intel CET} instructions and disabled otherwise.
+In this case the target libraries are configured to get additional
+@option{-fcf-protection} and @option{-mcet} options.
 @end table
 
 @subheading Cross-Compiler-Specific Options

--- libatomic/configure	(revision 259476)
+++ libatomic/configure	(working copy)
@@ -1414,8 +1414,7 @@  Optional Features:
 			  (and sometimes confusing) to the casual installer
   --enable-symvers=STYLE  enables symbol versioning of the shared library
                           [default=yes]
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -11121,7 +11120,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11124 "configure"
+#line 11123 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11227,7 +11226,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11230 "configure"
+#line 11229 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15305,12 +15304,12 @@  fi
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -15320,7 +15319,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libbacktrace/configure	(revision 259476)
+++ libbacktrace/configure	(working copy)
@@ -1386,8 +1386,7 @@  Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-largefile     omit support for large files
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
   --enable-host-shared    build host code as shared libraries
 
 Optional Packages:
@@ -11149,7 +11148,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11152 "configure"
+#line 11151 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11255,7 +11254,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11258 "configure"
+#line 11257 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11793,12 +11792,12 @@  if test -n "${with_target_subdir}"; then
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -11808,7 +11807,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libgcc/configure	(revision 259476)
+++ libgcc/configure	(working copy)
@@ -1316,8 +1316,7 @@  Optional Features:
 			enable decimal float extension to C.  Selecting 'bid'
 			or 'dpd' choses which decimal floating point format
 			to use
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
   --enable-explicit-exception-frame-registration
                           register exception tables explicitly at module
                           start, for use e.g. for compatibility with
@@ -4781,12 +4780,12 @@  $as_echo "$ac_cv_sjlj_exceptions" >&6; }
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -4796,7 +4795,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libgfortran/configure	(revision 259476)
+++ libgfortran/configure	(working copy)
@@ -1425,8 +1425,7 @@  Optional Features:
   --enable-multilib       build many library versions (default)
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
   --disable-symvers       disable symbol versioning for libgfortran
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
@@ -5795,12 +5794,12 @@  fi
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -5810,7 +5809,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12513,7 +12512,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12516 "configure"
+#line 12515 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12619,7 +12618,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12622 "configure"
+#line 12621 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
--- libgomp/configure	(revision 259476)
+++ libgomp/configure	(working copy)
@@ -1452,8 +1452,7 @@  Optional Features:
   --enable-tls            Use thread-local storage [default=yes]
   --enable-symvers=STYLE  enables symbol versioning of the shared library
                           [default=yes]
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -11158,7 +11157,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11161 "configure"
+#line 11160 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11264,7 +11263,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11267 "configure"
+#line 11266 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16624,12 +16623,12 @@  XCFLAGS="$XCFLAGS$XPCFLAGS"
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -16639,7 +16638,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libitm/configure	(revision 259476)
+++ libitm/configure	(working copy)
@@ -1427,8 +1427,7 @@  Optional Features:
   --enable-tls            Use thread-local storage [default=yes]
   --enable-symvers=STYLE  enables symbol versioning of the shared library
                           [default=yes]
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -11797,7 +11796,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11800 "configure"
+#line 11799 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11903,7 +11902,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11906 "configure"
+#line 11905 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17594,12 +17593,12 @@  XCFLAGS="$XCFLAGS $XPCFLAGS"
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -17609,7 +17608,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libmpx/configure	(revision 259476)
+++ libmpx/configure	(working copy)
@@ -1373,8 +1373,7 @@  Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -11237,7 +11236,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11240 "configure"
+#line 11239 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11343,7 +11342,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11346 "configure"
+#line 11345 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11589,12 +11588,12 @@  XCFLAGS="-Wall -Wextra"
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -11604,7 +11603,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libobjc/configure	(revision 259476)
+++ libobjc/configure	(working copy)
@@ -1352,8 +1352,7 @@  Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-version-specific-runtime-libs    Specify that runtime libraries should be installed in a compiler-specific directory
   --enable-multilib       build many library versions (default)
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -3360,12 +3359,12 @@  esac
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -3375,7 +3374,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10683,7 +10682,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10686 "configure"
+#line 10685 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10789,7 +10788,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10792 "configure"
+#line 10791 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
--- libquadmath/configure	(revision 259476)
+++ libquadmath/configure	(working copy)
@@ -1398,8 +1398,7 @@  Optional Features:
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --disable-symvers       disable symbol versioning for libquadmath
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
   --enable-generated-files-in-srcdir
                           put copies of generated files in source dir intended
                           for creating source tarballs for users without
@@ -10576,7 +10575,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10579 "configure"
+#line 10578 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10682,7 +10681,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10685 "configure"
+#line 10684 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12828,12 +12827,12 @@  fi
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -12843,7 +12842,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libsanitizer/configure	(revision 259476)
+++ libsanitizer/configure	(working copy)
@@ -1425,8 +1425,7 @@  Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -12038,7 +12037,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12041 "configure"
+#line 12040 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12144,7 +12143,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12147 "configure"
+#line 12146 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16530,12 +16529,12 @@  fi
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -16545,7 +16544,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libssp/configure	(revision 259476)
+++ libssp/configure	(working copy)
@@ -1378,8 +1378,7 @@  Optional Features:
   --enable-multilib       build many library versions (default)
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
   --disable-symvers       disable symbol versioning for libssp
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
@@ -4086,12 +4085,12 @@  CFLAGS="$save_CFLAGS"
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -4101,7 +4100,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10760,7 +10759,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10763 "configure"
+#line 10762 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10866,7 +10865,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10869 "configure"
+#line 10868 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
--- libstdc++-v3/configure	(revision 259476)
+++ libstdc++-v3/configure	(working copy)
@@ -1598,8 +1598,7 @@  Optional Features:
                           enable C++11 threads support [default=auto]
   --enable-libstdcxx-filesystem-ts
                           turns on ISO/IEC TS 18822 support [default=auto]
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
   --enable-version-specific-runtime-libs
                           Specify that runtime libraries should be installed
                           in a compiler-specific directory
@@ -11607,7 +11606,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11610 "configure"
+#line 11609 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11713,7 +11712,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11716 "configure"
+#line 11715 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15399,7 +15398,7 @@  $as_echo "$glibcxx_cv_atomic_long_long"
   # Fake what AC_TRY_COMPILE does.
 
     cat > conftest.$ac_ext << EOF
-#line 15402 "configure"
+#line 15401 "configure"
 int main()
 {
   typedef bool atomic_type;
@@ -15434,7 +15433,7 @@  $as_echo "$glibcxx_cv_atomic_bool" >&6;
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15437 "configure"
+#line 15436 "configure"
 int main()
 {
   typedef short atomic_type;
@@ -15469,7 +15468,7 @@  $as_echo "$glibcxx_cv_atomic_short" >&6;
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15472 "configure"
+#line 15471 "configure"
 int main()
 {
   // NB: _Atomic_word not necessarily int.
@@ -15505,7 +15504,7 @@  $as_echo "$glibcxx_cv_atomic_int" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15508 "configure"
+#line 15507 "configure"
 int main()
 {
   typedef long long atomic_type;
@@ -15586,7 +15585,7 @@  $as_echo "$as_me: WARNING: Performance o
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 15589 "configure"
+#line 15588 "configure"
 int main()
 {
   _Decimal32 d1;
@@ -15628,7 +15627,7 @@  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 15631 "configure"
+#line 15630 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
@@ -15662,7 +15661,7 @@  $as_echo "$enable_int128" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15665 "configure"
+#line 15664 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
@@ -81146,12 +81145,12 @@  CPU_OPT_BITS_RANDOM=config/${cpu_opt_bit
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -81161,7 +81160,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- libvtv/configure	(revision 259476)
+++ libvtv/configure	(working copy)
@@ -1405,8 +1405,7 @@  Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-cet            enable Intel CET in target libraries
-                          [default=default]
+  --enable-cet            enable Intel CET in target libraries [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -12069,7 +12068,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12072 "configure"
+#line 12071 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12175,7 +12174,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12178 "configure"
+#line 12177 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15464,12 +15463,12 @@  XCFLAGS="-D_GNU_SOURCE -Wall -Wextra -fn
 if test "${enable_cet+set}" = set; then :
   enableval=$enable_cet;
       case "$enableval" in
-       yes|no|default) ;;
+       yes|no|auto) ;;
        *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;;
                           esac
 
 else
-  enable_cet=default
+  enable_cet=no
 fi
 
 
@@ -15479,7 +15478,7 @@  $as_echo_n "checking for CET support...
 case "$host" in
   i[34567]86-*-linux* | x86_64-*-linux*)
     case "$enable_cet" in
-      default)
+      auto)
 	# Check if target supports multi-byte NOPs
 	# and if assembler supports CET insn.
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext