diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-12-14 17:23:20 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-12-14 17:23:20 -0800 |
| commit | 26415a1445490cc3230c5d793a41703931ae9d01 (patch) | |
| tree | 531125c62472579415c74fa28b4d18c31db2c4f6 | |
| parent | 2e9a7d350713b4e1b21458db8f3fce8a557858ae (diff) | |
Volk: Nick's commits to make adding Orc a little more structurally sound
| -rw-r--r-- | volk/include/volk/archs.xml | 2 | ||||
| -rw-r--r-- | volk/include/volk/make_set_simd.py | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/volk/include/volk/archs.xml b/volk/include/volk/archs.xml index a828e5ad09..b61bfca098 100644 --- a/volk/include/volk/archs.xml +++ b/volk/include/volk/archs.xml @@ -7,6 +7,8 @@ <arch name="orc" type="all"> <flag>lorc-0.4</flag> + <overrule>HAVE_ORC</overrule> + <overrule_val>no</overrule_val> </arch> <arch name="altivec" type="powerpc"> diff --git a/volk/include/volk/make_set_simd.py b/volk/include/volk/make_set_simd.py index 78a00476d5..d7109cfcba 100644 --- a/volk/include/volk/make_set_simd.py +++ b/volk/include/volk/make_set_simd.py @@ -110,10 +110,7 @@ def make_set_simd(dom) : arch = str(domarch.attributes["name"].value); tempstring = tempstring + " AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [always set "+ arch + "!])\n"; tempstring = tempstring + " ADDONS=\"\"\n"; - tempstring = tempstring + " BUILT_ARCHS=\"generic\"\n"; - tempstring = tempstring + " if test $HAVE_ORC = yes; then\n"; - tempstring = tempstring + " BUILT_ARCHS=\"${BUILT_ARCHS} orc\"\n"; - tempstring = tempstring + " fi\n"; + tempstring = tempstring + " BUILT_ARCHS=\"\"\n"; tempstring = tempstring + " _MAKE_FAKE_PROCCPU\n"; tempstring = tempstring + " OVERRULE_FLAG=\"no\"\n"; tempstring = tempstring + " if test -z \"$cf_with_lv_arch\"; then\n"; @@ -183,14 +180,11 @@ def make_set_simd(dom) : tempstring = tempstring + " indCXX=no\n" tempstring = tempstring + " indLV_ARCH=no\n" elif atype == "all": - if arch == "orc": - tempstring = tempstring + " if test $HAVE_ORC = yes; then\n"; - tempstring = tempstring + " AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n"; - tempstring = tempstring + " LV_HAVE_" + arch.swapcase() + "=yes\n"; - tempstring = tempstring + " fi\n"; - else: - tempstring = tempstring + " AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n"; - tempstring = tempstring + " LV_HAVE_" + arch.swapcase() + "=yes\n"; + tempstring = tempstring + " if test -z \"" + overrule + "\" || test \"$" + overrule + "\" != \"" + overrule_val + "\" || test \"$OVERRULE_FLAG\" == \"no\"; then\n" + tempstring = tempstring + " AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n"; + tempstring = tempstring + " LV_HAVE_" + arch.swapcase() + "=yes\n"; + tempstring = tempstring + " BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n"; + tempstring = tempstring + " fi\n" tempstring = tempstring + " ;;\n" tempstring = tempstring + " (powerpc)\n" @@ -234,11 +228,15 @@ def make_set_simd(dom) : tempstring = tempstring + " indCXX=no\n" tempstring = tempstring + " indLV_ARCH=no\n" elif atype == "all": + tempstring = tempstring + " if test -z \"" + overrule + "\" || test \"$" + overrule + "\" != \"" + overrule_val + "\" || test \"$OVERRULE_FLAG\" == \"no\"; then\n" tempstring = tempstring + " AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n"; tempstring = tempstring + " LV_HAVE_" + arch.swapcase() + "=yes\n"; + tempstring = tempstring + " BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n"; + tempstring = tempstring + " fi\n" tempstring = tempstring + " ;;\n" tempstring = tempstring + " esac\n" tempstring = tempstring + " LV_CXXFLAGS=\"${LV_CXXFLAGS} ${ADDONS}\"\n" + tempstring = tempstring + " AM_CONDITIONAL(LV_HAVE_ORC, [test \"$LV_HAVE_ORC\" = \"yes\"])\n"; tempstring = tempstring + "])\n" return tempstring; |