2 files changed, 9 insertions, 1 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 342c174e71..c882c54d9b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -90,6 +90,13 @@ PACKAGE_ARCH = "${HOST_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
 PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
 
+# select proper CPU to get binary locales generated
+QEMU_OPTIONS = ""
+QEMU_OPTIONS_iwmmxt  = "-cpu pxa270-c5"
+QEMU_OPTIONS_armv4t  = "-cpu arm920t"
+QEMU_OPTIONS_armv5te = "-cpu arm926"
+QEMU_OPTIONS_armv6   = "-cpu arm1136"
+
 ##################################################################
 # Date/time variables.
 ##################################################################
diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass
index bc51d6b1b9..1dc1f9c133 100644
--- a/meta/packages/glibc/glibc-package.bbclass
+++ b/meta/packages/glibc/glibc-package.bbclass
@@ -260,7 +260,8 @@ python package_do_split_gconvs () {
                 i18npath = base_path_join(treedir, datadir, "i18n")
 
                 localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
-                cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts)
+                qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1)
+                cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, qemu_options, treedir, localedef_opts)
                 bb.note("generating locale %s (%s)" % (locale, encoding))
                 if os.system(cmd):
                         raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd)