fix CPU symbol names, oops

target/config/Config.in.cpu

@@ -1576,6 +1576,11 @@ config ADK_TARGET_CPU_TYPE
 	default "fsf" if ADK_TARGET_CPU_XTENSA_FSF
 	default "crisv10" if ADK_TARGET_CPU_CRIS_CRISV10
 	default "crisv32" if ADK_TARGET_CPU_CRIS_CRISV32
+	default "sh2" if ADK_TARGET_CPU_SH_SH2
+	default "sh2a" if ADK_TARGET_CPU_SH_SH2A
+	default "sh3" if ADK_TARGET_CPU_SH_SH3
+	default "sh4" if ADK_TARGET_CPU_SH_SH4
+	default "sh4a" if ADK_TARGET_CPU_SH_SH4A
 
 # required for the correct toolchain triple
 config ADK_TARGET_CPU_ARCH
@@ -1593,13 +1598,12 @@ config ADK_TARGET_CPU_ARCH
 	default "cris" if ADK_TARGET_CPU_CRIS_CRISV10
 	default "crisv32" if ADK_TARGET_CPU_CRIS_CRISV32
 	default "frv" if ADK_TARGET_ARCH_FRV
-	default "i486" if ADK_TARGET_CPU_I486
+	default "i486" if ADK_TARGET_CPU_X86_I486
-	default "i586" if ADK_TARGET_CPU_I586
+	default "i586" if ADK_TARGET_CPU_X86_I586
-	default "i686" if ADK_TARGET_CPU_I686
+	default "i686" if ADK_TARGET_CPU_X86_I686
-	default "i586" if ADK_TARGET_CPU_GEODE
+	default "i586" if ADK_TARGET_CPU_X86_GEODE
-	default "i686" if ADK_TARGET_CPU_PENTIUM_M
+	default "i686" if ADK_TARGET_CPU_X86_PENTIUM_M
-	default "i686" if ADK_TARGET_CPU_ATOM
+	default "i686" if ADK_TARGET_CPU_X86_ATOM
-	default "i686" if ADK_TARGET_CPU_ATHLON
 	default "h8300" if ADK_TARGET_ARCH_H8300
 	default "hppa" if ADK_TARGET_ARCH_HPPA
 	default "ia64" if ADK_TARGET_ARCH_IA64
@@ -1621,19 +1625,19 @@ config ADK_TARGET_CPU_ARCH
 	default "ppc64le" if ADK_TARGET_ARCH_PPC64 && ADK_TARGET_LITTLE_ENDIAN
 	default "ppc64" if ADK_TARGET_ARCH_PPC64 && ADK_TARGET_BIG_ENDIAN
 	default "s390x" if ADK_TARGET_ARCH_S390
-	default "sh2" if ADK_TARGET_CPU_SH2 && ADK_TARGET_LITTLE_ENDIAN
+	default "sh2" if ADK_TARGET_CPU_SH_SH2 && ADK_TARGET_LITTLE_ENDIAN
-	default "sh2eb" if ADK_TARGET_CPU_SH2 && ADK_TARGET_BIG_ENDIAN
+	default "sh2eb" if ADK_TARGET_CPU_SH_SH2 && ADK_TARGET_BIG_ENDIAN
-	default "sh2a" if ADK_TARGET_CPU_SH2A
+	default "sh2a" if ADK_TARGET_CPU_SH_SH2A
-	default "sh3" if ADK_TARGET_CPU_SH3 && ADK_TARGET_LITTLE_ENDIAN
+	default "sh3" if ADK_TARGET_CPU_SH_SH3 && ADK_TARGET_LITTLE_ENDIAN
-	default "sh3eb" if ADK_TARGET_CPU_SH3 && ADK_TARGET_BIG_ENDIAN
+	default "sh3eb" if ADK_TARGET_CPU_SH_SH3 && ADK_TARGET_BIG_ENDIAN
-	default "sh4" if ADK_TARGET_CPU_SH4 && ADK_TARGET_LITTLE_ENDIAN
+	default "sh4" if ADK_TARGET_CPU_SH_SH4 && ADK_TARGET_LITTLE_ENDIAN
-	default "sh4eb" if ADK_TARGET_CPU_SH4 && ADK_TARGET_BIG_ENDIAN
+	default "sh4eb" if ADK_TARGET_CPU_SH_SH4 && ADK_TARGET_BIG_ENDIAN
-	default "sh4a" if ADK_TARGET_CPU_SH4A && ADK_TARGET_LITTLE_ENDIAN
+	default "sh4a" if ADK_TARGET_CPU_SH_SH4A && ADK_TARGET_LITTLE_ENDIAN
-	default "sh4aeb" if ADK_TARGET_CPU_SH4A && ADK_TARGET_BIG_ENDIAN
+	default "sh4aeb" if ADK_TARGET_CPU_SH_SH4A && ADK_TARGET_BIG_ENDIAN
 	default "sparc" if ADK_TARGET_ARCH_SPARC
 	default "sparc64" if ADK_TARGET_ARCH_SPARC64
-	default "tilegx" if ADK_TARGET_CPU_TILEGX
+	default "tilegx" if ADK_TARGET_CPU_TILE_TILEGX
-	default "tilepro" if ADK_TARGET_CPU_TILEPRO
+	default "tilepro" if ADK_TARGET_CPU_TILE_TILEPRO
 	default "v850" if ADK_TARGET_ARCH_V850
 	default "x86_64" if ADK_TARGET_ARCH_X86_64
 	default "xtensa" if ADK_TARGET_ARCH_XTENSA