gcc/patches/gcc46-hack.patch0

   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 @@ -69,18 +69,40 @@ version := $(shell cat $(srcdir)/../gcc/
   4  libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
   5  ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
   6
   7 +DEFAULTMULTIFLAGS :=
   8 +ifeq ($(MULTISUBDIR),)
   9 +targ:=$(subst -, ,$(target))
  10 +arch:=$(word 1,$(targ))
  11 +ifeq ($(words $(targ)),2)
  12 +osys:=$(word 2,$(targ))
  13 +else
  14 +osys:=$(word 3,$(targ))
  15 +endif
  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
  19 +else
  20 +ifeq ($(strip $(filter-out s390%, $(arch))),)
  21 +DEFAULTMULTIFLAGS := -m31
  22 +else
  23 +DEFAULTMULTIFLAGS := -m32
  24 +endif
  25 +endif
  26 +endif
  27 +endif
  28 +
  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 = \
  34          "MAKEOVERRIDES=" \
  35 -        "LDFLAGS=$(LDFLAGS)" \
  36 +        "LDFLAGS=$(strip $(LDFLAGS) $(DEFAULTMULTIFLAGS))" \
  37          "LN_S=$(LN_S)" \
  38          "SHELL=$(SHELL)" \
  39 -        "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS)" \
  40 -        "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS)" \
  41 -        "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS)" \
  42 +        "GNATLIBFLAGS=$(strip $(GNATLIBFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS))" \
  43 +        "GNATLIBCFLAGS=$(strip $(GNATLIBCFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS))" \
  44 +        "GNATLIBCFLAGS_FOR_C=$(strip $(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS))" \
  45          "TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
  46          "THREAD_KIND=$(THREAD_KIND)" \
  47          "TRACE=$(TRACE)" \
  48 @@ -91,7 +113,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)" \
  52 -        "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)"
  53 +        "CFLAGS=$(strip $(CFLAGS) $(DEFAULTMULTIFLAGS) $(WARN_CFLAGS))"
  54
  55  # Rules to build gnatlib.
  56  .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons
  57 --- gcc/ada/sem_util.adb        (revision 161677)
  58 +++ gcc/ada/sem_util.adb        (working copy)
  59 @@ -2246,7 +2246,11 @@
  60           end if;
  61
  62        elsif Is_Entity_Name (A2) then
  63 +
  64 +         --  Triggered by -Wall
  65 +         pragma Warnings (Off);
  66           return Denotes_Same_Prefix (A2, A1);
  67 +         pragma Warnings (On);
  68
  69        elsif Nkind_In (A1, N_Selected_Component, N_Indexed_Component, N_Slice)
  70                and then
  71 @@ -4694,7 +4698,7 @@
  72              Exp           : Node_Id;
  73              Assn          : Node_Id;
  74              Choice        : Node_Id;
  75 -            Comp_Type     : Entity_Id;
  76 +            Comp_Type     : Entity_Id := Empty;
  77              Is_Array_Aggr : Boolean;
  78
  79           begin
  80 --- config-ml.in.jj     2010-06-30 09:50:44.000000000 +0200
  81 +++ config-ml.in        2010-07-02 21:24:17.994211151 +0200
  82 @@ -516,6 +516,8 @@ multi-do:
  83                                 ADAFLAGS="$(ADAFLAGS) $${flags}" \
  84                                 prefix="$(prefix)" \
  85                                 exec_prefix="$(exec_prefix)" \
  86 +                               mandir="$(mandir)" \
  87 +                               infodir="$(infodir)" \
  88                                 GCJFLAGS="$(GCJFLAGS) $${flags}" \
  89                                 GOCFLAGS="$(GOCFLAGS) $${flags}" \
  90                                 CXXFLAGS="$(CXXFLAGS) $${flags}" \
  91 --- libjava/Makefile.am.jj      2010-07-09 11:17:33.729604090 +0200
  92 +++ libjava/Makefile.am 2010-07-09 13:16:41.894375641 +0200
  93 @@ -710,7 +710,8 @@ if USE_LIBGCJ_BC
  94  ## later.
  95         @echo Installing dummy lib libgcj_bc.so.1.0.0; \
  96         rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
  97 -       mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
  98 +       $(INSTALL) $(INSTALL_STRIP_FLAG) $(here)/.libs/libgcj_bc.so $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
  99 +       rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0; \
 100         $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
 101         -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
 102         rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
 103 --- libjava/Makefile.in.jj      2010-07-09 11:17:34.000000000 +0200
 104 +++ libjava/Makefile.in 2010-07-09 13:18:07.542572270 +0200
 105 @@ -12665,7 +12665,8 @@ install-exec-hook: install-binPROGRAMS i
 106         install-libexecsubPROGRAMS
 107  @USE_LIBGCJ_BC_TRUE@   @echo Installing dummy lib libgcj_bc.so.1.0.0; \
 108  @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
 109 -@USE_LIBGCJ_BC_TRUE@   mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
 110 +@USE_LIBGCJ_BC_TRUE@   $(INSTALL) $(INSTALL_STRIP_FLAG) $(here)/.libs/libgcj_bc.so $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
 111 +@USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0; \
 112  @USE_LIBGCJ_BC_TRUE@   $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
 113  @USE_LIBGCJ_BC_TRUE@   -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
 114  @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \