- we use compat-gcc-34 only for c/c++ (qemu,vbox purposes).

Changed files:
    compat-gcc-34-ada-link-new-libgnat.patch -> 1.2
    compat-gcc-34-ada-link.patch -> 1.2

diff --git a/compat-gcc-34-ada-link-new-libgnat.patch b/compat-gcc-34-ada-link-new-libgnat.patch
deleted file mode 100644 (file)
index 59ee893..0000000
--- a/compat-gcc-34-ada-link-new-libgnat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-3.4-20040611/gcc/ada/Make-lang.in.orig 2004-06-09 11:20:41.000000000 +0200
-+++ gcc-3.4-20040611/gcc/ada/Make-lang.in      2004-06-12 03:38:09.373698608 +0200
-@@ -446,7 +446,7 @@
- ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb
-       -$(MKDIR) ada/doctools
-       $(CP) $^ ada/doctools
--      cd ada/doctools && gnatmake -q xgnatugn
-+      cd ada/doctools && gnatmake -q xgnatugn -a0../rts
- 
- doc/gnat_ugn_unw.texi : ada/doctools/xgnatugn$(build_exeext) \
-       $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words

diff --git a/compat-gcc-34-ada-link.patch b/compat-gcc-34-ada-link.patch
deleted file mode 100644 (file)
index 339e870..0000000
--- a/compat-gcc-34-ada-link.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- gcc-3.4.0/gcc/ada/link.c.orig      Mon Jan 12 12:45:24 2004
-+++ gcc-3.4.0/gcc/ada/link.c   Tue Jun  1 15:57:42 2004
-@@ -165,9 +165,9 @@
- 
- #elif defined (linux)
- const char *object_file_option = "";
--const char *run_path_option = "-Wl,-rpath,";
--char shared_libgnat_default = STATIC;
--int link_max = 8192;
-+const char *run_path_option = "";
-+char shared_libgnat_default = SHARED;
-+int link_max = 131072;
- unsigned char objlist_file_supported = 1;
- unsigned char using_gnu_linker = 1;
- const char *object_library_extension = ".a";
---- gcc-3.4.0/gcc/ada/Makefile.in.orig Mon Apr 26 11:19:09 2004
-+++ gcc-3.4.0/gcc/ada/Makefile.in      Tue Jun  1 15:58:33 2004
-@@ -142,7 +142,7 @@
- objext = .o
- exeext =
- arext  = .a
--soext  = .so
-+soext  = .so.1
- shext  =
- 
- # Define this as & to perform parallel make on a Sequent.
-@@ -1269,6 +1269,90 @@
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
- 
-+ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
-+  LIBGNAT_TARGET_PAIRS = \
-+  a-intnam.ads<4lintnam.ads \
-+  s-inmaop.adb<7sinmaop.adb \
-+  s-intman.adb<7sintman.adb \
-+  s-osinte.ads<5iosinte.ads \
-+  s-osinte.adb<5iosinte.adb \
-+  s-osprim.adb<7sosprim.adb \
-+  s-taprop.adb<5itaprop.adb \
-+  s-tpopsp.adb<5atpopsp.adb \
-+  s-taspri.ads<5itaspri.ads \
-+  system.ads<5nsystem.ads
-+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
-+  THREADSLIB=-lpthread
-+  GNATLIB_SHARED=gnatlib-shared-dual
-+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
-+  LIBRARY_VERSION := $(LIB_VERSION)
-+endif
-+
-+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
-+  LIBGNAT_TARGET_PAIRS = \
-+  a-intnam.ads<4lintnam.ads \
-+  s-inmaop.adb<7sinmaop.adb \
-+  s-intman.adb<7sintman.adb \
-+  s-osinte.ads<5iosinte.ads \
-+  s-osinte.adb<5iosinte.adb \
-+  s-osprim.adb<7sosprim.adb \
-+  s-taprop.adb<5itaprop.adb \
-+  s-tpopsp.adb<5atpopsp.adb \
-+  s-taspri.ads<5itaspri.ads
-+#  system.ads<5ssystem.ads  (Tick and Stack_Check_Probes differ)
-+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
-+  THREADSLIB=-lpthread
-+  GNATLIB_SHARED=gnatlib-shared-dual
-+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
-+  LIBRARY_VERSION := $(LIB_VERSION)
-+endif
-+
-+ifeq ($(strip $(filter-out ppc% linux%,$(arch) $(osys))),)
-+  LIBGNAT_TARGET_PAIRS = \
-+  a-intnam.ads<4lintnam.ads \
-+  s-inmaop.adb<7sinmaop.adb \
-+  s-intman.adb<7sintman.adb \
-+  s-osinte.ads<5iosinte.ads \
-+  s-osinte.adb<5iosinte.adb \
-+  s-osprim.adb<7sosprim.adb \
-+  s-taprop.adb<5itaprop.adb \
-+  s-tpopsp.adb<5atpopsp.adb \
-+  s-taspri.ads<5itaspri.ads
-+#  system.ads<59system.ads  (???)
-+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
-+  THREADSLIB=-lpthread
-+  GNATLIB_SHARED=gnatlib-shared-dual
-+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
-+  LIBRARY_VERSION := $(LIB_VERSION)
-+endif
-+
-+ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),)
-+  LIBGNAT_TARGET_PAIRS = \
-+  a-intnam.ads<4lintnam.ads \
-+  s-inmaop.adb<7sinmaop.adb \
-+  s-intman.adb<7sintman.adb \
-+  s-osinte.ads<5iosinte.ads \
-+  s-osinte.adb<5iosinte.adb \
-+  s-osprim.adb<7sosprim.adb \
-+  s-taprop.adb<5itaprop.adb \
-+  s-tpopsp.adb<5atpopsp.adb \
-+  s-taspri.ads<5itaspri.ads
-+#  system.ads<59system.ads  (???)
-+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
-+  THREADSLIB=-lpthread
-+  GNATLIB_SHARED=gnatlib-shared-dual
-+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
-+  LIBRARY_VERSION := $(LIB_VERSION)
-+endif
-+
-+ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
-+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
-+  THREADSLIB=-lpthread
-+  GNATLIB_SHARED=gnatlib-shared-dual
-+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
-+  LIBRARY_VERSION := $(LIB_VERSION)
-+endif
-+
- ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<4lintnam.ads \
-@@ -1767,6 +1840,9 @@
- # is guaranteed to overflow the buffer.
- 
- gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
-+      $(RMDIR) save
-+      $(MKDIR) save
-+      $(MV) *.o save/
-       $(MAKE) -C rts CC="../../xgcc -B../../" \
-               INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
-                 CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \
-@@ -1779,6 +1855,8 @@
-               srcdir=$(fsrcdir) \
-               -f ../Makefile \
-               $(GNATRTL_OBJS)
-+      $(MV) save/*.o .
-+      $(RMDIR) save
-       $(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
-       $(AR) $(AR_FLAGS) rts/libgnat$(arext) \
-          $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
-@@ -1891,14 +1969,15 @@
-            THREAD_KIND="$(THREAD_KIND)" \
-              gnatlib
-       $(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
--      cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-+      cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
-               -o libgnat-$(LIBRARY_VERSION)$(soext) \
-               $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-               $(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) $(MISCLIB) -lm
-       cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-               -o libgnarl-$(LIBRARY_VERSION)$(soext) \
-               $(GNATRTL_TASKING_OBJS) \
--              $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB)
-+              $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB) \
-+              ./libgnat-$(LIBRARY_VERSION)$(soext)
-       cd rts; $(LN_S) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
-       cd rts; $(LN_S) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
-