derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Do not use $(PWD) in Makefiles

Browse Source 
644e8cdf5e ("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 <kevin.brodsky@arm.com>
Signed-off-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/12844
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
This commit is contained in:
Kevin Brodsky
2018-09-18 15:20:04 +01:00
committed by Ciro Santilli
parent a470ef5145
commit 7a6183aa61
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/m5/Makefile.aarch64
View File

@@ -55,7 +55,7 @@ JR=jar
#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

2
util/m5/Makefile.alpha
View File

@@ -35,7 +35,7 @@ CC=$(CROSS_COMPILE)gcc
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

2
util/m5/Makefile.arm
View File

@@ -55,7 +55,7 @@ JR=jar
#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

2
util/m5/Makefile.sparc
View File

@@ -35,7 +35,7 @@ CC=$(CROSS_COMPILE)gcc
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

4
util/m5/Makefile.thumb
View File

@@ -49,8 +49,8 @@ AS=$(CROSS_COMPILE)as
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

2
util/m5/Makefile.x86
View File

@@ -31,7 +31,7 @@ CC=gcc
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