1 --- libada/Makefile.in.jj 2009-01-14 12:07:35.000000000 +0100
2 +++ libada/Makefile.in 2009-01-15 14:25:33.000000000 +0100
3 @@ -66,18 +66,40 @@ libsubdir := $(libdir)/gcc/$(target_nonc
4 ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
5 ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR))
8 +ifeq ($(MULTISUBDIR),)
9 +targ:=$(subst -, ,$(target))
10 +arch:=$(word 1,$(targ))
11 +ifeq ($(words $(targ)),2)
12 +osys:=$(word 2,$(targ))
14 +osys:=$(word 3,$(targ))
16 +ifeq ($(strip $(filter-out i%86 x86_64 powerpc% ppc% s390% sparc% linux%, $(arch) $(osys))),)
17 +ifeq ($(shell $(CC) $(CFLAGS) -print-multi-os-directory),../lib64)
18 +DEFAULTMULTIFLAGS := -m64
20 +ifeq ($(strip $(filter-out s390%, $(arch))),)
21 +DEFAULTMULTIFLAGS := -m31
23 +DEFAULTMULTIFLAGS := -m32
29 # exeext should not be used because it's the *host* exeext. We're building
30 # a *target* library, aren't we?!? Likewise for CC. Still, provide bogus
31 # definitions just in case something slips through the safety net provided
32 # by recursive make invocations in gcc/ada/Makefile.in
33 LIBADA_FLAGS_TO_PASS = \
35 - "LDFLAGS=$(LDFLAGS)" \
36 + "LDFLAGS=$(LDFLAGS) $(DEFAULTMULTIFLAGS)" \
39 - "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS)" \
40 - "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS)" \
41 - "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS)" \
42 + "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
43 + "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
44 + "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
45 "PICFLAG_FOR_TARGET=$(PICFLAG)" \
46 "THREAD_KIND=$(THREAD_KIND)" \
48 @@ -88,7 +110,7 @@ LIBADA_FLAGS_TO_PASS = \
49 "exeext=.exeext.should.not.be.used " \
50 'CC=the.host.compiler.should.not.be.needed' \
51 "GCC_FOR_TARGET=$(CC)" \
53 + "CFLAGS=$(CFLAGS) $(DEFAULTMULTIFLAGS)"
55 # Rules to build gnatlib.
56 .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
57 --- gcc/ada/sem_util.adb (revision 161677)
58 +++ gcc/ada/sem_util.adb (working copy)
59 @@ -5487,7 +5487,7 @@ package body Sem_Util is
63 - Comp_Type : Entity_Id;
64 + Comp_Type : Entity_Id := Empty;
65 Is_Array_Aggr : Boolean;
68 --- config-ml.in.jj 2010-06-30 09:50:44.000000000 +0200
69 +++ config-ml.in 2010-07-02 21:24:17.994211151 +0200
70 @@ -516,6 +516,8 @@ multi-do:
71 ADAFLAGS="$(ADAFLAGS) $${flags}" \
73 exec_prefix="$(exec_prefix)" \
74 + mandir="$(mandir)" \
75 + infodir="$(infodir)" \
76 GCJFLAGS="$(GCJFLAGS) $${flags}" \
77 GOCFLAGS="$(GOCFLAGS) $${flags}" \
78 CXXFLAGS="$(CXXFLAGS) $${flags}" \
79 --- libjava/Makefile.am.jj 2010-07-09 11:17:33.729604090 +0200
80 +++ libjava/Makefile.am 2010-07-09 13:16:41.894375641 +0200
81 @@ -710,7 +710,8 @@ if USE_LIBGCJ_BC
83 @echo Installing dummy lib libgcj_bc.so.1.0.0; \
84 rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
85 - mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
86 + $(INSTALL) $(INSTALL_STRIP_FLAG) $(here)/.libs/libgcj_bc.so $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
87 + rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0; \
88 $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
89 -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
90 rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
91 --- libjava/Makefile.in.jj 2010-07-09 11:17:34.000000000 +0200
92 +++ libjava/Makefile.in 2010-07-09 13:18:07.542572270 +0200
93 @@ -12665,7 +12665,8 @@ install-exec-hook: install-binPROGRAMS i
94 install-libexecsubPROGRAMS
95 @USE_LIBGCJ_BC_TRUE@ @echo Installing dummy lib libgcj_bc.so.1.0.0; \
96 @USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
97 -@USE_LIBGCJ_BC_TRUE@ mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
98 +@USE_LIBGCJ_BC_TRUE@ $(INSTALL) $(INSTALL_STRIP_FLAG) $(here)/.libs/libgcj_bc.so $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
99 +@USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0; \
100 @USE_LIBGCJ_BC_TRUE@ $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
101 @USE_LIBGCJ_BC_TRUE@ -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
102 @USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \