diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-08-01 16:45:26 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-08-01 16:45:26 +0200 |
| commit | 9a30c7c4092fa2e7f46ee54883404a3fe34f2919 (patch) | |
| tree | 514c0aecb2430f2b39147e8bf572fd6c5dc59617 /gcc/ada/gcc-interface/Make-lang.in | |
| parent | 88b1a3221d1a03211d78dec931d0cc8d84b180cb (diff) | |
| download | gcc-9a30c7c4092fa2e7f46ee54883404a3fe34f2919.zip gcc-9a30c7c4092fa2e7f46ee54883404a3fe34f2919.tar.gz gcc-9a30c7c4092fa2e7f46ee54883404a3fe34f2919.tar.bz2 | |
[multiple changes]
2014-08-01 Olivier Hainque <hainque@adacore.com>
* gcc-interface/Make-lang.in (ADA_TOOLS_FLAGS_TO_PASS, native): use
$(CXX) instead of ../../xg++ to feed CXX.
(CXX_LFLAGS): Remove. Now unused as the proper flags
are expected to be included in the CXX variable.
2014-08-01 Pierre-Marie Derodat <derodat@adacore.com>
* gcc-interface/decl.c (elaborate_expression_1): Return the new
variable when debug info is needed and the expression is not
constant. Tag as external only new variables that are global.
(gnat_to_gnu_entity): Call it after the GNU declaration is saved.
* gcc-interface/trans.c (Attribute_to_gnu): Do not cache
attributes for IN array parameters when their actual subtype
needs debug info.
(Compilation_Unit_to_gnu): Call it to process all remaining nodes.
* gcc-interface/gigi.h (process_deferred_decl_context): New.
* gcc-interface/utils.c (gnat_write_global_declarations): Do not
emit debug info for ignored global declarations.
(struct deferred_decl_context_node,
add_deferred_decl_context, add_deferred_type_context,
compute_deferred_decl_context, defer_or_set_type_context,
deferred_decl_context_queue, get_debug_scope,
get_global_context, process_deferred_decl_context): New.
(gnat_pushdecl): Re-implement the DECL_CONTEXT and TYPE_CONTEXT
computation machinery to rely on the GNAT Scope attribute.
2014-08-01 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/utils2.c (build_simple_component_ref): Add guard.
From-SVN: r213482
Diffstat (limited to 'gcc/ada/gcc-interface/Make-lang.in')
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index fd44eb8..478272f 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -128,11 +128,12 @@ ada: gnat1$(exeext) gnatbind$(exeext) # Tell GNU Make to ignore these, if they exist. .PHONY: ada -CXX_LFLAGS = \ - -B../../../$(target_noncanonical)/libstdc++-v3/src/.libs \ - -B../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs \ - -L../../../$(target_noncanonical)/libstdc++-v3/src/.libs \ - -L../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs +# Compute the FLAGS to pass for gnattools, now linked with a C++ driver as +# we're linking against at least libcommon which contains C++ compiled code. +# We need to use the same driver to link as the one that was used to produce +# the objects, which depends on whether we're bootstrapping or not. The CXX +# variable conveys what we need for this, set to "g++" if not bootstrapping, +# ".../xg++" otherwise. # There are too many Ada sources to check against here. Let's # always force the recursive make. @@ -142,7 +143,7 @@ ifeq ($(build), $(host)) # tree. ADA_TOOLS_FLAGS_TO_PASS=\ CC="../../xgcc -B../../" \ - CXX="../../xg++ -B../../ $(CXX_LFLAGS)" \ + CXX="$(CXX)" \ $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ ADA_INCLUDES="-I- -I../rts" \ GNATMAKE="../../gnatmake" \ |