final patch for enabling VxWorks

From-SVN: r193124
This commit is contained in:
Robert Mason 2012-11-03 15:53:28 +00:00 committed by Bruce Korb
parent 358a3dbce6
commit 2588b26e0e
6 changed files with 47 additions and 14 deletions

View File

@ -1,3 +1,8 @@
2012-11-03 Robert Mason <rbmj@verizon.net>
* configure.ac: add --disable-libstdcxx configure option
and handle defaulted state only for VxWorks, ARM-wince-pe and AVR.
2012-10-30 Ganesh Gopalasubramanian <Ganesh.Gopalasubramanian@amd.com> 2012-10-30 Ganesh Gopalasubramanian <Ganesh.Gopalasubramanian@amd.com>
* MAINTAINERS (Write After Approval): Add myself. * MAINTAINERS (Write After Approval): Add myself.

View File

@ -427,6 +427,15 @@ AC_ARG_ENABLE(libssp,
ENABLE_LIBSSP=$enableval, ENABLE_LIBSSP=$enableval,
ENABLE_LIBSSP=yes) ENABLE_LIBSSP=yes)
AC_ARG_ENABLE(libstdcxx,
AS_HELP_STRING([--disable-libstdcxx],
[do not build libstdc++-v3 directory]),
ENABLE_LIBSTDCXX=$enableval,
ENABLE_LIBSTDCXX=default)
[if test "${ENABLE_LIBSTDCXX}" = "no" ; then
noconfigdirs="$noconfigdirs libstdc++-v3"
fi]
# Save it here so that, even in case of --enable-libgcj, if the Java # Save it here so that, even in case of --enable-libgcj, if the Java
# front-end isn't enabled, we still get libgcj disabled. # front-end isn't enabled, we still get libgcj disabled.
libgcj_saved=$libgcj libgcj_saved=$libgcj
@ -562,19 +571,22 @@ case "${target}" in
esac esac
# Disable libstdc++-v3 for some systems. # Disable libstdc++-v3 for some systems.
case "${target}" in # Allow user to override this if they pass --enable-libstdc++-v3
*-*-vxworks*) if test "${ENABLE_LIBSTDCXX}" = "default" ; then
# VxWorks uses the Dinkumware C++ library. case "${target}" in
noconfigdirs="$noconfigdirs target-libstdc++-v3" *-*-vxworks*)
;; # VxWorks uses the Dinkumware C++ library.
arm*-wince-pe*) noconfigdirs="$noconfigdirs target-libstdc++-v3"
# the C++ libraries don't build on top of CE's C libraries ;;
noconfigdirs="$noconfigdirs target-libstdc++-v3" arm*-wince-pe*)
;; # the C++ libraries don't build on top of CE's C libraries
avr-*-*) noconfigdirs="$noconfigdirs target-libstdc++-v3"
noconfigdirs="$noconfigdirs target-libstdc++-v3" ;;
;; avr-*-*)
esac noconfigdirs="$noconfigdirs target-libstdc++-v3"
;;
esac
fi
# Disable Fortran for some systems. # Disable Fortran for some systems.
case "${target}" in case "${target}" in

View File

@ -1,3 +1,7 @@
2012-11-03 Robert Mason <rbmj@verizon.net>
* gcov-io.c (gcov_open): Add file mode to open call (need for VxWorks)
2012-11-03 Sandra Loosemore <sandra@codesourcery.com> 2012-11-03 Sandra Loosemore <sandra@codesourcery.com>
* doc/extend.texi: Copy-edit to use present tense except when * doc/extend.texi: Copy-edit to use present tense except when

View File

@ -92,7 +92,8 @@ gcov_open (const char *name, int mode)
{ {
/* Read-only mode - acquire a read-lock. */ /* Read-only mode - acquire a read-lock. */
s_flock.l_type = F_RDLCK; s_flock.l_type = F_RDLCK;
fd = open (name, O_RDONLY); /* pass mode (ignored) for compatibility */
fd = open (name, O_RDONLY, S_IRUSR | S_IWUSR);
} }
else else
{ {

View File

@ -1,3 +1,8 @@
2012-11-03 Robert Mason <rbmj@verizon.net>
* config/os/vxworks/os_defines.h:
Keep vxWorks from defining min()/max() as macros
2012-11-03 Jonathan Wakely <jwakely.gcc@gmail.com> 2012-11-03 Jonathan Wakely <jwakely.gcc@gmail.com>
* doc/html/*: Regenerate. * doc/html/*: Regenerate.

View File

@ -33,4 +33,10 @@
// System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
// file will come before all others. // file will come before all others.
//Keep vxWorks from defining min()/max() as macros
#ifdef NOMINMAX
#undef NOMINMAX
#endif
#define NOMINMAX 1
#endif #endif