diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/configure | 5 | ||||
| -rw-r--r-- | sysdeps/i386/configure.ac | 4 | ||||
| -rw-r--r-- | sysdeps/x86/configure | 70 | ||||
| -rw-r--r-- | sysdeps/x86/configure.ac | 43 | ||||
| -rwxr-xr-x | sysdeps/x86_64/configure | 70 | ||||
| -rw-r--r-- | sysdeps/x86_64/configure.ac | 43 |
6 files changed, 122 insertions, 113 deletions
diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index f5c3a281ac..cd63d314fa 100644 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -1,6 +1,11 @@ # This file is generated from configure.ac by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/i386. +# CET is only supported for x86-64. Set enable-cet to "no" to allow +# "ifneq ($(enable-cet),no)" in x86 Makefiles. +config_vars="$config_vars +enable-cet = "no"" + # We no longer support i386 since it lacks the atomic instructions # required to implement NPTL threading. if test "$config_machine" = i386; then diff --git a/sysdeps/i386/configure.ac b/sysdeps/i386/configure.ac index 234ef2454a..b7d9436557 100644 --- a/sysdeps/i386/configure.ac +++ b/sysdeps/i386/configure.ac @@ -1,6 +1,10 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/i386. +# CET is only supported for x86-64. Set enable-cet to "no" to allow +# "ifneq ($(enable-cet),no)" in x86 Makefiles. +LIBC_CONFIG_VAR([enable-cet], ["no"]) + # We no longer support i386 since it lacks the atomic instructions # required to implement NPTL threading. if test "$config_machine" = i386; then diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure index a2f9a7c2c6..1f4c2d67fd 100644 --- a/sysdeps/x86/configure +++ b/sysdeps/x86/configure @@ -1,76 +1,6 @@ # This file is generated from configure.ac by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/x86. -if test $enable_cet != no; then - # Check if CET can be enabled. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CET can be enabled" >&5 -printf %s "checking whether CET can be enabled... " >&6; } -if test ${libc_cv_x86_cet_available+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat > conftest.c <<EOF -#if !defined __CET__ || __CET__ != 3 -# error CET isn't available. -#endif -EOF - if { ac_try='${CC-cc} -c $CFLAGS -fcf-protection -include cet.h conftest.c 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - libc_cv_x86_cet_available=yes - else - libc_cv_x86_cet_available=no - fi - rm -rf conftest* -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_cet_available" >&5 -printf "%s\n" "$libc_cv_x86_cet_available" >&6; } - if test $libc_cv_x86_cet_available != yes; then - as_fn_error $? "$CC doesn't support CET" "$LINENO" 5 - fi -fi -if test $enable_cet != no; then - # Check if assembler supports CET. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether assembler supports CET" >&5 -printf %s "checking whether assembler supports CET... " >&6; } -if test ${libc_cv_x86_cet_as+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat > conftest.s <<EOF - incsspd %ecx -EOF - if { ac_try='${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - libc_cv_x86_cet_as=yes - else - libc_cv_x86_cet_as=no - fi - rm -rf conftest* -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_cet_as" >&5 -printf "%s\n" "$libc_cv_x86_cet_as" >&6; } - if test $libc_cv_x86_cet_as = no; then - as_fn_error $? "$AS doesn't support CET" "$LINENO" 5 - fi -fi -if test $enable_cet = yes; then - printf "%s\n" "#define DEFAULT_DL_X86_CET_CONTROL cet_elf_property" >>confdefs.h - -elif test $enable_cet = permissive; then - printf "%s\n" "#define DEFAULT_DL_X86_CET_CONTROL cet_permissive" >>confdefs.h - -fi -config_vars="$config_vars -enable-cet = $enable_cet" - # Check if linker supports x86 ISA level. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for linker x86 ISA level support" >&5 printf %s "checking for linker x86 ISA level support... " >&6; } diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac index c854bc74ca..437a50623b 100644 --- a/sysdeps/x86/configure.ac +++ b/sysdeps/x86/configure.ac @@ -1,49 +1,6 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/x86. -if test $enable_cet != no; then - # Check if CET can be enabled. - AC_CACHE_CHECK(whether CET can be enabled, - libc_cv_x86_cet_available, [dnl -cat > conftest.c <<EOF -#if !defined __CET__ || __CET__ != 3 -# error CET isn't available. -#endif -EOF - if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS -fcf-protection -include cet.h conftest.c 1>&AS_MESSAGE_LOG_FD); then - libc_cv_x86_cet_available=yes - else - libc_cv_x86_cet_available=no - fi - rm -rf conftest*]) - if test $libc_cv_x86_cet_available != yes; then - AC_MSG_ERROR([$CC doesn't support CET]) - fi -fi -if test $enable_cet != no; then - # Check if assembler supports CET. - AC_CACHE_CHECK(whether assembler supports CET, - libc_cv_x86_cet_as, [dnl -cat > conftest.s <<EOF - incsspd %ecx -EOF - if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&AS_MESSAGE_LOG_FD); then - libc_cv_x86_cet_as=yes - else - libc_cv_x86_cet_as=no - fi - rm -rf conftest*]) - if test $libc_cv_x86_cet_as = no; then - AC_MSG_ERROR([$AS doesn't support CET]) - fi -fi -if test $enable_cet = yes; then - AC_DEFINE(DEFAULT_DL_X86_CET_CONTROL, cet_elf_property) -elif test $enable_cet = permissive; then - AC_DEFINE(DEFAULT_DL_X86_CET_CONTROL, cet_permissive) -fi -LIBC_CONFIG_VAR([enable-cet], [$enable_cet]) - # Check if linker supports x86 ISA level. AC_CACHE_CHECK([for linker x86 ISA level support], libc_cv_include_x86_isa_level, [dnl diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure index e307467afa..b4a80b8035 100755 --- a/sysdeps/x86_64/configure +++ b/sysdeps/x86_64/configure @@ -29,6 +29,76 @@ if test x"$build_mathvec" = xnotset; then build_mathvec=yes fi +if test $enable_cet != no; then + # Check if CET can be enabled. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CET can be enabled" >&5 +printf %s "checking whether CET can be enabled... " >&6; } +if test ${libc_cv_x86_cet_available+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat > conftest.c <<EOF +#if !defined __CET__ || __CET__ != 3 +# error CET isn't available. +#endif +EOF + if { ac_try='${CC-cc} -c $CFLAGS -fcf-protection -include cet.h conftest.c 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + libc_cv_x86_cet_available=yes + else + libc_cv_x86_cet_available=no + fi + rm -rf conftest* +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_cet_available" >&5 +printf "%s\n" "$libc_cv_x86_cet_available" >&6; } + if test $libc_cv_x86_cet_available != yes; then + as_fn_error $? "$CC doesn't support CET" "$LINENO" 5 + fi +fi +if test $enable_cet != no; then + # Check if assembler supports CET. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether assembler supports CET" >&5 +printf %s "checking whether assembler supports CET... " >&6; } +if test ${libc_cv_x86_cet_as+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat > conftest.s <<EOF + incsspd %ecx +EOF + if { ac_try='${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + libc_cv_x86_cet_as=yes + else + libc_cv_x86_cet_as=no + fi + rm -rf conftest* +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_cet_as" >&5 +printf "%s\n" "$libc_cv_x86_cet_as" >&6; } + if test $libc_cv_x86_cet_as = no; then + as_fn_error $? "$AS doesn't support CET" "$LINENO" 5 + fi +fi +if test $enable_cet = yes; then + printf "%s\n" "#define DEFAULT_DL_X86_CET_CONTROL cet_elf_property" >>confdefs.h + +elif test $enable_cet = permissive; then + printf "%s\n" "#define DEFAULT_DL_X86_CET_CONTROL cet_permissive" >>confdefs.h + +fi +config_vars="$config_vars +enable-cet = $enable_cet" + test -n "$critic_missing" && as_fn_error $? " *** $critic_missing" "$LINENO" 5 diff --git a/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/configure.ac index 1215dcb1e4..937d1aff7e 100644 --- a/sysdeps/x86_64/configure.ac +++ b/sysdeps/x86_64/configure.ac @@ -14,5 +14,48 @@ if test x"$build_mathvec" = xnotset; then build_mathvec=yes fi +if test $enable_cet != no; then + # Check if CET can be enabled. + AC_CACHE_CHECK(whether CET can be enabled, + libc_cv_x86_cet_available, [dnl +cat > conftest.c <<EOF +#if !defined __CET__ || __CET__ != 3 +# error CET isn't available. +#endif +EOF + if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS -fcf-protection -include cet.h conftest.c 1>&AS_MESSAGE_LOG_FD); then + libc_cv_x86_cet_available=yes + else + libc_cv_x86_cet_available=no + fi + rm -rf conftest*]) + if test $libc_cv_x86_cet_available != yes; then + AC_MSG_ERROR([$CC doesn't support CET]) + fi +fi +if test $enable_cet != no; then + # Check if assembler supports CET. + AC_CACHE_CHECK(whether assembler supports CET, + libc_cv_x86_cet_as, [dnl +cat > conftest.s <<EOF + incsspd %ecx +EOF + if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&AS_MESSAGE_LOG_FD); then + libc_cv_x86_cet_as=yes + else + libc_cv_x86_cet_as=no + fi + rm -rf conftest*]) + if test $libc_cv_x86_cet_as = no; then + AC_MSG_ERROR([$AS doesn't support CET]) + fi +fi +if test $enable_cet = yes; then + AC_DEFINE(DEFAULT_DL_X86_CET_CONTROL, cet_elf_property) +elif test $enable_cet = permissive; then + AC_DEFINE(DEFAULT_DL_X86_CET_CONTROL, cet_permissive) +fi +LIBC_CONFIG_VAR([enable-cet], [$enable_cet]) + test -n "$critic_missing" && AC_MSG_ERROR([ *** $critic_missing]) |