From 1b5593c0f7f557965ee9b5e27bf5cdb3114d6428 Mon Sep 17 00:00:00 2001
From: James Cowgill <James.Cowgill@imgtec.com>
Date: Tue, 3 Jan 2017 17:51:02 +0000
Subject: [PATCH] s-linux-mips.ads: Rename from s-linux-mipsel.ads.
* s-linux-mips.ads: Rename from s-linux-mipsel.ads.
* gcc-interface/Makefile.in (MIPS/Linux): Merge mips and mipsel
sections.
From-SVN: r244025
---
gcc/ada/ChangeLog | 6 ++++
gcc/ada/gcc-interface/Makefile.in | 35 +++++--------------
.../{s-linux-mipsel.ads => s-linux-mips.ads} | 0
3 files changed, 14 insertions(+), 27 deletions(-)
rename gcc/ada/{s-linux-mipsel.ads => s-linux-mips.ads} (100%)
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8ac348902cad..055c5443f116 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-03 James Cowgill <James.Cowgill@imgtec.com>
+
+ * s-linux-mips.ads: Rename from s-linux-mipsel.ads.
+ * gcc-interface/Makefile.in (MIPS/Linux): Merge mips and mipsel
+ sections.
+
2017-01-01 Eric Botcazou <ebotcazou@adacore.com>
* gnatvsn.ads: Bump copyright year.
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 98889c0f30f4..b47a16c8b41e 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1813,36 +1813,12 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),)
endif
# Mips Linux
-ifeq ($(strip $(filter-out mips linux%,$(target_cpu) $(target_os))),)
+ifeq ($(strip $(filter-out mips% linux%,$(target_cpu) $(target_os))),)
LIBGNAT_TARGET_PAIRS = \
a-intnam.ads<a-intnam-linux.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
- s-linux.ads<s-linux.ads \
- s-osinte.adb<s-osinte-posix.adb \
- s-osinte.ads<s-osinte-linux.ads \
- s-osprim.adb<s-osprim-posix.adb \
- s-taprop.adb<s-taprop-linux.adb \
- s-tasinf.ads<s-tasinf-linux.ads \
- s-tasinf.adb<s-tasinf-linux.adb \
- s-taspri.ads<s-taspri-posix.ads \
- s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
- system.ads<system-linux-mips.ads
-
- EH_MECHANISM=-gcc
- THREADSLIB = -lpthread
- GNATLIB_SHARED = gnatlib-shared-dual
- GMEM_LIB = gmemlib
- LIBRARY_VERSION := $(LIB_VERSION)
-endif
-
-# Mips/el and Mips64/el Linux
-ifeq ($(strip $(filter-out mipsel mips64el linux%,$(target_cpu) $(target_os))),)
- LIBGNAT_TARGET_PAIRS = \
- a-intnam.ads<a-intnam-linux.ads \
- s-inmaop.adb<s-inmaop-posix.adb \
- s-intman.adb<s-intman-posix.adb \
- s-linux.ads<s-linux-mipsel.ads \
+ s-linux.ads<s-linux-mips.ads \
s-osinte.adb<s-osinte-posix.adb \
s-osinte.ads<s-osinte-linux.ads \
s-osprim.adb<s-osprim-posix.adb \
@@ -1852,7 +1828,12 @@ ifeq ($(strip $(filter-out mipsel mips64el linux%,$(target_cpu) $(target_os))),)
s-taspri.ads<s-taspri-posix-noaltstack.ads \
s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
g-sercom.adb<g-sercom-linux.adb \
- system.ads<system-linux-mipsel.ads
+
+ ifeq ($(strip $(filter-out %el,$(target_cpu))),)
+ LIBGNAT_TARGET_PAIRS += system.ads<system-linux-mipsel.ads
+ else
+ LIBGNAT_TARGET_PAIRS += system.ads<system-linux-mips.ads
+ endif
TOOLS_TARGET_PAIRS = \
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
diff --git a/gcc/ada/s-linux-mipsel.ads b/gcc/ada/s-linux-mips.ads
similarity index 100%
rename from gcc/ada/s-linux-mipsel.ads
rename to gcc/ada/s-linux-mips.ads
--
GitLab