Module: xenomai-forge Branch: master Commit: fe8f53c216d0e237072947eebb219c9095ac344c URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=fe8f53c216d0e237072947eebb219c9095ac344c
Author: Philippe Gerum <r...@xenomai.org> Date: Fri Jun 14 17:16:10 2013 +0200 bootstrap --- configure | 34 ++++++++++++++++++++++++++++++++-- include/asm-arm/Makefile.in | 1 + include/asm-blackfin/Makefile.in | 1 + include/asm-nios2/Makefile.in | 1 + include/asm-powerpc/Makefile.in | 1 + include/asm-sh/Makefile.in | 1 + include/asm-x86/Makefile.in | 1 + lib/include/xeno_config.h.in | 3 +++ 8 files changed, 41 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a42edea..dce5903 100755 --- a/configure +++ b/configure @@ -862,6 +862,7 @@ enable_asciidoc enable_dlopen_libs enable_tls with_testdir +enable_fortify ' ac_precious_vars='build_alias host_alias @@ -1523,7 +1524,7 @@ Optional Features: allows to select the machine for which a user-space tsc emulation should be generated. Valid machines are at91, kuser, imx, ixp4xx, omap, orion, pxa, - s3c24x, sa1100. + s3c24x, sa1100. [default=kuser] --enable-arm-quirks Enable quirks for specific systems. Currently supported quirks are for sa1100 and xscale3. --disable-doc-install Do not install documentation @@ -1536,6 +1537,8 @@ Optional Features: --enable-asciidoc Build Asciidoc documentation --enable-dlopen-libs Allow dynamic loading of Xenomai libraries --enable-tls Enable thread local storage + --enable-fortify Enable support for applications compiled with + _FORTIFY_SOURCE Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -12966,7 +12969,7 @@ if test "${enable_arm_tsc+set}" = set; then : imx*|mx*) CONFIG_XENO_ARM_TSC_TYPE=__XN_TSC_TYPE_FREERUNNING;; - kuser) CONFIG_XENO_ARM_TSC_TYPE=__XN_TSC_TYPE_KUSER;; + generic|kuser) CONFIG_XENO_ARM_TSC_TYPE=__XN_TSC_TYPE_KUSER;; omap*) CONFIG_XENO_ARM_TSC_TYPE=__XN_TSC_TYPE_FREERUNNING;; @@ -14045,6 +14048,33 @@ if test x$rtcore_type = xcobalt; then fi +unset want_fortify +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fortify support" >&5 +$as_echo_n "checking for fortify support... " >&6; } +# Check whether --enable-fortify was given. +if test "${enable_fortify+set}" = set; then : + enableval=$enable_fortify; case "$enableval" in + y | yes) want_fortify=yes;; + *) want_fortify=no;; + esac +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_fortify:-autodetect}" >&5 +$as_echo "${want_fortify:-autodetect}" >&6; } +if test x"$want_fortify" != xno; then + ac_fn_c_check_func "$LINENO" "__vfprintf_chk" "ac_cv_func___vfprintf_chk" +if test "x$ac_cv_func___vfprintf_chk" = xyes; then : + +$as_echo "#define CONFIG_XENO_FORTIFY 1 " >>confdefs.h + +else + if test x"$want_fortify" = "xyes"; then + as_fn_error $? "Fortify support enabled but not available in *libc" "$LINENO" 5 + fi +fi + +fi + diff --git a/include/asm-arm/Makefile.in b/include/asm-arm/Makefile.in index 0cd7cb5..55cd718 100644 --- a/include/asm-arm/Makefile.in +++ b/include/asm-arm/Makefile.in @@ -319,6 +319,7 @@ includesub_HEADERS = \ fptest.h \ machine.h \ syscall.h \ + tsc.h \ thread.h \ wrappers.h diff --git a/include/asm-blackfin/Makefile.in b/include/asm-blackfin/Makefile.in index a26a521..a71ad9c 100644 --- a/include/asm-blackfin/Makefile.in +++ b/include/asm-blackfin/Makefile.in @@ -320,6 +320,7 @@ includesub_HEADERS = \ machine.h \ syscall.h \ thread.h \ + tsc.h \ wrappers.h SUBDIRS = bits diff --git a/include/asm-nios2/Makefile.in b/include/asm-nios2/Makefile.in index fe11f9b..3886e53 100644 --- a/include/asm-nios2/Makefile.in +++ b/include/asm-nios2/Makefile.in @@ -320,6 +320,7 @@ includesub_HEADERS = \ machine.h \ syscall.h \ thread.h \ + tsc.h \ wrappers.h SUBDIRS = bits diff --git a/include/asm-powerpc/Makefile.in b/include/asm-powerpc/Makefile.in index be72851..8c92049 100644 --- a/include/asm-powerpc/Makefile.in +++ b/include/asm-powerpc/Makefile.in @@ -320,6 +320,7 @@ includesub_HEADERS = \ machine.h \ syscall.h \ thread.h \ + tsc.h \ wrappers.h SUBDIRS = bits diff --git a/include/asm-sh/Makefile.in b/include/asm-sh/Makefile.in index e9802b6..b07981e 100644 --- a/include/asm-sh/Makefile.in +++ b/include/asm-sh/Makefile.in @@ -320,6 +320,7 @@ includesub_HEADERS = \ machine.h \ syscall.h \ thread.h \ + tsc.h \ wrappers.h SUBDIRS = bits diff --git a/include/asm-x86/Makefile.in b/include/asm-x86/Makefile.in index c39d0e9..5316ef9 100644 --- a/include/asm-x86/Makefile.in +++ b/include/asm-x86/Makefile.in @@ -323,6 +323,7 @@ includesub_HEADERS = \ smi.h \ syscall.h \ thread.h \ + tsc.h \ wrappers.h SUBDIRS = bits diff --git a/lib/include/xeno_config.h.in b/lib/include/xeno_config.h.in index 96a96d2..8764a19 100644 --- a/lib/include/xeno_config.h.in +++ b/lib/include/xeno_config.h.in @@ -36,6 +36,9 @@ /* config */ #undef CONFIG_XENO_DEFAULT_PERIOD +/* config */ +#undef CONFIG_XENO_FORTIFY + /* Host system alias */ #undef CONFIG_XENO_HOST_STRING _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git