From 430d508058bfe1c88c582a2256ff4dc3854c369d Mon Sep 17 00:00:00 2001
From: Doug Rupp <rupp@adacore.com>
Date: Wed, 31 Mar 2021 10:29:37 -0700
Subject: [PATCH] [Ada] vx7-shared-libs - x86_64-vx7r2 (gnat runtime)

gcc/ada/

	* Makefile.rtl: Add a new ifeq for vx7r2 shared gnatlib.
---
 gcc/ada/Makefile.rtl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index f626c5d26a15..0b8461255f20 100644
--- a/gcc/ada/Makefile.rtl
+++ b/gcc/ada/Makefile.rtl
@@ -1200,13 +1200,6 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworksspe vxworks7% vxworks7spe
     GCC_SPEC_FILES+=vxworks-cert-$(ARCH_STR)-link.spec
     GCC_SPEC_FILES+=vxworks-smp-$(ARCH_STR)-link.spec
   endif
-
-  ifeq ($(strip $(filter-out vxworks7r2 powerpc64 rtp rtp-smp, $(target_os) $(target_cpu) $(THREAD_KIND))),)
-    # Shared libraries are only supported on PowerPC64, VxWorks7r2
-    # ATM.  Also this is disabled for kernel runtimes.
-    GNATLIB_SHARED = gnatlib-shared-dual
-    LIBRARY_VERSION := $(LIB_VERSION)
-  endif
 endif
 
 # PowerPC and e500v2 VxWorks 653
@@ -2973,6 +2966,13 @@ ifeq ($(strip $(filter-out linux%,$(target_os))),)
     g-sercom.adb<libgnat/g-sercom__linux.adb
 endif
 
+# Turn on shared gnatlib for specific vx7r2 targets for RTP runtimes. Once
+# all targets are ported the target_cpu selector can be removed.
+ifeq ($(strip $(filter-out vxworks7r2 powerpc64 x86_64 rtp rtp-smp, $(target_os) $(target_cpu) $(THREAD_KIND))),)
+    GNATLIB_SHARED = gnatlib-shared-dual
+    LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
 LIBGNAT_TARGET_PAIRS += \
   interfac.ads<libgnat/interfac__2020.ads
 
-- 
2.47.2