diff options
| author | Tom Rondeau | 2011-01-23 13:12:24 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-23 13:12:24 -0500 |
| commit | 20b7917f3853b510f213a78decca5061a6ae6892 (patch) | |
| tree | 36da7d23b6d18f3a4de2203a9979a3b9a510d3c6 /volk/Makefile.common | |
| parent | 499bb149412e9b01419f82c755e6845338ba3b58 (diff) | |
| parent | 5aeb617549b92eec3fe978e5fad12eacbed97f65 (diff) | |
| download | gnuradio-20b7917f3853b510f213a78decca5061a6ae6892.tar.gz gnuradio-20b7917f3853b510f213a78decca5061a6ae6892.tar.bz2 gnuradio-20b7917f3853b510f213a78decca5061a6ae6892.zip | |
Merge branch 'mergeme/volk/x86_cpuid_simplification' into next
Diffstat (limited to 'volk/Makefile.common')
| -rw-r--r-- | volk/Makefile.common | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/volk/Makefile.common b/volk/Makefile.common index daa8d78b6..e91a55e9c 100644 --- a/volk/Makefile.common +++ b/volk/Makefile.common @@ -26,19 +26,8 @@ if MD_CPU_generic endif if MD_CPU_x86 -if MD_SUBCPU_x86_64 platform_CODE = \ - $(top_srcdir)/lib/volk_cpu_x86.c \ - $(top_srcdir)/lib/cpuid_x86_64.S -endif -endif - -if MD_CPU_x86 -if !MD_SUBCPU_x86_64 - platform_CODE = \ - $(top_srcdir)/lib/volk_cpu_x86.c \ - $(top_srcdir)/lib/cpuid_x86.S -endif + $(top_srcdir)/lib/volk_cpu_x86.c endif if MD_CPU_powerpc |