Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-core / src / lib / filter / cpuid_x86.S

diff --git a/gnuradio-core/src/lib/filter/cpuid_x86.S b/gnuradio-core/src/lib/filter/cpuid_x86.S
index 5da71f5fd92e4775122f4bcd05a310f05c1483ed..4e1a9404f566e23b136e02f12b20c9a417b461ba 100644 (file)
--- a/gnuradio-core/src/lib/filter/cpuid_x86.S
+++ b/gnuradio-core/src/lib/filter/cpuid_x86.S
@@ -5,7 +5,7 @@
 # 
 # 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 2, or (at your option)
+# 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,
@@ -54,3 +54,7 @@ GLOB_SYMB(cpuid_x86):
 FUNC_TAIL(cpuid_x86)
        .ident  "Hand coded cpuid assembly"
        
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif