-+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.