- kill config.sub hack

[packages/gcc.git] / gcc-ada-link.patch

diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch
index 21fb2a68d5fe50dd92110d027002cea0162d3b73..dd26b510b585ff8c96e91cfdab95a5f24dd2a0b6 100644 (file)
--- a/gcc-ada-link.patch
+++ b/gcc-ada-link.patch
@@ -13,8 +13,19 @@
  unsigned char __gnat_objlist_file_supported = 1;
  unsigned char __gnat_using_gnu_linker = 1;
  const char *__gnat_object_library_extension = ".a";
---- gcc-4.0-20040919/gcc/ada/Makefile.in.orig  2004-09-26 11:40:30.000000000 +0200
-+++ gcc-4.0-20040919/gcc/ada/Makefile.in       2004-09-26 12:29:16.913946640 +0200
+--- gcc-4.0-20040919/gcc/ada/Make-lang.in.orig 2004-09-01 12:46:47.000000000 +0200
++++ gcc-4.0-20040919/gcc/ada/Make-lang.in      2004-09-26 12:21:15.135188144 +0200
+@@ -378,7 +378,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
+ 
+ # Note that gnat_ugn_unw.texi does not depend on xgnatugn 
+ # being built so we can distribute a pregenerated gnat_ugn_unw.info
+--- gcc-4.1-20050522/gcc/ada/Makefile.in.orig  2005-05-26 10:48:40.000000000 +0000
++++ gcc-4.1-20050522/gcc/ada/Makefile.in       2005-05-26 10:59:25.000000000 +0000
 @@ -139,7 +139,7 @@
  objext = .o
  exeext =
@@ -24,67 +35,16 @@
  shext  =
  hyphen = -
  
-@@ -1413,6 +1413,31 @@
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
+@@ -1364,7 +1414,7 @@
+  s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads  
  
-+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
-+  LIBGNAT_TARGET_PAIRS = \
-+  a-intnam.ads<a-intnam-linux.ads \
-+  s-inmaop.adb<s-inmaop-posix.adb \
-+  s-intman.adb<s-intman-posix.adb \
-+  s-osinte.adb<s-osinte-posix.adb \
-+  s-osinte.ads<s-osinte-linux.ads \
-+  s-osprim.adb<s-osprim-posix.adb \
-+  s-taprop.adb<s-taprop-linux.adb \
-+  s-taspri.ads<s-taspri-linux.ads \
-+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
-+  s-parame.adb<s-parame-linux.adb \
-+  system.ads<system-linux-sparc.ads
-+
-+  TOOLS_TARGET_PAIRS =  \
-+    mlib-tgt.adb<mlib-tgt-linux.adb \
-+    indepsw.adb<indepsw-linux.adb
-+
-+  THREADSLIB = -lpthread
-+  GNATLIB_SHARED = gnatlib-shared-dual
-+  GMEM_LIB = gmemlib
-+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
-+  LIBRARY_VERSION := $(LIB_VERSION)
-+endif
-+
- ifeq ($(strip $(filter-out powerpc darwin%,$(arch) $(osys))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<a-intnam-darwin.ads \
-@@ -1784,6 +1784,9 @@
- # is guaranteed to overflow the buffer.
+ LIBGNAT=../rts/libgnat.a 
+-GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES)
++GCC_LINK=$(CC) $(ADA_INCLUDES)
  
- 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)" \
-@@ -1796,6 +1799,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))
-@@ -1821,7 +1826,7 @@
-            THREAD_KIND="$(THREAD_KIND)" \
-              gnatlib
-       $(RM) rts/libgna*$(soext)
--      cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-+      cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
-               -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-               $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-               $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-@@ -1830,7 +1835,8 @@
+ # when compiling the tools, the runtime has to be first on the path so that
+ # it hides the runtime files lying with the rest of the sources
+@@ -1644,7 +1694,8 @@
                -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
                $(GNATRTL_TASKING_OBJS) \
                $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
@@ -94,3 +54,12 @@
        cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
                libgnat$(soext)
        cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+@@ -1691,7 +1742,7 @@
+            THREAD_KIND="$(THREAD_KIND)" \
+              gnatlib
+       $(RM) rts/libgna*$(soext)
+-      cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
++      cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
+               -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+               $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+               $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)