diff options
| author | Nick Foster | 2011-04-16 15:38:57 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-16 15:38:57 -0700 |
| commit | cd0cc571d90fd2e0b8c9376ce07150db5f405fb7 (patch) | |
| tree | 5e16ebc6e4f40913e2753eedd938f13e28d8868b /volk | |
| parent | 52f77cf961279fc9167b101df6c7a6282a1fb0ad (diff) | |
| download | gnuradio-cd0cc571d90fd2e0b8c9376ce07150db5f405fb7.tar.gz gnuradio-cd0cc571d90fd2e0b8c9376ce07150db5f405fb7.tar.bz2 gnuradio-cd0cc571d90fd2e0b8c9376ce07150db5f405fb7.zip | |
Volk: Compiles and runs with or without Orc installed.
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/include/volk/machines.xml | 16 | ||||
| -rw-r--r-- | volk/include/volk/make_each_machine_c.py | 10 | ||||
| -rw-r--r-- | volk/include/volk/make_makefile_am.py | 7 |
3 files changed, 13 insertions, 20 deletions
diff --git a/volk/include/volk/machines.xml b/volk/include/volk/machines.xml index 9bf838527..ad71da177 100644 --- a/volk/include/volk/machines.xml +++ b/volk/include/volk/machines.xml @@ -15,35 +15,35 @@ --> <machine name="sse2"> -<archs>generic orc 32|64 mmx sse sse2</archs> +<archs>generic 32|64 mmx sse sse2</archs> </machine> <machine name="sse3"> -<archs>generic orc 32|64 mmx sse sse2 sse3</archs> +<archs>generic 32|64 mmx sse sse2 sse3</archs> </machine> <machine name="ssse3"> -<archs>generic orc 32|64 mmx sse sse2 sse3 ssse3</archs> +<archs>generic 32|64 mmx sse sse2 sse3 ssse3</archs> </machine> <machine name="sse4_a"> -<archs>generic orc 32|64 mmx sse sse2 sse3 sse4_a popcount</archs> +<archs>generic 32|64 mmx sse sse2 sse3 sse4_a popcount</archs> </machine> <machine name="sse4_1"> -<archs>generic orc 32|64 mmx sse sse2 sse3 ssse3 sse4_1</archs> +<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1</archs> </machine> <machine name="sse4_2"> -<archs>generic orc 32|64 mmx sse sse2 sse3 ssse3 sse4_2 popcount</archs> +<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_2 popcount</archs> </machine> <machine name="avx"> -<archs>generic orc 32|64 mmx sse sse2 sse3 ssse3 sse4_2 popcount avx</archs> +<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_2 popcount avx</archs> </machine> <machine name="altivec"> -<archs>generic orc altivec</archs> +<archs>generic altivec</archs> </machine> </grammar> diff --git a/volk/include/volk/make_each_machine_c.py b/volk/include/volk/make_each_machine_c.py index 4efbe9e8c..94d6d7789 100644 --- a/volk/include/volk/make_each_machine_c.py +++ b/volk/include/volk/make_each_machine_c.py @@ -46,12 +46,12 @@ def make_each_machine_c(machine_name, archs, functions, fcountlist, taglist): tags_counter = 0 for arch_list in fcountlist[i]: - ok = True + tempstring += "#if " for arch in arch_list: - if arch.swapcase() not in archs: - ok = False - if ok: - tempstring += " " + functions[i] + "_" + str(taglist[i][tags_counter]) + ",\n" + tempstring += "defined(LV_HAVE_" + arch + ") && " + tempstring = strip_trailing(tempstring, " && ") + tempstring += "\n " + functions[i] + "_" + str(taglist[i][tags_counter]) + ",\n" + tempstring += "#endif\n" tags_counter += 1 tempstring = strip_trailing(tempstring, ",") diff --git a/volk/include/volk/make_makefile_am.py b/volk/include/volk/make_makefile_am.py index eaff7f3c8..c73730859 100644 --- a/volk/include/volk/make_makefile_am.py +++ b/volk/include/volk/make_makefile_am.py @@ -82,13 +82,6 @@ noinst_LTLIBRARIES = tempstring += "\nnoinst_LTLIBRARIES += libvolk_" + machine_name + ".la " tempstring += "\nlibvolk_la_LIBADD += libvolk_" + machine_name + ".la\n" tempstring += "libvolk_la_CPPFLAGS += -DLV_MACHINE_" + machine_name.swapcase() + " \n" - #tempstring += "if LV_HAVE_ORC\n" - #tempstring += "libvolk_" + machine_name + "_la_LIBADD = $(volk_orc_LIBADD)\n" - #tempstring += "libvolk_" + machine_name + "_la_LDFLAGS = $(volk_orc_LDFLAGS)\n" - #tempstring += "else\n" - #tempstring += "libvolk_" + machine_name + "_la_LIBADD = \n" - #tempstring += "libvolk_" + machine_name + "_la_LDFLAGS = \n" - #tempstring += "endif\n" tempstring += "endif\n" |