diff options
| author | Josh Blum | 2012-04-16 00:41:16 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-04-19 18:12:55 -0700 |
| commit | 25a3690954d80819fe59e179e4675c5cdf81a347 (patch) | |
| tree | 06e8a184e76a7955ba7a4891dedda47515f08170 /volk/gen | |
| parent | 3af0f815ae3442dacdac78acf238b277f472c404 (diff) | |
| download | gnuradio-25a3690954d80819fe59e179e4675c5cdf81a347.tar.gz gnuradio-25a3690954d80819fe59e179e4675c5cdf81a347.tar.bz2 gnuradio-25a3690954d80819fe59e179e4675c5cdf81a347.zip | |
volk: make orc a normal arch with overrule
Diffstat (limited to 'volk/gen')
| -rw-r--r-- | volk/gen/archs.xml | 8 | ||||
| -rw-r--r-- | volk/gen/machines.xml | 4 | ||||
| -rw-r--r-- | volk/gen/volk_machine_defs.py | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/volk/gen/archs.xml b/volk/gen/archs.xml index 59cc81cc5..2b0e8e508 100644 --- a/volk/gen/archs.xml +++ b/volk/gen/archs.xml @@ -89,7 +89,13 @@ </arch> <arch name="orc" type="all"> - <flag>lorc-0.4</flag> + <flag>none</flag> + <overrule>LV_HAVE_ORC</overrule> + <overrule_val>no</overrule_val> +</arch> + +<arch name="norc" type="all"> + <flag>none</flag> <overrule>LV_HAVE_ORC</overrule> <overrule_val>no</overrule_val> </arch> diff --git a/volk/gen/machines.xml b/volk/gen/machines.xml index 04ffef22b..6ce077e3c 100644 --- a/volk/gen/machines.xml +++ b/volk/gen/machines.xml @@ -48,10 +48,6 @@ <archs>generic 32|64| mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount avx</archs> </machine> -<machine name="avx_only"> -<archs>generic mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount avx</archs> -</machine> - <machine name="altivec"> <archs>generic altivec</archs> </machine> diff --git a/volk/gen/volk_machine_defs.py b/volk/gen/volk_machine_defs.py index b30a480ba..77ebe64f0 100644 --- a/volk/gen/volk_machine_defs.py +++ b/volk/gen/volk_machine_defs.py @@ -69,7 +69,7 @@ for machine_xml in machines_xml: val = machine_xml.getElementsByTagName(name)[0].firstChild.data kwargs[name] = val except: pass - kwargs['archs'] = kwargs['archs'].split() + kwargs['archs'] = kwargs['archs'].split() + ['orc|norc'] register_machine(**kwargs) if __name__ == '__main__': |