From 65976e4c6de69c2545e547dc87580a4761d39b95 Mon Sep 17 00:00:00 2001
From: Harshil Patel <hpppatel@ucdavis.edu>
Date: Tue, 14 May 2024 11:06:13 -0700
Subject: [PATCH] util: Add GNU non executable line to x86 m5 (#1116)

- Adding this line as not specifiying GNU non executable stack was
throwing warnings when building m5
for ubuntu 24.04

Change-Id: I620c508be4090804698391cff671ba5091b053d7
---
 util/m5/src/abi/x86/m5op.S      | 6 ++++++
 util/m5/src/abi/x86/m5op_addr.S | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/util/m5/src/abi/x86/m5op.S b/util/m5/src/abi/x86/m5op.S
index 9a425b6c26..4114e3aee7 100644
--- a/util/m5/src/abi/x86/m5op.S
+++ b/util/m5/src/abi/x86/m5op.S
@@ -43,3 +43,9 @@
 #define M5OP(name, func) m5op_func name, func;
         M5OP_FOREACH
 #undef M5OP
+
+/* The line below is added to remove the warning
+* saying that the file is not specifiying GNU non
+* executable stack in ubuntu 24.04
+*/
+.section .note.GNU-stack
diff --git a/util/m5/src/abi/x86/m5op_addr.S b/util/m5/src/abi/x86/m5op_addr.S
index d6e6cf5315..98069eb584 100644
--- a/util/m5/src/abi/x86/m5op_addr.S
+++ b/util/m5/src/abi/x86/m5op_addr.S
@@ -55,3 +55,9 @@
 #define M5OP(name, func) m5op_func M5OP_MERGE_TOKENS(name, _addr), func;
         M5OP_FOREACH
 #undef M5OP
+
+/* The line below is added to remove the warning
+* saying that the file is not specifiying GNU non
+* executable stack in ubuntu 24.04
+*/
+.section .note.GNU-stack