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

diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch
index e62c8df..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,259 +25,41 @@
  shext  =
  hyphen = -
  
-@@ -1366,6 +1366,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 sparc64% 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-sparc64.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 hppa% linux%,$(arch) $(osys))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<a-intnam-linux.ads \
-@@ -1463,6 +1488,31 @@
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
+ # End of variables for you to override.
  
-+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 \
-@@ -1825,6 +1875,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)" \
-@@ -1837,6 +1890,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))
-@@ -1862,7 +1917,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) \
-@@ -1871,7 +1926,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) \
---- gcc-4.0-20050514/gcc/ada.orig/system-linux-sparc64.ads	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.0-20050514/gcc/ada/system-linux-sparc64.ads	2005-05-21 18:34:52.000000000 +0000
-@@ -0,0 +1,151 @@
-+------------------------------------------------------------------------------
-+--                                                                          --
-+--                        GNAT RUN-TIME COMPONENTS                          --
-+--                                                                          --
-+--                               S Y S T E M                                --
-+--                                                                          --
-+--                                 S p e c                                  --
-+--                          (GNU/Linux-SPARC64 Version)                     --
-+--                                                                          --
-+--          Copyright (C) 1992-2005 Free Software Foundation, Inc.          --
-+--                                                                          --
-+-- This specification is derived from the Ada Reference Manual for use with --
-+-- GNAT. The copyright notice above, and the license provisions that follow --
-+-- apply solely to the  contents of the part following the private keyword. --
-+--                                                                          --
-+-- GNAT is free software;  you can  redistribute it  and/or modify it under --
-+-- terms of the  GNU General Public License as published  by the Free Soft- --
-+-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
-+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
-+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
-+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
-+-- for  more details.  You should have  received  a copy of the GNU General --
-+-- Public License  distributed with GNAT;  see file COPYING.  If not, write --
-+-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
-+-- MA 02111-1307, USA.                                                      --
-+--                                                                          --
-+-- As a special exception,  if other files  instantiate  generics from this --
-+-- unit, or you link  this unit with other files  to produce an executable, --
-+-- this  unit  does not  by itself cause  the resulting  executable  to  be --
-+-- covered  by the  GNU  General  Public  License.  This exception does not --
-+-- however invalidate  any other reasons why  the executable file  might be --
-+-- covered by the  GNU Public License.                                      --
-+--                                                                          --
-+-- GNAT was originally developed  by the GNAT team at  New York University. --
-+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
-+--                                                                          --
-+------------------------------------------------------------------------------
-+
-+package System is
-+pragma Pure (System);
-+--  Note that we take advantage of the implementation permission to
-+--  make this unit Pure instead of Preelaborable, see RM 13.7(36)
-+
-+   type Name is (SYSTEM_NAME_GNAT);
-+   System_Name : constant Name := SYSTEM_NAME_GNAT;
-+
-+   --  System-Dependent Named Numbers
-+
-+   Min_Int               : constant := Long_Long_Integer'First;
-+   Max_Int               : constant := Long_Long_Integer'Last;
-+
-+   Max_Binary_Modulus    : constant := 2 ** Long_Long_Integer'Size;
-+   Max_Nonbinary_Modulus : constant := Integer'Last;
-+
-+   Max_Base_Digits       : constant := Long_Long_Float'Digits;
-+   Max_Digits            : constant := Long_Long_Float'Digits;
-+
-+   Max_Mantissa          : constant := 63;
-+   Fine_Delta            : constant := 2.0 ** (-Max_Mantissa);
-+
-+   Tick                  : constant := 0.000_001;
-+
-+   --  Storage-related Declarations
-+
-+   type Address is private;
-+   Null_Address : constant Address;
-+
-+   Storage_Unit : constant := 8;
-+   Word_Size    : constant := 64;
-+   Memory_Size  : constant := 2 ** 64;
-+
-+   --  Address comparison
-+
-+   function "<"  (Left, Right : Address) return Boolean;
-+   function "<=" (Left, Right : Address) return Boolean;
-+   function ">"  (Left, Right : Address) return Boolean;
-+   function ">=" (Left, Right : Address) return Boolean;
-+   function "="  (Left, Right : Address) return Boolean;
-+
-+   pragma Import (Intrinsic, "<");
-+   pragma Import (Intrinsic, "<=");
-+   pragma Import (Intrinsic, ">");
-+   pragma Import (Intrinsic, ">=");
-+   pragma Import (Intrinsic, "=");
-+
-+   --  Other System-Dependent Declarations
-+
-+   type Bit_Order is (High_Order_First, Low_Order_First);
-+   Default_Bit_Order : constant Bit_Order := High_Order_First;
-+
-+   --  Priority-related Declarations (RM D.1)
-+
-+   Max_Priority           : constant Positive := 30;
-+   Max_Interrupt_Priority : constant Positive := 31;
-+
-+   subtype Any_Priority       is Integer      range  0 .. 31;
-+   subtype Priority           is Any_Priority range  0 .. 30;
-+   subtype Interrupt_Priority is Any_Priority range 31 .. 31;
-+
-+   Default_Priority : constant Priority := 15;
-+
-+private
-+
-+   type Address is mod Memory_Size;
-+   Null_Address : constant Address := 0;
-+
-+   --------------------------------------
-+   -- System Implementation Parameters --
-+   --------------------------------------
-+
-+   --  These parameters provide information about the target that is used
-+   --  by the compiler. They are in the private part of System, where they
-+   --  can be accessed using the special circuitry in the Targparm unit
-+   --  whose source should be consulted for more detailed descriptions
-+   --  of the individual switch values.
-+
-+   AAMP                      : constant Boolean := False;
-+   Backend_Divide_Checks     : constant Boolean := False;
-+   Backend_Overflow_Checks   : constant Boolean := False;
-+   Command_Line_Args         : constant Boolean := True;
-+   Configurable_Run_Time     : constant Boolean := False;
-+   Denorm                    : constant Boolean := True;
-+   Duration_32_Bits          : constant Boolean := False;
-+   Exit_Status_Supported     : constant Boolean := True;
-+   Fractional_Fixed_Ops      : constant Boolean := False;
-+   Frontend_Layout           : constant Boolean := False;
-+   Functions_Return_By_DSP   : constant Boolean := False;
-+   Machine_Overflows         : constant Boolean := False;
-+   Machine_Rounds            : constant Boolean := True;
-+   OpenVMS                   : constant Boolean := False;
-+   Preallocated_Stacks       : constant Boolean := False;
-+   Signed_Zeros              : constant Boolean := True;
-+   Stack_Check_Default       : constant Boolean := False;
-+   Stack_Check_Probes        : constant Boolean := False;
-+   Support_64_Bit_Divides    : constant Boolean := True;
-+   Support_Aggregates        : constant Boolean := True;
-+   Support_Composite_Assign  : constant Boolean := True;
-+   Support_Composite_Compare : constant Boolean := True;
-+   Support_Long_Shifts       : constant Boolean := True;
-+   Suppress_Standard_Library : constant Boolean := False;
-+   Use_Ada_Main_Program_Name : constant Boolean := False;
-+   ZCX_By_Default            : constant Boolean := True;
-+   GCC_ZCX_Support           : constant Boolean := True;
-+   Front_End_ZCX_Support     : constant Boolean := False;
-+
-+   --  Obsolete entries, to be removed eventually (bootstrap issues!)
-+
-+   High_Integrity_Mode       : constant Boolean := False;
-+   Long_Shifts_Inlined       : constant Boolean := True;
-+
-+end System;
+ 	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) \