ATF arch/machine vs. OS arch/machine

[Nicolas Joly <njoly%pasteur.fr@localhost>]

Hi,

While looking into ATF meta-data properties, especially require.arch
and require.machine, i noticed that atf-config(1) and uname(1) show
inverted values for arch and machine on my NetBSD/amd64 workstation.

njoly@lanfeust [~]> atf-config -t atf_machine
x86_64
njoly@lanfeust [~]> uname -m
amd64

njoly@lanfeust [~]> atf-config -t atf_arch
amd64
njoly@lanfeust [~]> uname -p
x86_64

This comes from the following configure.ac code:

dnl -----------------------------------------------------------------------
dnl Architecture and machine checks.
dnl -----------------------------------------------------------------------

machine=${target_cpu}

case ${machine} in
    i@<:@3-9@:>@86)
        arch=i386
        ;;
    x86_64)
        arch=amd64
        ;;
    *)
        arch=${machine}
        ;;
esac

AC_MSG_NOTICE([Machine type: ${machine}, architecture: ${arch}])
AC_SUBST(atf_arch, ${arch})
AC_SUBST(atf_machine, ${machine})

I fear there is no good solution for this problem, as it may vary for
about every OS (example below); but i find this particular case very
confusing.

            machine        arch
ATF         x86_64         amd64
NetBSD      amd64          x86_64
FreeBSD     amd64          amd64
Linux       x86_64         x86_64

-- 
Nicolas Joly

Biological Software and Databanks.
Institut Pasteur, Paris.