From: Mitch Hayenga <mitch.hayenga@arm.com>
Date: Tue, 26 Aug 2014 14:13:31 +0000 (-0400)
Subject: mips: Fix RLIMIT_RSS naming
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0da99b7e0c40d924c8555ef41c38d361ea6c626d;p=gem5.git

mips: Fix RLIMIT_RSS naming

MIPS defined RLIMIT_RSS in a way that could cause a naming conflict with
RLIMIT_RSS from the host system.  Broke clang+MacOS build.
---

diff --git a/src/arch/mips/linux/linux.hh b/src/arch/mips/linux/linux.hh
index 6ae5b1717..992bbf85d 100644
--- a/src/arch/mips/linux/linux.hh
+++ b/src/arch/mips/linux/linux.hh
@@ -117,7 +117,7 @@ class MipsLinux : public Linux
     /// Resource constants for getrlimit() (overide some generics).
     static const unsigned TGT_RLIMIT_NPROC = 8;
     static const unsigned TGT_RLIMIT_AS = 6;
-    static const unsigned RLIMIT_RSS = 7;
+    static const unsigned TGT_RLIMIT_RSS = 7;
     static const unsigned TGT_RLIMIT_NOFILE = 5;
     static const unsigned TGT_RLIMIT_MEMLOCK = 9;