]>
Commit | Line | Data |
---|---|---|
cbe3043d JB |
1 | diff -Nur gcc-3.2.2/gcc/ada/link.c gcc-3.2.2-20030218/gcc/ada/link.c |
2 | --- gcc-3.2.2/gcc/ada/link.c Sat May 4 05:28:18 2002 | |
3 | +++ gcc-3.2.2-20030218/gcc/ada/link.c Tue Sep 24 15:07:49 2002 | |
4 | @@ -158,11 +158,11 @@ | |
5384b728 | 5 | |
6 | #elif defined (linux) | |
7 | const char *object_file_option = ""; | |
8 | -const char *run_path_option = "-Wl,-rpath,"; | |
9 | -char shared_libgnat_default = STATIC; | |
10 | +const char *run_path_option = ""; | |
11 | +char shared_libgnat_default = SHARED; | |
12 | int link_max = 2147483647; | |
13 | unsigned char objlist_file_supported = 0; | |
14 | -unsigned char using_gnu_linker = 0; | |
15 | +unsigned char using_gnu_linker = 1; | |
16 | const char *object_library_extension = ".a"; | |
17 | ||
18 | #elif defined (__svr4__) && defined (i386) | |
cbe3043d JB |
19 | diff -Nur gcc-3.2.2/gcc/ada/Makefile.in gcc-3.2.2-20030218/gcc/ada/Makefile.in |
20 | --- gcc-3.2.2/gcc/ada/Makefile.in Wed Jan 29 18:34:08 2003 | |
21 | +++ gcc-3.2.2-20030218/gcc/ada/Makefile.in Tue Feb 18 17:05:26 2003 | |
22 | @@ -134,7 +134,7 @@ | |
5384b728 | 23 | objext = .o |
24 | exeext = | |
25 | arext = .a | |
26 | -soext = .so | |
27 | +soext = .so.1 | |
28 | shext = | |
29 | ||
30 | HOST_CC=$(CC) | |
cbe3043d | 31 | @@ -1214,6 +1214,69 @@ |
5384b728 | 32 | endif |
33 | endif | |
34 | ||
35 | +ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),) | |
36 | + MLIB_TGT=5lml-tgt | |
37 | + MISCLIB= | |
38 | + THREADSLIB=-lpthread | |
39 | + GNATLIB_SHARED=gnatlib-shared-dual | |
40 | + GMEM_LIB=gmemlib | |
41 | + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) | |
42 | +endif | |
43 | + | |
44 | +ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),) | |
45 | + MLIB_TGT=5lml-tgt | |
46 | + MISCLIB= | |
47 | + THREADSLIB=-lpthread | |
48 | + GNATLIB_SHARED=gnatlib-shared-dual | |
49 | + GMEM_LIB=gmemlib | |
50 | + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) | |
51 | +endif | |
52 | + | |
53 | +ifeq ($(strip $(filter-out ia64 linux%,$(arch) $(osys))),) | |
54 | + MLIB_TGT=5lml-tgt | |
55 | + MISCLIB= | |
56 | + THREADSLIB=-lpthread | |
57 | + GNATLIB_SHARED=gnatlib-shared-dual | |
58 | + GMEM_LIB=gmemlib | |
59 | + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) | |
60 | +endif | |
cbe3043d JB |
61 | + |
62 | +ifeq ($(strip $(filter-out x86_64 linux%,$(arch) $(osys))),) | |
63 | + MLIB_TGT=5lml-tgt | |
64 | + MISCLIB= | |
65 | + THREADSLIB=-lpthread | |
66 | + GNATLIB_SHARED=gnatlib-shared-dual | |
67 | + GMEM_LIB=gmemlib | |
68 | + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) | |
69 | +endif | |
70 | + | |
339d3a4d | 71 | +ifeq ($(strip $(filter-out powerpc linux%,$(arch) $(osys))),) |
cbe3043d JB |
72 | + MLIB_TGT=5lml-tgt |
73 | + MISCLIB= | |
74 | + THREADSLIB=-lpthread | |
75 | + GNATLIB_SHARED=gnatlib-shared-dual | |
76 | + GMEM_LIB=gmemlib | |
77 | + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) | |
78 | +endif | |
79 | + | |
80 | +ifeq ($(strip $(filter-out s390 linux%,$(arch) $(osys))),) | |
81 | + MLIB_TGT=5lml-tgt | |
82 | + MISCLIB= | |
83 | + THREADSLIB=-lpthread | |
84 | + GNATLIB_SHARED=gnatlib-shared-dual | |
85 | + GMEM_LIB=gmemlib | |
86 | + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) | |
87 | +endif | |
88 | + | |
89 | +ifeq ($(strip $(filter-out s390x linux%,$(arch) $(osys))),) | |
90 | + MLIB_TGT=5lml-tgt | |
91 | + MISCLIB= | |
92 | + THREADSLIB=-lpthread | |
93 | + GNATLIB_SHARED=gnatlib-shared-dual | |
94 | + GMEM_LIB=gmemlib | |
95 | + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) | |
96 | +endif | |
5384b728 | 97 | + |
98 | ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),) | |
99 | ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),) | |
100 | LIBGNAT_TARGET_PAIRS = \ | |
3c74150d | 101 | @@ -2179,6 +2242,9 @@ |
5384b728 | 102 | |
103 | gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2 | |
104 | # ../xgcc -B../ -dD -E ../tconfig.h $(INCLUDES) > rts/tconfig.h | |
105 | + $(RMDIR) save | |
106 | + $(MKDIR) save | |
107 | + $(MV) *.o save/ | |
108 | $(MAKE) -C rts CC="../../xgcc -B../../" \ | |
109 | INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \ | |
3c74150d | 110 | CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -DIN_RTS" \ |
cbe3043d | 111 | @@ -2192,6 +2258,8 @@ |
5384b728 | 112 | srcdir=$(fsrcdir) \ |
113 | -f ../Makefile \ | |
114 | $(GNATRTL_OBJS) | |
115 | + $(MV) save/*.o . | |
116 | + $(RMDIR) save | |
117 | $(RM) rts/libgnat$(arext) rts/libgnarl$(arext) | |
118 | $(AR) $(AR_FLAGS) rts/libgnat$(arext) \ | |
119 | $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS)) | |
d0af98f0 | 120 | @@ -2041,6 +2041,7 @@ |
3c74150d | 121 | cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ |
d0af98f0 MM |
122 | -o libgnarl-$(LIBRARY_VERSION)$(soext) \ |
123 | $(GNATRTL_TASKING_OBJS) \ | |
124 | + ./libgnat-$(LIBRARY_VERSION)$(soext) \ | |
125 | $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB) | |
126 | cd rts; $(LN_S) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext) | |
127 | cd rts; $(LN_S) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext) |