Extend portability settings

spec.py

@@ -105,12 +105,36 @@ def get_sw_compiler(options):
 		get_compiler_version(options.fortran_compiler)
 	])
 
-def get_portability():
-	"""Get necessary portability flags"""
-	contents = ["\n\n#### Portability Flags ####"]
-	if LINUX_NAME == "Ubuntu":
-		if BITSIZE == 32:
-			contents.append("""\
+PORTABILITY_FLAGS = dict()
+PORTABILITY_FLAGS[("SPEC CPU2000", "Ubuntu", 32)] = """\
+176.gcc=default=default=default:
+CPORTABILITY =
+notes003 = CPORTABILITY 176.gcc: -fno-strict-aliasing
+
+186.crafty=default=default=default:
+CPORTABILITY = -DLINUX_i386
+notes004 = CPORTABILITY 186.crafty: -DLINUX_i386
+
+252.eon=default=default=default:
+CXXPORTABILITY = -DHAS_ERRLIST
+notes005 = CXXPORTABILITY 252.eon: -DHAS_ERRLIST
+
+253.perlbmk=default=default=default: 
+CPORTABILITY = -DSPEC_CPU2000_NEED_BOOL -DSPEC_CPU2000_LINUX_I386
+notes006 = CPORTABILITY 253.perlbmk: -DSPEC_CPU2000_NEED_BOOL -DSPEC_CPU2000_LINUX_I386
+
+254.gap=default=default=default:
+CPORTABILITY = -DSYS_HAS_SIGNAL_PROTO -DSYS_HAS_MALLOC_PROTO -DSYS_HAS_CALLOC_PROTO -DSYS_IS_USG -DSYS_HAS_IOCTL_PROTO -DSYS_HAS_TIME_PROTO
+notes007 = CPORTABILITY 254.gap: -DSYS_HAS_SIGNAL_PROTO -DSYS_HAS_MALLOC_PROTO -DSYS_HAS_CALLOC_PROTO -DSYS_IS_USG -DSYS_HAS_IOCTL_PROTO -DSYS_HAS_TIME_PROTO
+
+255.vortex=default=default=default:
+CPORTABILITY = -fno-strict-aliasing
+notes008 = CPORTABILITY 255.vortex: -fno-strict-aliasing
+
+187.facerec=default=default=default: 
+EXTRA_FFLAGS= -I../src
+"""
+PORTABILITY_FLAGS[("SPEC CPU2006", "Ubuntu", 32)] = """\
 400.perlbench=default=default=default:
 CPORTABILITY= -DSPEC_CPU_LINUX_IA32
 
@@ -122,9 +146,8 @@ CXXPORTABILITY= -DSPEC_CPU_LINUX
 
 481.wrf=default=default=default:
 CPORTABILITY = -DSPEC_CPU_CASE_FLAG -DSPEC_CPU_LINUX
-""")
-		elif BITSIZE == 64:
-			contents.append("""\
+"""
+PORTABILITY_FLAGS[("SPEC CPU2006", "Ubuntu", 64)] = """\
 default=base=default=default:
 PORTABILITY = -DSPEC_CPU_LP64 
 
@@ -139,7 +162,16 @@ CXXPORTABILITY= -DSPEC_CPU_LINUX
 
 481.wrf=default=default=default:
 CPORTABILITY = -DSPEC_CPU_CASE_FLAG -DSPEC_CPU_LINUX
-""")
+"""
+
+def get_portability():
+	"""Get necessary portability flags"""
+	contents = ["\n\n#### Portability Flags ####"]
+	for (suite,os,bitsize),text in PORTABILITY_FLAGS.items():
+		if suite != SPEC_SUITE: continue
+		if os != LINUX_NAME: continue
+		if bitsize != BITSIZE: continue
+		contents.append(text)
 	return "\n".join(contents)
 
 def generate_spec_config(options):