diff options
| author | Kevin Lo <kevlo@FreeBSD.org> | 2002-02-09 08:40:28 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@FreeBSD.org> | 2002-02-09 08:40:28 +0000 |
| commit | ad309c29e327900c8ec0824f979052b0a930aa26 (patch) | |
| tree | e2c5fa3c5378a0f3e83288ce058e71b04eae4068 /lang/gnat/files/patch-ac | |
| parent | Update jgnat so it will continue to build with the new compiler which (diff) | |
Update to version 3.14p
PR: 34670
Submitted by: Joe Marcus Clarke <marcus@marcuscom.com>
Notes
Notes:
svn path=/head/; revision=54414
Diffstat (limited to 'lang/gnat/files/patch-ac')
| -rw-r--r-- | lang/gnat/files/patch-ac | 86 |
1 files changed, 37 insertions, 49 deletions
diff --git a/lang/gnat/files/patch-ac b/lang/gnat/files/patch-ac index 966caf1dd517..4c6d040f1aff 100644 --- a/lang/gnat/files/patch-ac +++ b/lang/gnat/files/patch-ac @@ -1,49 +1,37 @@ -*** ada/Makefile.in.orig Wed Jul 19 15:08:56 2000 ---- ada/Makefile.in Sun Oct 15 01:09:35 2000 -*************** -*** 976,981 **** ---- 976,1002 ---- - endif - endif - -+ ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),) -+ LIBGNAT_TARGET_PAIRS = \ -+ a-intnam.ads<4fintnam.ads \ -+ s-inmaop.adb<7sinmaop.adb \ -+ s-intman.adb<5fintman.adb \ -+ s-mastop.adb<5omastop.adb \ -+ s-osinte.adb<5fosinte.adb \ -+ s-osinte.ads<5fosinte.ads \ -+ s-osprim.adb<7sosprim.adb \ -+ s-taprop.adb<5ftaprop.adb \ -+ s-taspri.ads<7staspri.ads \ -+ s-tpopsp.adb<7stpopsp.adb \ -+ s-traceb.adb<5wtraceb.adb \ -+ system.ads<5fsystem.ads -+ -+ threadslib= -+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) -+ SHARED_MAJOR = 1 -+ soext = .so.$(SHARED_MAJOR) -+ endif -+ - ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),) - ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),) - LIBGNAT_TARGET_PAIRS = \ -*************** -*** 1818,1824 **** - $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(misclib) -lm - cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ - -o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \ -! $(GNATRTL_TASKING_OBJS) -l$(threadslib) - - gnatlib-shared-dual: - $(MAKE) $(FLAGS_TO_PASS) \ ---- 1839,1845 ---- - $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(misclib) -lm - cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ - -o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \ -! $(GNATRTL_TASKING_OBJS) $(threadslib) - - gnatlib-shared-dual: - $(MAKE) $(FLAGS_TO_PASS) \ +--- ada/Makefile.in.orig Thu May 3 07:01:07 2001 ++++ ada/Makefile.in Mon Feb 4 13:15:17 2002 +@@ -1109,6 +1109,25 @@ + $(CC) -c $(CFLAGS) -gnatpg $(ADA_INCLUDES) $< + endif + ++ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),) ++ LIBGNAT_TARGET_PAIRS = \ ++ a-intnam.ads<4fintnam.ads \ ++ s-inmaop.adb<7sinmaop.adb \ ++ s-intman.adb<5fintman.adb \ ++ s-mastop.adb<5omastop.adb \ ++ s-osinte.adb<5fosinte.adb \ ++ s-osinte.ads<5fosinte.ads \ ++ s-osprim.adb<7sosprim.adb \ ++ s-taprop.adb<5ftaprop.adb \ ++ s-taspri.ads<7staspri.ads \ ++ s-tpopsp.adb<7stpopsp.adb \ ++ system.ads<5fsystem.ads ++ ++ SHARED_MAJOR = 1 ++ soext = .so.$(SHARED_MAJOR) ++ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) ++endif ++ + ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),) + ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),) + LIBGNAT_TARGET_PAIRS = \ +@@ -1997,7 +2016,7 @@ + $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(misclib) -lm + cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ + -o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \ +- $(GNATRTL_TASKING_OBJS) -l$(threadslib) ++ $(GNATRTL_TASKING_OBJS) $(threadslib) + cd rts; $(LN) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext) + cd rts; $(LN) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext) + |