Hello Andreas Sandberg,
I'd like you to do a code review. Please visit
https://gem5-review.googlesource.com/c/public/gem5/+/12844
to review the following change.
Change subject: util: Do not use $(PWD) in Makefiles
......................................................................
util: Do not use $(PWD) in Makefiles
644e8cdf5ee7 ("util: Move the m5ops.h file to a shared directory")
added include/ to the include path for m5 Makefiles, based on
$(PWD): $(PWD)/../../include.
Unfortunately, this breaks when using `make -C <path>`, as -C does
not move PWD accordingly. The fix is simply to remove $(PWD), as a
relative path is just fine here.
Change-Id: Ia046c29761363b6670e52c52a604c7e70a6a305a
Signed-off-by: Kevin Brodsky <[email protected]>
Signed-off-by: Ciro Santilli <[email protected]>
Reviewed-by: Ciro Santilli <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
---
M util/m5/Makefile.aarch64
M util/m5/Makefile.alpha
M util/m5/Makefile.arm
M util/m5/Makefile.sparc
M util/m5/Makefile.thumb
M util/m5/Makefile.x86
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/util/m5/Makefile.aarch64 b/util/m5/Makefile.aarch64
index 0818066..2e05ac7 100644
--- a/util/m5/Makefile.aarch64
+++ b/util/m5/Makefile.aarch64
@@ -55,7 +55,7 @@
#JDK_PATH=/path/to/jdk/version_number
CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux \
- -I$(PWD)/../../include -march=armv8-a
+ -I../../include -march=armv8-a
LDFLAGS=-static -L. -lm5
LIB_OBJS=m5op_arm_A64.o m5_mmap.o
diff --git a/util/m5/Makefile.alpha b/util/m5/Makefile.alpha
index c21f67c..cb476ea 100644
--- a/util/m5/Makefile.alpha
+++ b/util/m5/Makefile.alpha
@@ -35,7 +35,7 @@
AS=$(CROSS_COMPILE)as
LD=$(CROSS_COMPILE)ld
-CFLAGS=-O2 -I$(PWD)/../../include
+CFLAGS=-O2 -I../../include
OBJS=m5.o m5op_alpha.o m5_mmap.o
all: m5
diff --git a/util/m5/Makefile.arm b/util/m5/Makefile.arm
index 14d7353..e7a26ce 100644
--- a/util/m5/Makefile.arm
+++ b/util/m5/Makefile.arm
@@ -55,7 +55,7 @@
#JDK_PATH=/path/to/jdk/version_number
CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux \
- -I$(PWD)/../../include -march=armv7-a
+ -I../../include -march=armv7-a
LDFLAGS=-L. -lm5 -static
LIB_OBJS=m5op_arm.o m5_mmap.o
diff --git a/util/m5/Makefile.sparc b/util/m5/Makefile.sparc
index e1b17ea..87c3d15 100644
--- a/util/m5/Makefile.sparc
+++ b/util/m5/Makefile.sparc
@@ -35,7 +35,7 @@
AS=$(CROSS_COMPILE)as
LD=$(CROSS_COMPILE)ld
-CFLAGS=-O2 -m64 -I$(PWD)/../../include
+CFLAGS=-O2 -m64 -I../../include
OBJS=m5.o m5op_sparc.o m5_mmap.o
all: m5
diff --git a/util/m5/Makefile.thumb b/util/m5/Makefile.thumb
index 60b6803..d117bf0 100644
--- a/util/m5/Makefile.thumb
+++ b/util/m5/Makefile.thumb
@@ -49,8 +49,8 @@
LD=$(CROSS_COMPILE)ld
AR=$(CROSS_COMPILE)ar
-#CFLAGS=-O2 -march=armv7 -mthumb -I$(PWD)/../../include
-CFLAGS=-O2 -mthumb -I$(PWD)/../../include
+#CFLAGS=-O2 -march=armv7 -mthumb -I../../include
+CFLAGS=-O2 -mthumb -I../../include
LDFLAGS=-L. -lm5
OBJS=m5.o
diff --git a/util/m5/Makefile.x86 b/util/m5/Makefile.x86
index f56b37c..89f8f92 100644
--- a/util/m5/Makefile.x86
+++ b/util/m5/Makefile.x86
@@ -31,7 +31,7 @@
AS=as
LD=ld
-CFLAGS?=-O2 -DM5OP_ADDR=0xFFFF0000 -I$(PWD)/../../include
+CFLAGS?=-O2 -DM5OP_ADDR=0xFFFF0000 -I../../include
OBJS=m5.o m5op_x86.o m5_mmap.o
LUA_HEADER_INCLUDE=$(shell pkg-config --cflags-only-I lua51)
LUA_OBJS=lua_gem5Op.opic m5op_x86.opic m5_mmap.opic
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12844
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ia046c29761363b6670e52c52a604c7e70a6a305a
Gerrit-Change-Number: 12844
Gerrit-PatchSet: 1
Gerrit-Owner: Ciro Santilli <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
