From 416c8be88c712a99451f3770534a7fe712cb17af Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Sat, 20 Dec 2014 13:37:14 -0800 Subject: [PATCH] Support building from within root directory --- configure | 16 ++++++++-------- configure.ac | 2 +- dummy_rocc/dummy_rocc.mk.in | 2 +- hwacha/hwacha.mk.in | 2 +- {spike => spike_main}/disasm.cc | 0 {spike => spike_main}/extensions.cc | 0 {spike => spike_main}/riscv-dis.cc | 0 {spike => spike_main}/spike.cc | 0 spike/spike.ac => spike_main/spike_main.ac | 0 spike/spike.mk.in => spike_main/spike_main.mk.in | 8 ++++---- {spike => spike_main}/termios-xspike.cc | 0 {spike => spike_main}/xspike.cc | 0 12 files changed, 15 insertions(+), 15 deletions(-) rename {spike => spike_main}/disasm.cc (100%) rename {spike => spike_main}/extensions.cc (100%) rename {spike => spike_main}/riscv-dis.cc (100%) rename {spike => spike_main}/spike.cc (100%) rename spike/spike.ac => spike_main/spike_main.ac (100%) rename spike/spike.mk.in => spike_main/spike_main.mk.in (50%) rename {spike => spike_main}/termios-xspike.cc (100%) rename {spike => spike_main}/xspike.cc (100%) diff --git a/configure b/configure index e98db52..fbbd294 100755 --- a/configure +++ b/configure @@ -4393,7 +4393,7 @@ $as_echo "#define SOFTFLOAT_ENABLED /**/" >>confdefs.h # Add subproject to our running list - subprojects="$subprojects spike" + subprojects="$subprojects spike_main" # Process the subproject appropriately. If enabled add it to the # $enabled_subprojects running shell variable, set a @@ -4401,14 +4401,14 @@ $as_echo "#define SOFTFLOAT_ENABLED /**/" >>confdefs.h # 'subproject.ac'. - { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : spike" >&5 -$as_echo "$as_me: configuring default subproject : spike" >&6;} - ac_config_files="$ac_config_files spike.mk:spike/spike.mk.in" + { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : spike_main" >&5 +$as_echo "$as_me: configuring default subproject : spike_main" >&6;} + ac_config_files="$ac_config_files spike_main.mk:spike_main/spike_main.mk.in" - enable_spike_sproj="yes" - subprojects_enabled="$subprojects_enabled spike" + enable_spike_main_sproj="yes" + subprojects_enabled="$subprojects_enabled spike_main" -$as_echo "#define SPIKE_ENABLED /**/" >>confdefs.h +$as_echo "#define SPIKE_MAIN_ENABLED /**/" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -5194,7 +5194,7 @@ do "hwacha.mk") CONFIG_FILES="$CONFIG_FILES hwacha.mk:hwacha/hwacha.mk.in" ;; "dummy_rocc.mk") CONFIG_FILES="$CONFIG_FILES dummy_rocc.mk:dummy_rocc/dummy_rocc.mk.in" ;; "softfloat.mk") CONFIG_FILES="$CONFIG_FILES softfloat.mk:softfloat/softfloat.mk.in" ;; - "spike.mk") CONFIG_FILES="$CONFIG_FILES spike.mk:spike/spike.mk.in" ;; + "spike_main.mk") CONFIG_FILES="$CONFIG_FILES spike_main.mk:spike_main/spike_main.mk.in" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; diff --git a/configure.ac b/configure.ac index 89d4dcf..084028f 100644 --- a/configure.ac +++ b/configure.ac @@ -82,7 +82,7 @@ AC_SUBST([CXXFLAGS],["-Wall -Wno-unused -O2 -std=c++11"]) # The '*' suffix indicates an optional subproject. The '**' suffix # indicates an optional subproject which is also the name of a group. -MCPPBS_SUBPROJECTS([ riscv, hwacha, dummy_rocc, softfloat, spike ]) +MCPPBS_SUBPROJECTS([ riscv, hwacha, dummy_rocc, softfloat, spike_main ]) #------------------------------------------------------------------------- # MCPPBS subproject groups diff --git a/dummy_rocc/dummy_rocc.mk.in b/dummy_rocc/dummy_rocc.mk.in index 298b9f9..0143ffd 100644 --- a/dummy_rocc/dummy_rocc.mk.in +++ b/dummy_rocc/dummy_rocc.mk.in @@ -1,5 +1,5 @@ dummy_rocc_subproject_deps = \ - spike \ + spike_main \ riscv \ softfloat \ diff --git a/hwacha/hwacha.mk.in b/hwacha/hwacha.mk.in index d1d9a01..6b258a0 100644 --- a/hwacha/hwacha.mk.in +++ b/hwacha/hwacha.mk.in @@ -1,5 +1,5 @@ hwacha_subproject_deps = \ - spike \ + spike_main \ riscv \ softfloat \ diff --git a/spike/disasm.cc b/spike_main/disasm.cc similarity index 100% rename from spike/disasm.cc rename to spike_main/disasm.cc diff --git a/spike/extensions.cc b/spike_main/extensions.cc similarity index 100% rename from spike/extensions.cc rename to spike_main/extensions.cc diff --git a/spike/riscv-dis.cc b/spike_main/riscv-dis.cc similarity index 100% rename from spike/riscv-dis.cc rename to spike_main/riscv-dis.cc diff --git a/spike/spike.cc b/spike_main/spike.cc similarity index 100% rename from spike/spike.cc rename to spike_main/spike.cc diff --git a/spike/spike.ac b/spike_main/spike_main.ac similarity index 100% rename from spike/spike.ac rename to spike_main/spike_main.ac diff --git a/spike/spike.mk.in b/spike_main/spike_main.mk.in similarity index 50% rename from spike/spike.mk.in rename to spike_main/spike_main.mk.in index 96f0126..0ac70ef 100644 --- a/spike/spike.mk.in +++ b/spike_main/spike_main.mk.in @@ -1,14 +1,14 @@ -spike_subproject_deps = \ +spike_main_subproject_deps = \ softfloat \ riscv \ -spike_install_prog_srcs = \ +spike_main_install_prog_srcs = \ spike.cc \ riscv-dis.cc \ xspike.cc \ termios-xspike.cc \ -spike_hdrs = \ +spike_main_hdrs = \ -spike_srcs = \ +spike_main_srcs = \ extensions.cc \ diff --git a/spike/termios-xspike.cc b/spike_main/termios-xspike.cc similarity index 100% rename from spike/termios-xspike.cc rename to spike_main/termios-xspike.cc diff --git a/spike/xspike.cc b/spike_main/xspike.cc similarity index 100% rename from spike/xspike.cc rename to spike_main/xspike.cc -- 2.30.2