diff options
| author | Jeff Law <law@redhat.com> | 2011-11-30 05:16:36 +0000 |
|---|---|---|
| committer | Jeff Law <law@redhat.com> | 2011-11-30 05:16:36 +0000 |
| commit | 7b5177cc9956a68a50825c443a6d396fdc1af2b5 (patch) | |
| tree | a6b80dca8f72a2e7640e4d535901e42325b2a954 /gcc/ada/gcc-interface/Makefile.in | |
| parent | 6377b0d9b395f395e25bd4a030a9056171433061 (diff) | |
| parent | ee4a734e5eece9824adc2a26e518c99bbdbe802e (diff) | |
Weekly merge from trunk. No regressions.reload-v2a
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/reload-v2a@181834 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/gcc-interface/Makefile.in')
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index d000b5df779..ad8917fcd29 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -273,15 +273,9 @@ INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/config \ ADA_INCLUDES = -I- -I. -I$(srcdir)/ada -INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. -iquote $(fsrcdir)/ada \ - -I$(fsrcdir)/../include - -ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),) - # On Windows native the tconfig.h files used by C runtime files needs to have - # the gcc source dir in its include dir list - INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. -iquote $(fsrcdir)/ada \ - -I$(fsrcdir)/../include -I$(fsrcdir) -endif +INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \ + -iquote $(fsrcdir)/ada -iquote $(fsrcdir) \ + -I$(fsrcdir)/../include ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada @@ -1162,6 +1156,7 @@ ifeq ($(strip $(filter-out %86 kfreebsd%,$(arch) $(osys))),) GNATLIB_SHARED = gnatlib-shared-dual GMEM_LIB = gmemlib LIBRARY_VERSION := $(LIB_VERSION) + MISCLIB = -lutil endif ifeq ($(strip $(filter-out x86_64 kfreebsd%,$(arch) $(osys))),) @@ -1215,6 +1210,7 @@ ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),) THREADSLIB= -lpthread GMEM_LIB = gmemlib LIBRARY_VERSION := $(LIB_VERSION) + MISCLIB = -lutil endif ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),) @@ -1241,6 +1237,7 @@ ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),) THREADSLIB= -lpthread GMEM_LIB = gmemlib LIBRARY_VERSION := $(LIB_VERSION) + MISCLIB = -lutil endif ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),) @@ -2182,7 +2179,6 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) EH_MECHANISM=-gcc GNATLIB_SHARED = gnatlib-shared-darwin - RANLIB = ranlib -c GMEM_LIB = gmemlib LIBRARY_VERSION := $(LIB_VERSION) soext = .dylib @@ -2220,12 +2216,13 @@ LIBGNAT_SRCS = adadecode.c adadecode.h adaint.c adaint.h \ argv.c cio.c cstreams.c errno.c exit.c cal.c ctrl_c.c env.c env.h \ arit64.c raise.h raise.c sysdep.c aux-io.c init.c initialize.c \ locales.c seh_init.c final.c tracebak.c tb-alvms.c tb-alvxw.c \ - tb-gcc.c expect.c mkdir.c socket.c gsocket.h targext.c $(EXTRA_LIBGNAT_SRCS) + tb-gcc.c expect.c mkdir.c socket.c gsocket.h targext.c \ + terminals.c $(EXTRA_LIBGNAT_SRCS) LIBGNAT_OBJS = adadecode.o adaint.o argv.o cio.o cstreams.o ctrl_c.o \ errno.o exit.o env.o raise.o sysdep.o aux-io.o init.o initialize.o \ locales.o seh_init.o cal.o arit64.o final.o tracebak.o expect.o \ - mkdir.o socket.o targext.o $(EXTRA_LIBGNAT_OBJS) + mkdir.o socket.o targext.o terminals.o $(EXTRA_LIBGNAT_OBJS) # NOTE ??? - when the -I option for compiling Ada code is made to work, # the library installation will change and there will be a @@ -2866,6 +2863,7 @@ socket.o : socket.c gsocket.h sysdep.o : sysdep.c raise.o : raise.c raise.h sigtramp-ppcvxw.o : sigtramp-ppcvxw.c sigtramp.h +terminals.o : terminals.c vx_stack_info.o : vx_stack_info.c raise-gcc.o : raise-gcc.c raise.h |