projects / packages / gcc.git / blame
| Commit | Line | Data |
|---|---|---|
| 426f688a JB |
1 | --- gcc-3.4.0/gcc/ada/link.c.orig Mon Jan 12 12:45:24 2004 |
| 2 | +++ gcc-3.4.0/gcc/ada/link.c Tue Jun 1 15:57:42 2004 | |
| 3 | @@ -165,9 +165,9 @@ | |
| 4 | ||
| 5 | #elif defined (linux) | |
| 6 | const char *object_file_option = ""; | |
| 7 | -const char *run_path_option = "-Wl,-rpath,"; | |
| 8 | -char shared_libgnat_default = STATIC; | |
| 9 | -int link_max = 8192; | |
| 10 | +const char *run_path_option = ""; | |
| 11 | +char shared_libgnat_default = SHARED; | |
| 12 | +int link_max = 131072; | |
| 13 | unsigned char objlist_file_supported = 1; | |
| 14 | unsigned char using_gnu_linker = 1; | |
| 15 | const char *object_library_extension = ".a"; | |
| 16 | --- gcc-3.4.0/gcc/ada/Makefile.in.orig Mon Apr 26 11:19:09 2004 | |
| 17 | +++ gcc-3.4.0/gcc/ada/Makefile.in Tue Jun 1 15:58:33 2004 | |
| 18 | @@ -142,7 +142,7 @@ | |
| 19 | objext = .o | |
| 20 | exeext = | |
| 21 | arext = .a | |
| 22 | -soext = .so | |
| 23 | +soext = .so.1 | |
| 24 | shext = | |
| 25 | ||
| 26 | # Define this as & to perform parallel make on a Sequent. | |
| 27 | @@ -1269,6 +1269,46 @@ | |
| 28 | LIBRARY_VERSION := $(LIB_VERSION) | |
| 29 | endif | |
| 30 | ||
| 31 | +ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),) | |
| 32 | + TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb | |
| 33 | + THREADSLIB=-lpthread | |
| 34 | + GNATLIB_SHARED=gnatlib-shared-dual | |
| 35 | + PREFIX_OBJS=$(PREFIX_REAL_OBJS) | |
| 36 | + LIBRARY_VERSION := $(LIB_VERSION) | |
| 37 | +endif | |
| 38 | + | |
| 39 | +ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),) | |
| 40 | + TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb | |
| 41 | + THREADSLIB=-lpthread | |
| 42 | + GNATLIB_SHARED=gnatlib-shared-dual | |
| 43 | + PREFIX_OBJS=$(PREFIX_REAL_OBJS) | |
| 44 | + LIBRARY_VERSION := $(LIB_VERSION) | |
| 45 | +endif | |
| 46 | + | |
| 47 | +ifeq ($(strip $(filter-out ppc% linux%,$(arch) $(osys))),) | |
| 48 | + TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb | |
| 49 | + THREADSLIB=-lpthread | |
| 50 | + GNATLIB_SHARED=gnatlib-shared-dual | |
| 51 | + PREFIX_OBJS=$(PREFIX_REAL_OBJS) | |
| 52 | + LIBRARY_VERSION := $(LIB_VERSION) | |
| 53 | +endif | |
| 54 | + | |
| 55 | +ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),) | |
| 56 | + TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb | |
| 57 | + THREADSLIB=-lpthread | |
| 58 | + GNATLIB_SHARED=gnatlib-shared-dual | |
| 59 | + PREFIX_OBJS=$(PREFIX_REAL_OBJS) | |
| 60 | + LIBRARY_VERSION := $(LIB_VERSION) | |
| 61 | +endif | |
| 62 | + | |
| 63 | +ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),) | |
| 64 | + TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb | |
| 65 | + THREADSLIB=-lpthread | |
| 66 | + GNATLIB_SHARED=gnatlib-shared-dual | |
| 67 | + PREFIX_OBJS=$(PREFIX_REAL_OBJS) | |
| 68 | + LIBRARY_VERSION := $(LIB_VERSION) | |
| 69 | +endif | |
| 70 | + | |
| 71 | ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),) | |
| 72 | LIBGNAT_TARGET_PAIRS = \ | |
| 73 | a-intnam.ads<4lintnam.ads \ | |
| 74 | @@ -1767,6 +1807,9 @@ | |
| 75 | # is guaranteed to overflow the buffer. | |
| 76 | ||
| 77 | gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2 | |
| 78 | + $(RMDIR) save | |
| 79 | + $(MKDIR) save | |
| 80 | + $(MV) *.o save/ | |
| 81 | $(MAKE) -C rts CC="../../xgcc -B../../" \ | |
| 82 | INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \ | |
| 83 | CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \ | |
| 84 | @@ -1779,6 +1822,8 @@ | |
| 85 | srcdir=$(fsrcdir) \ | |
| 86 | -f ../Makefile \ | |
| 87 | $(GNATRTL_OBJS) | |
| 88 | + $(MV) save/*.o . | |
| 89 | + $(RMDIR) save | |
| 90 | $(RM) rts/libgnat$(arext) rts/libgnarl$(arext) | |
| 91 | $(AR) $(AR_FLAGS) rts/libgnat$(arext) \ | |
| 92 | $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS)) | |
| 93 | @@ -1891,14 +1936,15 @@ | |
| 94 | THREAD_KIND="$(THREAD_KIND)" \ | |
| 95 | gnatlib | |
| 96 | $(RM) rts/libgnat$(soext) rts/libgnarl$(soext) | |
| 97 | - cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ | |
| 98 | + cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \ | |
| 99 | -o libgnat-$(LIBRARY_VERSION)$(soext) \ | |
| 100 | $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ | |
| 101 | $(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) $(MISCLIB) -lm | |
| 102 | cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ | |
| 103 | -o libgnarl-$(LIBRARY_VERSION)$(soext) \ | |
| 104 | $(GNATRTL_TASKING_OBJS) \ | |
| 105 | - $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB) | |
| 106 | + $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB) \ | |
| 107 | + ./libgnat-$(LIBRARY_VERSION)$(soext) | |
| 108 | cd rts; $(LN_S) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext) | |
| 109 | cd rts; $(LN_S) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext) | |
| 110 |