git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Eric Botcazou 2018-12-11 23:04:39 +00:00
parent be68937be2
commit 3b31a90608
7 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/ChangeLog
View File

@ -10,7 +10,7 @@
error when stack pointer is clobbered. error when stack pointer is clobbered.
(expand_asm_stmt): Refactor clobber check in separate function. (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, * config/rs6000/vxworks.h (RS6000_STARTING_FRAME_OFFSET): Define,
accounting for STACK_BOUNDARY 128. accounting for STACK_BOUNDARY 128.

13
gcc/ada/ChangeLog
View File

@ -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> 2018-12-11 Piotr Trojanek <trojanek@adacore.com>
* libgnat/a-calend.ads: Add "Global => null" contracts to pure * libgnat/a-calend.ads: Add "Global => null" contract to pure routines.
routines.
2018-12-11 Hristian Kirtchev <kirtchev@adacore.com> 2018-12-11 Hristian Kirtchev <kirtchev@adacore.com>

23
gcc/ada/gcc-interface/Makefile.in
View File

@ -1,5 +1,5 @@
# Makefile for GNU Ada Compiler (GNAT). # 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. #This file is part of GCC.
@ -564,7 +564,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR) install-gcc-specs
$(RM) ../stamp-gnatlib-$(RTSDIR) $(RM) ../stamp-gnatlib-$(RTSDIR)
../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(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 # Copy tsystem.h
$(CP) $(srcdir)/tsystem.h $(RTSDIR) $(CP) $(srcdir)/tsystem.h $(RTSDIR)
$(RM) ../stamp-gnatlib-$(RTSDIR) $(RM) ../stamp-gnatlib-$(RTSDIR)
@ -688,6 +688,7 @@ gnatlib-shared-dual:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \ GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
MULTISUBDIR="$(MULTISUBDIR)" \ MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \ THREAD_KIND="$(THREAD_KIND)" \
gnatlib-shared-default gnatlib-shared-default
@ -804,8 +805,11 @@ gnatlib-shared:
# commenting the pragma instead of deleting the line, as the latter might # commenting the pragma instead of deleting the line, as the latter might
# result in getting multiple blank lines, hence possible style check errors. # result in getting multiple blank lines, hence possible style check errors.
gnatlib-sjlj: gnatlib-sjlj:
$(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="" \ $(MAKE) $(FLAGS_TO_PASS) \
THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR) EH_MECHANISM="" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
../stamp-gnatlib1-$(RTSDIR)
sed \ sed \
-e 's/Frontend_Exceptions.*/Frontend_Exceptions : constant Boolean := True;/' \ -e 's/Frontend_Exceptions.*/Frontend_Exceptions : constant Boolean := True;/' \
-e 's/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := False;/' \ -e 's/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := False;/' \
@ -819,11 +823,14 @@ gnatlib-sjlj:
FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \ FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
MULTISUBDIR="$(MULTISUBDIR)" \ MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \ THREAD_KIND="$(THREAD_KIND)" \
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" gnatlib gnatlib
gnatlib-zcx: gnatlib-zcx:
$(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="-gcc" \ $(MAKE) $(FLAGS_TO_PASS) \
THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR) EH_MECHANISM="-gcc" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
../stamp-gnatlib1-$(RTSDIR)
sed \ sed \
-e 's/Frontend_Exceptions.*/Frontend_Exceptions : constant Boolean := False;/' \ -e 's/Frontend_Exceptions.*/Frontend_Exceptions : constant Boolean := False;/' \
-e 's/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := True;/' \ -e 's/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := True;/' \
@ -837,7 +844,7 @@ gnatlib-zcx:
FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \ FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
MULTISUBDIR="$(MULTISUBDIR)" \ MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \ THREAD_KIND="$(THREAD_KIND)" \
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" gnatlib gnatlib
# Compiling object files from source files. # Compiling object files from source files.

15
libada/ChangeLog
View File

@ -1,3 +1,18 @@
2018-12-11 Eric Botcazou <ebotcazou@adacore.com>
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.
2018-10-31 Joseph Myers <joseph@codesourcery.com> 2018-10-31 Joseph Myers <joseph@codesourcery.com>
PR bootstrap/82856 PR bootstrap/82856

23
libada/Makefile.in
View File

@ -16,7 +16,7 @@
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
# Default target; must be first. # Default target; must be first.
all: gnatlib all: libada
$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
.PHONY: all .PHONY: all
@ -70,7 +70,6 @@ target_noncanonical:=@target_noncanonical@
version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER) version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER)
libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR) libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR)) ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR))
# exeext should not be used because it's the *host* exeext. We're building # exeext should not be used because it's the *host* exeext. We're building
# a *target* library, aren't we?!? Likewise for CC. Still, provide bogus # a *target* library, aren't we?!? Likewise for CC. Still, provide bogus
@ -96,20 +95,12 @@ LIBADA_FLAGS_TO_PASS = \
"GCC_FOR_TARGET=$(CC)" \ "GCC_FOR_TARGET=$(CC)" \
"CFLAGS=$(CFLAGS)" "CFLAGS=$(CFLAGS)"
# Rules to build gnatlib. .PHONY: libada gnatlib gnatlib-shared gnatlib-sjlj gnatlib-zcx osconstool
.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
gnatlib: @default_gnatlib_target@
gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile # Rules to build and install libada.
test -f stamp-libada || \ libada: @default_gnatlib_target@
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \
&& touch stamp-libada
-rm -rf adainclude
-rm -rf adalib
$(LN_S_RECURSIVE) $(ADA_RTS_DIR) adainclude
$(LN_S_RECURSIVE) $(ADA_RTS_DIR) adalib
gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile gnatlib gnatlib-shared gnatlib-sjlj gnatlib-zcx: osconstool $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \ test -f stamp-libada || \
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \
&& touch stamp-libada && touch stamp-libada
@ -121,7 +112,7 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
osconstool: osconstool:
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons
install-gnatlib: $(GCC_DIR)/ada/Makefile install-libada: $(GCC_DIR)/ada/Makefile
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib
# Check uninstalled version. # Check uninstalled version.
@ -148,7 +139,7 @@ TAGS:
.PHONY: check installcheck info dvi pdf html .PHONY: check installcheck info dvi pdf html
# Installation rules. # Installation rules.
install: install-gnatlib install: install-libada
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE) $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
install-strip: install install-strip: install

2
libada/configure vendored
View File

@ -3264,7 +3264,7 @@ fi
if test ${enable_shared} = yes; then if test ${enable_shared} = yes; then
default_gnatlib_target="gnatlib-shared" default_gnatlib_target="gnatlib-shared"
else else
default_gnatlib_target="gnatlib-plain" default_gnatlib_target="gnatlib"
fi fi

2
libada/configure.ac
View File

@ -129,7 +129,7 @@ AC_PROG_LN_S
if test ${enable_shared} = yes; then if test ${enable_shared} = yes; then
default_gnatlib_target="gnatlib-shared" default_gnatlib_target="gnatlib-shared"
else else
default_gnatlib_target="gnatlib-plain" default_gnatlib_target="gnatlib"
fi fi
AC_SUBST([default_gnatlib_target]) AC_SUBST([default_gnatlib_target])