2013-08-12 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* configure.ac: Sync with GCC repo. * Makefile.def: Ditto. * configure: Regenerate. * Makefile.in: Ditto.
This commit is contained in:
Jan-Benedict Glaw
parent
56d5fc7cda
commit
111ced6d60
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,10 @@
|
|||
2013-08-12 Jan-Benedict Glaw <jbglaw@lug-owl.de>
|
||||
|
||||
* configure.ac: Sync with GCC repo.
|
||||
* Makefile.def: Ditto.
|
||||
* configure: Regenerate.
|
||||
* Makefile.in: Ditto.
|
||||
|
||||
2013-07-22 Joel Brobecker <brobecker@adacore.com>
|
||||
|
||||
* src-release (VER): Use $(TOOL)/common/create-version.sh
|
||||
|
|
@ -12,8 +19,8 @@
|
|||
|
||||
2013-06-01 George Thomas <george.thomas@atmel.com>
|
||||
|
||||
* include/opcode/avr.h: Rename AVR_ISA_XCH to AVR_ISA_RMW. Remove
|
||||
from AVR_ISA_XMEGA and add new AVR_ISA_XMEGAU
|
||||
* include/opcode/avr.h: Rename AVR_ISA_XCH to AVR_ISA_RMW. Remove
|
||||
from AVR_ISA_XMEGA and add new AVR_ISA_XMEGAU
|
||||
|
||||
2013-05-06 Sandra Loosemore <sandra@codesourcery.com>
|
||||
|
||||
|
|
|
|||
10
Makefile.def
10
Makefile.def
|
|
@ -4,8 +4,7 @@ AutoGen definitions Makefile.tpl;
|
|||
// Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
|
||||
// This file was originally written by Nathanael Nerode.
|
||||
//
|
||||
// Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
// Free Software Foundation
|
||||
// Copyright 2002-2013 Free Software Foundation
|
||||
//
|
||||
// This file is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -123,6 +122,10 @@ target_modules = { module= libsanitizer;
|
|||
bootstrap=true;
|
||||
lib_path=.libs;
|
||||
raw_cxx=true; };
|
||||
target_modules = { module= libvtv;
|
||||
bootstrap=true;
|
||||
lib_path=.libs;
|
||||
raw_cxx=true; };
|
||||
target_modules = { module= libssp; lib_path=.libs; };
|
||||
target_modules = { module= newlib; };
|
||||
target_modules = { module= libgcc; bootstrap=true; no_check=true; };
|
||||
|
|
@ -516,6 +519,7 @@ dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc;
|
|||
dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
|
||||
dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
|
||||
dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; };
|
||||
dependencies = { module=configure-target-libvtv; on=all-target-libstdc++-v3; };
|
||||
// parallel_list.o and parallel_settings.o depend on omp.h, which is
|
||||
// generated by the libgomp configure. Unfortunately, due to the use of
|
||||
// recursive make, we can't be that specific.
|
||||
|
|
@ -526,6 +530,8 @@ dependencies = { module=install-target-libgfortran; on=install-target-libquadmat
|
|||
dependencies = { module=install-target-libgfortran; on=install-target-libgcc; };
|
||||
dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; };
|
||||
dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; };
|
||||
dependencies = { module=install-target-libvtv; on=install-target-libstdc++-v3; };
|
||||
dependencies = { module=install-target-libvtv; on=install-target-libgcc; };
|
||||
dependencies = { module=install-target-libjava; on=install-target-libgcc; };
|
||||
dependencies = { module=install-target-libitm; on=install-target-libgcc; };
|
||||
dependencies = { module=install-target-libobjc; on=install-target-libgcc; };
|
||||
|
|
|
|||
1026
Makefile.in
1026
Makefile.in
File diff suppressed because it is too large
Load Diff
|
|
@ -2774,6 +2774,7 @@ target_libraries="target-libgcc \
|
|||
target-libstdc++-v3 \
|
||||
target-libmudflap \
|
||||
target-libsanitizer \
|
||||
target-libvtv \
|
||||
target-libssp \
|
||||
target-libquadmath \
|
||||
target-libgfortran \
|
||||
|
|
@ -3215,6 +3216,25 @@ $as_echo "yes" >&6; }
|
|||
fi
|
||||
fi
|
||||
|
||||
# Disable libvtv on unsupported systems.
|
||||
if test -d ${srcdir}/libvtv; then
|
||||
if test x$enable_libvtv = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libvtv support" >&5
|
||||
$as_echo_n "checking for libvtv support... " >&6; }
|
||||
if (srcdir=${srcdir}/libvtv; \
|
||||
. ${srcdir}/configure.tgt; \
|
||||
test "$VTV_SUPPORTED" != "yes")
|
||||
then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
noconfigdirs="$noconfigdirs target-libvtv"
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Disable libquadmath for some systems.
|
||||
case "${target}" in
|
||||
avr-*-*)
|
||||
|
|
@ -6551,11 +6571,11 @@ case ,${enable_languages},:${enable_objc_gc} in
|
|||
;;
|
||||
esac
|
||||
|
||||
# Disable libitm and libsanitizer if we're not building C++
|
||||
# Disable libitm, libsanitizer, libvtv if we're not building C++
|
||||
case ,${enable_languages}, in
|
||||
*,c++,*) ;;
|
||||
*)
|
||||
noconfigdirs="$noconfigdirs target-libitm target-libsanitizer"
|
||||
noconfigdirs="$noconfigdirs target-libitm target-libsanitizer target-libvtv"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -7032,6 +7052,11 @@ if echo " ${target_configdirs} " | grep " libsanitizer " > /dev/null 2>&1 ; then
|
|||
bootstrap_target_libs=${bootstrap_target_libs}target-libsanitizer,
|
||||
fi
|
||||
|
||||
# If we are building libvtv, bootstrap it.
|
||||
if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 ; then
|
||||
bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
|
||||
fi
|
||||
|
||||
# Determine whether gdb needs tk/tcl or not.
|
||||
# Use 'maybe' since enable_gdbtk might be true even if tk isn't available
|
||||
# and in that case we want gdb to be built without tk. Ugh!
|
||||
|
|
@ -13747,7 +13772,7 @@ else
|
|||
esac
|
||||
if test $ok = yes; then
|
||||
# An in-tree tool is available and we can use it
|
||||
CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
|
||||
CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs'
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
|
||||
$as_echo "just compiled" >&6; }
|
||||
elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
|
||||
|
|
@ -13792,7 +13817,7 @@ else
|
|||
esac
|
||||
if test $ok = yes; then
|
||||
# An in-tree tool is available and we can use it
|
||||
RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
|
||||
RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs'
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
|
||||
$as_echo "just compiled" >&6; }
|
||||
elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
|
||||
|
|
|
|||
30
configure.ac
30
configure.ac
|
|
@ -161,6 +161,7 @@ target_libraries="target-libgcc \
|
|||
target-libstdc++-v3 \
|
||||
target-libmudflap \
|
||||
target-libsanitizer \
|
||||
target-libvtv \
|
||||
target-libssp \
|
||||
target-libquadmath \
|
||||
target-libgfortran \
|
||||
|
|
@ -554,6 +555,22 @@ if test -d ${srcdir}/libsanitizer; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# Disable libvtv on unsupported systems.
|
||||
if test -d ${srcdir}/libvtv; then
|
||||
if test x$enable_libvtv = x; then
|
||||
AC_MSG_CHECKING([for libvtv support])
|
||||
if (srcdir=${srcdir}/libvtv; \
|
||||
. ${srcdir}/configure.tgt; \
|
||||
test "$VTV_SUPPORTED" != "yes")
|
||||
then
|
||||
AC_MSG_RESULT([no])
|
||||
noconfigdirs="$noconfigdirs target-libvtv"
|
||||
else
|
||||
AC_MSG_RESULT([yes])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Disable libquadmath for some systems.
|
||||
case "${target}" in
|
||||
avr-*-*)
|
||||
|
|
@ -2037,11 +2054,11 @@ case ,${enable_languages},:${enable_objc_gc} in
|
|||
;;
|
||||
esac
|
||||
|
||||
# Disable libitm and libsanitizer if we're not building C++
|
||||
# Disable libitm, libsanitizer, libvtv if we're not building C++
|
||||
case ,${enable_languages}, in
|
||||
*,c++,*) ;;
|
||||
*)
|
||||
noconfigdirs="$noconfigdirs target-libitm target-libsanitizer"
|
||||
noconfigdirs="$noconfigdirs target-libitm target-libsanitizer target-libvtv"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -2467,6 +2484,11 @@ if echo " ${target_configdirs} " | grep " libsanitizer " > /dev/null 2>&1 ; then
|
|||
bootstrap_target_libs=${bootstrap_target_libs}target-libsanitizer,
|
||||
fi
|
||||
|
||||
# If we are building libvtv, bootstrap it.
|
||||
if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 ; then
|
||||
bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
|
||||
fi
|
||||
|
||||
# Determine whether gdb needs tk/tcl or not.
|
||||
# Use 'maybe' since enable_gdbtk might be true even if tk isn't available
|
||||
# and in that case we want gdb to be built without tk. Ugh!
|
||||
|
|
@ -3163,10 +3185,10 @@ GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new])
|
|||
GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
|
||||
dnl see comments for CXX_FOR_TARGET_FLAG_TO_PASS
|
||||
GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
|
||||
[gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
|
||||
[gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs],
|
||||
c++)
|
||||
GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
|
||||
[gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
|
||||
[gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs],
|
||||
c++)
|
||||
GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool])
|
||||
GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
|
||||
|
|
|
|||
Loading…
Reference in New Issue