From 37bcf4b424bcb35e2ef5463215f2a3b4e2b9af58 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Thu, 18 Apr 2024 16:07:47 -0700 Subject: [PATCH 1/2] util: Add GNU non executable line to x86 m5 - 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 | 2 ++ util/m5/src/abi/x86/m5op_addr.S | 2 ++ 2 files changed, 4 insertions(+) diff --git a/util/m5/src/abi/x86/m5op.S b/util/m5/src/abi/x86/m5op.S index 9a425b6c267..e750d9ba4df 100644 --- a/util/m5/src/abi/x86/m5op.S +++ b/util/m5/src/abi/x86/m5op.S @@ -43,3 +43,5 @@ #define M5OP(name, func) m5op_func name, func; M5OP_FOREACH #undef M5OP + +.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 d6e6cf5315d..98ed7531961 100644 --- a/util/m5/src/abi/x86/m5op_addr.S +++ b/util/m5/src/abi/x86/m5op_addr.S @@ -55,3 +55,5 @@ #define M5OP(name, func) m5op_func M5OP_MERGE_TOKENS(name, _addr), func; M5OP_FOREACH #undef M5OP + +.section .note.GNU-stack From eff00931a130776599257b39a6c0f895f1c42fbb Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Mon, 13 May 2024 09:10:58 -0700 Subject: [PATCH 2/2] util: Added documentation comments Change-Id: I1543ba45e30030096a2d1ca0b1f1461503edf6e1 --- util/m5/src/abi/x86/m5op.S | 4 ++++ util/m5/src/abi/x86/m5op_addr.S | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/util/m5/src/abi/x86/m5op.S b/util/m5/src/abi/x86/m5op.S index e750d9ba4df..4114e3aee7b 100644 --- a/util/m5/src/abi/x86/m5op.S +++ b/util/m5/src/abi/x86/m5op.S @@ -44,4 +44,8 @@ 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 98ed7531961..98069eb5845 100644 --- a/util/m5/src/abi/x86/m5op_addr.S +++ b/util/m5/src/abi/x86/m5op_addr.S @@ -56,4 +56,8 @@ 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