summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2005-08-31 00:19:37 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2005-08-31 00:19:37 -0400
commit919aa6dd0065d3c7992a7984469a3ef856b9a128 (patch)
tree51cc9e8db49dcccf298edf294d5d07e95c33a0d5
parent284e3e9c46cfabeddb30cbbbe49952972ffd055e (diff)
downloadgem5-919aa6dd0065d3c7992a7984469a3ef856b9a128.tar.xz
Move options files from <build_dir>/build_options to build_options/<build_dir>.
build/SConstruct: Move options file from <build_dir>/build_options to build_options/<build_dir>. --HG-- extra : convert_revision : 0363f79ef5c9c157d9018fcae9c5e055e38e552d
-rw-r--r--build/SConstruct10
-rw-r--r--build/build_options/ALPHA_FS7
-rw-r--r--build/build_options/ALPHA_FS_TL7
-rw-r--r--build/build_options/ALPHA_SE7
4 files changed, 24 insertions, 7 deletions
diff --git a/build/SConstruct b/build/SConstruct
index f30014154..2aac28379 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -146,12 +146,6 @@ for t in my_targets:
if dir not in build_dirs:
build_dirs.append(dir)
-# Make a first pass to verify that build dirs are valid
-for build_dir in build_dirs:
- if not os.path.isdir(build_dir):
- print "Error: build directory", build_dir, "does not exist."
- Exit(1)
-
###################################################
#
# Set up the default build environment. This environment is copied
@@ -256,7 +250,9 @@ for build_dir in build_dirs:
# Make a copy of the default environment to use for this config.
env = base_env.Copy()
# Set env according to the build directory config.
- options_file = os.path.join(build_dir, 'build_options')
+ options_file = os.path.join('build_options', build_dir)
+ if not os.path.isfile(options_file):
+ print "Options file %s not found, using defaults." % options_file
opts = Options(options_file, ARGUMENTS)
opts.AddOptions(
EnumOption('TARGET_ISA', 'Target ISA', 'alpha', ('alpha')),
diff --git a/build/build_options/ALPHA_FS b/build/build_options/ALPHA_FS
new file mode 100644
index 000000000..11c08ae25
--- /dev/null
+++ b/build/build_options/ALPHA_FS
@@ -0,0 +1,7 @@
+FULL_SYSTEM = 1
+ALPHA_TLASER = 0
+NO_FAST_ALLOC = 0
+EFENCE = 0
+SS_COMPATIBLE_FP = 0
+STATS_BINNING = 1
+USE_MYSQL = 1
diff --git a/build/build_options/ALPHA_FS_TL b/build/build_options/ALPHA_FS_TL
new file mode 100644
index 000000000..59436f858
--- /dev/null
+++ b/build/build_options/ALPHA_FS_TL
@@ -0,0 +1,7 @@
+FULL_SYSTEM = 1
+ALPHA_TLASER = 1
+NO_FAST_ALLOC = 0
+EFENCE = 0
+SS_COMPATIBLE_FP = 0
+STATS_BINNING = 1
+USE_MYSQL = 1
diff --git a/build/build_options/ALPHA_SE b/build/build_options/ALPHA_SE
new file mode 100644
index 000000000..810c641f6
--- /dev/null
+++ b/build/build_options/ALPHA_SE
@@ -0,0 +1,7 @@
+FULL_SYSTEM = 0
+ALPHA_TLASER = 0
+NO_FAST_ALLOC = 0
+EFENCE = 0
+SS_COMPATIBLE_FP = 1
+STATS_BINNING = 1
+USE_MYSQL = 1