diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 21 | ||||
| -rw-r--r-- | gcc/ada/Makefile.in | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 41 | ||||
| -rw-r--r-- | gnattools/ChangeLog | 13 | ||||
| -rw-r--r-- | gnattools/Makefile.in | 10 |
5 files changed, 51 insertions, 38 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d7d0434ef7b..54fbac0c0fa 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,12 +1,21 @@ +2009-02-26 Andreas Schwab <schwab@suse.de> + + * Makefile.in (srcdir): Set to @top_srcdir@ instead of @srcdir@. + + * gcc-interface/Makefile.in: Change all uses of $(srcdir), + $(fsrcdir) and $(fsrcpfx) to add ada subdir. + (AWK): Substitute. + (target_cpu_default): Substitute. + 2009-02-25 Laurent GUERBY <laurent@guerby.net> - * a-teioed.adb (Expand): Fix Result overflow. - + * a-teioed.adb (Expand): Fix Result overflow. + 2009-02-25 Laurent GUERBY <laurent@guerby.net> - * gcc-interface/Makefile.in: Fix multilib handling for - sparc64-linux. - + * gcc-interface/Makefile.in: Fix multilib handling for + sparc64-linux. + 2009-02-23 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * s-oscons-tmplt.c [__osf__ && !_SS_MAXSIZE]: Undef AF_UNIX6. @@ -53,7 +62,7 @@ 2009-01-31 Laurent GUERBY <laurent@guerby.net> * gcc-interface/Makefile.in: Fix mipsel linux handling. - + 2009-01-16 Jakub Jelinek <jakub@redhat.com> * gcc-interface/Makefile.in: Fix multilib handling for diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index 9f223c4195c..a662b20474f 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -1,3 +1,5 @@ -srcdir = @srcdir@ +# All makefile fragments assume that $(srcdir) points to the gcc +# directory, not the language subdir +srcdir = @top_srcdir@ -include ./gcc-interface/Makefile -include ../gcc-interface/Makefile diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 954288ee4bc..cec096e77e3 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -90,6 +90,7 @@ AR_FLAGS = rc LS = ls RANLIB = @RANLIB@ RANLIB_FLAGS = @ranlib_flags@ +AWK = @AWK@ SHELL = @SHELL@ PWD_COMMAND = $${PWDCMD-pwd} @@ -148,11 +149,12 @@ target=@target@ xmake_file = @xmake_file@ tmake_file = @tmake_file@ host_canonical=@host@ +target_cpu_default=@target_cpu_default@ #version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c` #mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c` # Directory where sources are, from where we are. -VPATH = $(srcdir) +VPATH = $(srcdir)/ada fsrcdir := $(shell cd $(srcdir);${PWD_COMMAND}) fsrcpfx := $(shell cd $(srcdir);${PWD_COMMAND})/ @@ -189,19 +191,14 @@ all: all.indirect # This tells GNU Make version 3 not to put all variables in the environment. .NOEXPORT: -# tmake_file and xmake_file expand to lists with entries of the form -# $(srcdir)/config/... but here $(srcdir) is the ada subdirectory so we -# need to adjust the paths. There can't be spaces in the subst arguments -# or we get spurious spaces in the actual list of files to include. - # target overrides ifneq ($(tmake_file),) -include $(subst /config,/../config,$(tmake_file)) +include $(tmake_file) endif # host overrides ifneq ($(xmake_file),) -include $(subst /config,/../config,$(xmake_file)) +include $(xmake_file) endif # Now figure out from those variables how to compile and link. @@ -236,14 +233,14 @@ TOOLS_LIBS = $(EXTRA_GNATTOOLS_OBJS) targext.o link.o $(LIBGNAT) ../../../libibe # Both . and srcdir are used, in that order, # so that tm.h and config.h will be found in the compilation # subdirectory rather than in the source directory. -INCLUDES = -I- -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config \ - -I$(srcdir)/../../include +INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/config \ + -I$(srcdir)/../include -ADA_INCLUDES = -I- -I. -I$(srcdir) +ADA_INCLUDES = -I- -I. -I$(srcdir)/ada -INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir) -I$(fsrcdir)/../config \ - -I$(fsrcdir)/../../include -I$(fsrcdir)/.. -ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir) -I$(fsrcdir)/gcc +INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada -I$(fsrcdir)/config \ + -I$(fsrcdir)/../include -I$(fsrcdir) +ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada # Avoid a lot of time thinking about remaking Makefile.in and *.def. .SUFFIXES: .in .def @@ -266,7 +263,7 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir) -I$(fsrcdir)/gcc $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION) # how to regenerate this file -Makefile: ../config.status $(srcdir)/gcc-interface/Makefile.in $(srcdir)/Makefile.in $(srcdir)/../version.c +Makefile: ../config.status $(srcdir)/ada/gcc-interface/Makefile.in $(srcdir)/ada/Makefile.in $(srcdir)/version.c cd ..; \ LANGUAGES="$(CONFIG_LANGUAGES)" \ CONFIG_HEADERS= \ @@ -392,7 +389,7 @@ DUMMY_SOCKETS_TARGET_PAIRS = \ g-sothco.ads<g-sothco-dummy.ads \ g-sttsne.ads<g-sttsne-dummy.ads -LIB_VERSION = $(strip $(shell grep ' Library_Version :' $(fsrcpfx)gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/')) +LIB_VERSION = $(strip $(shell grep ' Library_Version :' $(fsrcpfx)ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/')) # $(filter-out PATTERN...,TEXT) removes all PATTERN words from TEXT. # $(strip STRING) removes leading and trailing spaces from STRING. @@ -1334,7 +1331,7 @@ endif ../../vms_help$(exeext) \ ../../gnat.hlp # This command transforms (YYYYMMDD) into YY,MMDD - GSMATCH_VERSION := $(shell grep "^ *Gnat_Static_Version_String" $(fsrcpfx)gnatvsn.ads | sed -e 's/.*(\(.*\)).*/\1/' -e 's/\(..\)\(..\)\(....\).*/\2,\3/') + GSMATCH_VERSION := $(shell grep "^ *Gnat_Static_Version_String" $(fsrcpfx)ada/gnatvsn.ads | sed -e 's/.*(\(.*\)).*/\1/' -e 's/\(..\)\(..\)\(....\).*/\2,\3/') TOOLS_LIBS_LO := --for-linker=sys\\$$\$$library:trace.exe LIBRARY_VERSION := $(subst .,_,$(LIB_VERSION)) endif @@ -1808,7 +1805,7 @@ LIBGNAT_OBJS = adaint.o argv.o cio.o cstreams.o ctrl_c.o errno.o exit.o env.o \ # GNATRTL_NONTASKING_OBJS and GNATRTL_TASKING_OBJS can be found in # the following include file: -include $(fsrcdir)/Makefile.rtl +include $(fsrcdir)/ada/Makefile.rtl GNATRTL_LINEARALGEBRA_OBJS = a-nlcoar.o a-nllcar.o a-nllrar.o a-nlrear.o \ a-nucoar.o a-nurear.o i-forbla.o i-forlap.o s-gearop.o @@ -1993,14 +1990,14 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR) $(CHMOD) u+w $(RTSDIR) # Copy target independent sources $(foreach f,$(ADA_INCLUDE_SRCS) $(LIBGNAT_SRCS), \ - $(LN_S) $(fsrcpfx)$(f) $(RTSDIR) ;) true + $(LN_S) $(fsrcpfx)ada/$(f) $(RTSDIR) ;) true # Remove files to be replaced by target dependent sources $(RM) $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \ $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)))) $(RM) $(RTSDIR)/*-*-*.ads $(RTSDIR)/*-*-*.adb # Copy new target dependent sources $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \ - $(LN_S) $(fsrcpfx)$(word 2,$(subst <, ,$(PAIR))) \ + $(LN_S) $(fsrcpfx)ada/$(word 2,$(subst <, ,$(PAIR))) \ $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));) # Copy generated target dependent sources $(RM) $(RTSDIR)/s-oscons.ads @@ -2372,5 +2369,5 @@ force: $(GNATLINK) -v vms_help -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) ../../gnat.hlp: ../../vms_help$(exeext) - ../../vms_help$(exeext) $(fsrcdir)/gnat.help_in \ - $(fsrcdir)/vms_data.ads ../../gnat.hlp + ../../vms_help$(exeext) $(fsrcdir)/ada/gnat.help_in \ + $(fsrcdir)/ada/vms_data.ads ../../gnat.hlp diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index 169a0143f99..7139322df5b 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,3 +1,9 @@ +2009-02-26 Andreas Schwab <schwab@suse.de> + + * Makefile.in (fsrcdir): Point to gcc directory, not gcc/ada. + (INCLUDES_FOR_SUBDIR): Adjust. + (ADA_INCLUDES_FOR_SUBDIR): Adjust. + 2008-08-01 Paolo Bonzini <bonzini@gnu.org> * configure.ac (warn_cflags): Substitute. @@ -105,8 +111,8 @@ 2005-02-02 Nathanael Nerode <neroden@gcc.gnu.org> - * Makefile.in: Remove use of cc_set_by_configure; just use - plain old CC from the top level in this case. + * Makefile.in: Remove use of cc_set_by_configure; just use + plain old CC from the top level in this case. 2005-01-30 Nathanael Nerode <neroden@gcc.gnu.org> Merge from mainline at tag libada-gnattools-merge-20050129: @@ -115,7 +121,7 @@ 2004-12-13 Nathanael Nerode <neroden@gcc.gnu.org> - * Makefile.in: Reinstate stamp-gnatlib check. + * Makefile.in: Reinstate stamp-gnatlib check. 2004-12-02 Nathanael Nerode <neroden@gcc.gnu.org> @@ -146,4 +152,3 @@ Copyright 2004, 2005 Free Software Foundation, Inc. This ChangeLog is free software; the Free Software Foundation gives unlimited permission to copy, distribute, and modify it. - diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index ed40ba54411..de887c0a537 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -56,13 +56,13 @@ ADAFLAGS= -gnatpg -gnata # For finding the GCC build dir, which is used far too much GCC_DIR=../gcc -# Absolute srcdir for gcc/ada (why do we want absolute? I dunno) -fsrcdir := $(shell cd $(srcdir)/../gcc/ada/; ${PWD_COMMAND}) +# Absolute srcdir for gcc (why do we want absolute? I dunno) +fsrcdir := $(shell cd $(srcdir)/../gcc/; ${PWD_COMMAND}) # Useful "subroutines" for the excess includes -INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir) -I$(fsrcdir)/../config \ - -I$(fsrcdir)/../../include -I$(fsrcdir)/.. -ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir) +INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada -I$(fsrcdir)/config \ + -I$(fsrcdir)/../include -I$(fsrcdir) +ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada # Variables for gnattools1, native TOOLS_FLAGS_TO_PASS_1= \ |