Correct hw_ncores setting

spec.py

@@ -233,8 +233,12 @@ def generate_spec_config(options):
 	contents.append("")
 	contents.append("hw_cpu_name = %s" % cpuinfo["model name"])
 	contents.append("hw_cpu_mhz = %s" % cpuinfo["cpu MHz"])
-	contents.append("hw_nchips = %d" % (1+int(cpuinfo["processor"])))
-	contents.append("hw_ncores = %d" % int(cpuinfo["cpu cores"]))
+	chips = (1+int(cpuinfo["processor"]))
+	cores_per_chip = int(cpuinfo["cpu cores"])
+	cores = cores_per_chip * chips
+	contents.append("hw_nchips = %d" % chips)
+	contents.append("hw_ncores = %d" % cores)
+	contents.append("hw_ncoresperchip = %d" % cores_per_chip)
 	contents.append("hw_vendor = %s" % cpuinfo["vendor_id"])
 	contents.append("hw_memory = %s" % meminfo["MemTotal"])
 	contents.append("")