X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gcc-ada-link.patch;h=240790ad474bb6000d076441070696e12534c37a;hb=5b6156b942826b40aae00c538e4c819ccf7c33ab;hp=339e870d6a83a5b71c0d5c088022ca5185b06b66;hpb=4add246ba1c225879a27e59bc34ad1fe200c72b6;p=packages%2Fgcc.git diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch index 339e870..240790a 100644 --- a/gcc-ada-link.patch +++ b/gcc-ada-link.patch @@ -1,154 +1,65 @@ ---- 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 @@ +--- 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 *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 @@ + #elif defined (linux) || defined(__GLIBC__) + const char *__gnat_object_file_option = "-Wl,@"; +-const char *__gnat_run_path_option = "-Wl,-rpath,"; ++const char *__gnat_run_path_option = ""; + 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; + const char *__gnat_object_library_extension = ".a"; + 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 -soext = .so +soext = .so.1 shext = + hyphen = - - # Define this as & to perform parallel make on a Sequent. -@@ -1269,6 +1269,90 @@ - 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 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. + # 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)" \ -@@ -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)" \ +@@ -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 $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ + libgnat$(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) 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) \ + $(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-$(LIBRARY_VERSION)$(soext) $(MISCLIB) -lm - cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ - -o libgnarl-$(LIBRARY_VERSION)$(soext) \ + $(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) \ -- $(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) -