Creates volk_cpu in a .cc file and externs it in the header.

2 files changed, 47 insertions, 1 deletions

diff --git a/volk/include/volk/make_cpuid_h.py b/volk/include/volk/make_cpuid_h.py
index 823e3b2c0..cd3da2455 100644
--- a/volk/include/volk/make_cpuid_h.py
+++ b/volk/include/volk/make_cpuid_h.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
 from xml.dom import minidom
 from emit_omnilog import *
 
@@ -13,7 +35,8 @@ def make_cpuid_h(dom) :
     for domarch in dom:
         arch = str(domarch.attributes["name"].value);
         tempstring = tempstring + "    int (*has_" + arch + ") ();\n";
-    tempstring = tempstring + "}volk_cpu;\n\n";
+    tempstring = tempstring + "};\n\n";
+    tempstring = tempstring + "extern struct VOLK_CPU volk_cpu;\n\n";
 
     tempstring = tempstring + "void volk_cpu_init ();\n"
     tempstring = tempstring + "unsigned int volk_get_lvarch ();\n"
diff --git a/volk/include/volk/make_proccpu_sim.py b/volk/include/volk/make_proccpu_sim.py
index c75a4d5fb..e8463f5be 100644
--- a/volk/include/volk/make_proccpu_sim.py
+++ b/volk/include/volk/make_proccpu_sim.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
 from xml.dom import minidom
 
 def make_proccpu_sim(dom) :
@@ -6,6 +28,7 @@ def make_proccpu_sim(dom) :
     tempstring = tempstring + "#include <volk/volk_cpu.h>\n"
     tempstring = tempstring + "#include <stdio.h>\n"
     tempstring = tempstring + "\n\n"
+    tempstring = tempstring + "struct VOLK_CPU volk_cpu;\n\n"
 
     tempstring = tempstring + "void test_append(char* buf,  int val, char* newkey){\n";
     tempstring = tempstring + "    if(val==1){\n";