diff options
| author | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2018-12-11 23:04:39 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2018-12-11 23:04:39 +0000 |
| commit | 3b31a906085899ffea090ef9945ffda785dcad78 (patch) | |
| tree | 999a51362e3680534f9080d66c4c7db477a7f213 /gcc | |
| parent | be68937be28ad63bd6f7a75d0fa5c851ba4afc2b (diff) | |
| download | gcc-3b31a906085899ffea090ef9945ffda785dcad78.zip gcc-3b31a906085899ffea090ef9945ffda785dcad78.tar.gz gcc-3b31a906085899ffea090ef9945ffda785dcad78.tar.bz2 | |
re PR ada/88429 (libada build fails with --disable-shared)
libada/
PR ada/88429
* configure.ac (default_gnatlib_target): Set to gnatlib instead of
gnatlib-plain if --disable-shared.
* configure: Regenerate.
* Makefile.in (all): Replace gnatlib prerequisite with libada.
(ADA_RTS_SUBDIR): Delete.
(libada): New target, renamed from...
(gnatlib): ...this. Merge with other library targets.
(gnatlib-plain): Delete.
(install-gnatlib): Rename to...
(install-libada): ...this.
(install): Replace install-gnatlib prerequisite with install-libada.
gcc/ada/
PR ada/88429
* gcc-interface/Makefile.in (./stamp-gnatlib1-$(RTSDIR)): Also pass
MULTISUBDIR to sub-make and add quotes around $(THREAD_KIND).
(gnatlib-shared-dual): Also pass PICFLAG_FOR_TARGET to sub-make.
(gnatlib-sjlj): Also pass MULTISUBDIR to sub-make, but do not pass
PICFLAG_FOR_TARGET.
(gnatlib-zcx): Likewise.
From-SVN: r267034
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/ada/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 23 |
3 files changed, 27 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 94c7ca7..566f5606 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -10,7 +10,7 @@ error when stack pointer is clobbered. (expand_asm_stmt): Refactor clobber check in separate function. -2018-12-11 Eric Botcazou <botcazou@adacore.com> +2018-12-11 Eric Botcazou <ebotcazou@adacore.com> * config/rs6000/vxworks.h (RS6000_STARTING_FRAME_OFFSET): Define, accounting for STACK_BOUNDARY 128. diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c0ba34a..f04a052 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,7 +1,16 @@ +2018-12-11 Eric Botcazou <ebotcazou@adacore.com> + + PR ada/88429 + * gcc-interface/Makefile.in (./stamp-gnatlib1-$(RTSDIR)): Also pass + MULTISUBDIR to sub-make and add quotes around $(THREAD_KIND). + (gnatlib-shared-dual): Also pass PICFLAG_FOR_TARGET to sub-make. + (gnatlib-sjlj): Also pass MULTISUBDIR to sub-make, but do not pass + PICFLAG_FOR_TARGET. + (gnatlib-zcx): Likewise. + 2018-12-11 Piotr Trojanek <trojanek@adacore.com> - * libgnat/a-calend.ads: Add "Global => null" contracts to pure - routines. + * libgnat/a-calend.ads: Add "Global => null" contract to pure routines. 2018-12-11 Hristian Kirtchev <kirtchev@adacore.com> diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 07dc1e5..4e74252 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1,5 +1,5 @@ # Makefile for GNU Ada Compiler (GNAT). -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. #This file is part of GCC. @@ -564,7 +564,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR) install-gcc-specs $(RM) ../stamp-gnatlib-$(RTSDIR) ../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR) - $(MAKE) THREAD_KIND=$(THREAD_KIND) setup-rts + $(MAKE) MULTISUBDIR="$(MULTISUBDIR)" THREAD_KIND="$(THREAD_KIND)" setup-rts # Copy tsystem.h $(CP) $(srcdir)/tsystem.h $(RTSDIR) $(RM) ../stamp-gnatlib-$(RTSDIR) @@ -688,6 +688,7 @@ gnatlib-shared-dual: GNATLIBFLAGS="$(GNATLIBFLAGS)" \ GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \ + PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \ MULTISUBDIR="$(MULTISUBDIR)" \ THREAD_KIND="$(THREAD_KIND)" \ gnatlib-shared-default @@ -804,8 +805,11 @@ gnatlib-shared: # commenting the pragma instead of deleting the line, as the latter might # result in getting multiple blank lines, hence possible style check errors. gnatlib-sjlj: - $(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="" \ - THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR) + $(MAKE) $(FLAGS_TO_PASS) \ + EH_MECHANISM="" \ + MULTISUBDIR="$(MULTISUBDIR)" \ + THREAD_KIND="$(THREAD_KIND)" \ + ../stamp-gnatlib1-$(RTSDIR) sed \ -e 's/Frontend_Exceptions.*/Frontend_Exceptions : constant Boolean := True;/' \ -e 's/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := False;/' \ @@ -819,11 +823,14 @@ gnatlib-sjlj: FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \ MULTISUBDIR="$(MULTISUBDIR)" \ THREAD_KIND="$(THREAD_KIND)" \ - PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" gnatlib + gnatlib gnatlib-zcx: - $(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="-gcc" \ - THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR) + $(MAKE) $(FLAGS_TO_PASS) \ + EH_MECHANISM="-gcc" \ + MULTISUBDIR="$(MULTISUBDIR)" \ + THREAD_KIND="$(THREAD_KIND)" \ + ../stamp-gnatlib1-$(RTSDIR) sed \ -e 's/Frontend_Exceptions.*/Frontend_Exceptions : constant Boolean := False;/' \ -e 's/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := True;/' \ @@ -837,7 +844,7 @@ gnatlib-zcx: FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \ MULTISUBDIR="$(MULTISUBDIR)" \ THREAD_KIND="$(THREAD_KIND)" \ - PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" gnatlib + gnatlib # Compiling object files from source files. |