X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gcc-ada-link.patch;h=240790ad474bb6000d076441070696e12534c37a;hb=d3ce3beb29607c8f647ba3ad089338739ddaee49;hp=21fb2a68d5fe50dd92110d027002cea0162d3b73;hpb=2925561935ec74b7a1118098cec3780e9c1805e4;p=packages%2Fgcc.git

diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch
index 21fb2a6..240790a 100644
--- a/gcc-ada-link.patch
+++ b/gcc-ada-link.patch
@@ -1,21 +1,22 @@
---- gcc-4.0-20040919/gcc/ada/link.c.orig	2004-09-13 12:18:40.000000000 +0200
-+++ gcc-4.0-20040919/gcc/ada/link.c	2004-09-26 12:24:29.079704096 +0200
-@@ -164,9 +164,9 @@
+--- a/gcc/ada/link.c	2004-09-13 12:18:40.000000000 +0200
++++ b/gcc/ada/link.c	2004-09-26 12:24:29.079704096 +0200
+@@ -157,10 +157,10 @@
  
- #elif defined (linux)
- const char *__gnat_object_file_option = "";
+ #elif defined (linux) || defined(__GLIBC__)
+ const char *__gnat_object_file_option = "-Wl,@";
 -const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--int __gnat_link_max = 8192;
 +const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
+ char __gnat_shared_libgnat_default = STATIC;
+-char __gnat_shared_libgcc_default = STATIC;
+-int __gnat_link_max = 8192;
++char __gnat_shared_libgcc_default = SHARED;
 +int __gnat_link_max = 131072;
  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
-@@ -139,7 +139,7 @@
+ unsigned char __gnat_separate_run_path_options = 0;
+--- a/gcc/ada/gcc-interface/Makefile.in	2005-05-26 10:48:40.000000000 +0000
++++ b/gcc/ada/gcc-interface/Makefile.in	2005-05-26 10:59:25.000000000 +0000
+@@ -126,7 +126,7 @@
  objext = .o
  exeext =
  arext  = .a
@@ -24,73 +25,41 @@
  shext  =
  hyphen = -
  
-@@ -1413,6 +1413,31 @@
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
+@@ -210,7 +210,7 @@
+ # Link flags used to build gnat tools.  By default we prefer to statically
+ # link with libgcc to avoid a dependency on shared libgcc (which is tricky
+ # to deal with as it may conflict with the libgcc provided by the system).
+-GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc
++GCC_LINK_FLAGS=-static-libstdc++
  
-+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.
+ # End of variables for you to override.
  
- 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 @@
+@@ -2489,7 +2489,8 @@
  		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
  		$(GNATRTL_TASKING_OBJS) \
  		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
 -		$(THREADSLIB)
 +		$(THREADSLIB) \
 +		./libgnat-$(LIBRARY_VERSION)$(soext)
- 	cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ 	cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
  		libgnat$(soext)
- 	cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ 	cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+--- a/gcc/ada/gcc-interface/Makefile.in~	2014-07-16 18:43:51.000000000 +0200
++++ b/gcc/ada/gcc-interface/Makefile.in	2014-07-16 18:46:09.555516586 +0200
+@@ -2811,14 +2811,14 @@
+              gnatlib
+ 	$(RM) $(RTSDIR)/libgna*$(soext)
+ 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+-                | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
++                | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc $(GNATLIBCFLAGS) \
+ 		$(PICFLAG_FOR_TARGET) \
+ 		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+ 		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ 		$(MISCLIB) -lm
+ 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+-                | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
++                | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc $(GNATLIBCFLAGS) \
+ 		$(PICFLAG_FOR_TARGET) \
+ 		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ 		$(GNATRTL_TASKING_OBJS) \