From: Matteo Andreozzi <Matteo.Andreozzi@arm.com>
Date: Mon, 26 Feb 2018 16:40:12 +0000 (-0600)
Subject: arch-arm: clang compilation fixes
X-Git-Tag: v19.0.0.0~1367
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c918d1435c243f2c74969b35793a87e10796c1a6;p=gem5.git

arch-arm: clang compilation fixes

Fix 1: std::pair constructor is not a constexpr in clang implementation
Fix 2: static const templates need to be defined in their
       translation unit

Change-Id: I3d9b9b47e1d148e44555f40e2e2aeff06707ff8f
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/14617
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
---

diff --git a/src/arch/arm/semihosting.hh b/src/arch/arm/semihosting.hh
index 581646021..a9c11933f 100644
--- a/src/arch/arm/semihosting.hh
+++ b/src/arch/arm/semihosting.hh
@@ -264,11 +264,11 @@ class ArmSemihosting : public SimObject
 
   private:
     typedef std::pair<uint64_t, SemiErrno> RetErrno;
-    static constexpr RetErrno retError(SemiErrno e) {
+    static  RetErrno retError(SemiErrno e) {
         return RetErrno((uint64_t)-1, e);
     }
 
-    static constexpr RetErrno retOK(uint64_t r) {
+    static  RetErrno retOK(uint64_t r) {
         return RetErrno(r, 0);
     }