diff options
| author | Josh Blum | 2012-04-16 13:38:44 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-04-19 18:12:56 -0700 |
| commit | 0faf0107e38e93bc3fddf8296449a1439978bec1 (patch) | |
| tree | 83d2b252ef2ef3723afb2d3887db8a7a893b36f5 /volk/gen | |
| parent | cacfd391b8bfde1331158612ec1376f27cb7391f (diff) | |
| download | gnuradio-0faf0107e38e93bc3fddf8296449a1439978bec1.tar.gz gnuradio-0faf0107e38e93bc3fddf8296449a1439978bec1.tar.bz2 gnuradio-0faf0107e38e93bc3fddf8296449a1439978bec1.zip | |
volk: updated build system for avx checking support
updated copy of cpuid.h with the latest from gcc 4.6
Diffstat (limited to 'volk/gen')
| -rw-r--r-- | volk/gen/volk_arch_defs.py | 1 | ||||
| -rw-r--r-- | volk/gen/volk_tmpl_utils.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/volk/gen/volk_arch_defs.py b/volk/gen/volk_arch_defs.py index 4f4796840..fd81eed8c 100644 --- a/volk/gen/volk_arch_defs.py +++ b/volk/gen/volk_arch_defs.py @@ -35,6 +35,7 @@ class arch_class: ('environment', str, None), ('include', str, None), ('alignment', int, 1), + ('check', str, None), ): try: setattr(self, key, cast(kwargs[key])) except: setattr(self, key, failval) diff --git a/volk/gen/volk_tmpl_utils.py b/volk/gen/volk_tmpl_utils.py index 9d7a0d0e5..c215e389e 100644 --- a/volk/gen/volk_tmpl_utils.py +++ b/volk/gen/volk_tmpl_utils.py @@ -34,7 +34,7 @@ def __escape_pre_processor(code): m = re.match('^(\s*)#(\s*)(\w+)(.*)$', line) if m: p0, p1, fcn, stuff = m.groups() - conly = fcn in ('include', 'define', 'ifdef', 'ifndef', 'endif', 'elif') + conly = fcn in ('include', 'define', 'ifdef', 'ifndef', 'endif', 'elif', 'pragma') both = fcn in ('if', 'else') istmpl = '$' in stuff if 'defined' in stuff: istmpl = False |