Commit bd82acd6 authored by Matthias Braun's avatar Matthias Braun
Browse files

there is no notes_comp field, use notes

parent 2c76fe45
......@@ -376,6 +376,7 @@ def generate_spec_config(options, progs):
contents = [_CONFIG_HEAD]
cpuinfo = get_cpu_info()
meminfo = get_mem_info()
notes = 0
if options.build_only:
contents.append("action = build")
else:
......@@ -426,14 +427,20 @@ def generate_spec_config(options, progs):
contents.append("CXX = %s" % options.cpp_compiler)
contents.append("FC = %s" % options.fortran_compiler)
contents.append("")
contents.append("notes%03d = machine: %s" % (notes, socket.getfqdn()))
notes += 1
contents.append("OPTIMIZE = %s" % " ".join(options.compiler_args))
contents.append("notes_comp_001 OPTIMIZE = %s" % " ".join(options.compiler_args))
contents.append("notes%03d = OPTIMIZE = %s" % (notes, " ".join(options.compiler_args)))
notes += 1
contents.append("COPTIMIZE = %s" % " ".join(options.c_compiler_args))
contents.append("notes_comp_002 COPTIMIZE = %s" % " ".join(options.c_compiler_args))
contents.append("notes%03d = COPTIMIZE = %s" % (notes, " ".join(options.c_compiler_args)))
notes += 1
contents.append("CXXOPTIMIZE = %s" % " ".join(options.cpp_compiler_args))
contents.append("notes_comp_003 CXXOPTIMIZE = %s" % " ".join(options.cpp_compiler_args))
contents.append("notes%03d = CXXOPTIMIZE = %s" % (notes, " ".join(options.cpp_compiler_args)))
notes += 1
contents.append("FOPTIMIZE = %s" % " ".join(options.fortran_compiler_args))
contents.append("notes_comp_004 FOPTIMIZE = %s" % " ".join(options.fortran_compiler_args))
contents.append("notes%03d = FOPTIMIZE = %s" % (notes, " ".join(options.fortran_compiler_args)))
notes += 1
if HOST_ARCH == "x86_64" and options.target_architecture == "i686":
contents.append("EXTRA_CFLAGS = -m32")
contents.append("EXTRA_LDFLAGS = -m32")
......@@ -442,9 +449,6 @@ def generate_spec_config(options, progs):
if options.target_architecture == "sparc":
contents.append("\nendian = 4321")
notes = 0
contents.append("notes%03d = machine: %s" % (notes, socket.getfqdn()))
notes += 1
contents.append("\n\n#### Portability flags ####")
for (suite, subset, prog, lang) in BENCHMARK_PROPERTIES:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment