From 3552daa7ac08c8dd2fc59393fc57e0b4e7aec94e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 19 Aug 2015 04:27:04 -0700 Subject: Use x86-64 cacheinfo.c and sysconf.c for x86 Since _dl_x86_cpu_features is always available, we can use x86-64 cacheinfo.c and sysconf.c for both i386 and x86-64. * sysdeps/i386/i686/Makefile [$(subdir) == string] (sysdep_routines): Moved to ... * sysdeps/i386/Makefile: Here. * sysdeps/i386/i686/cacheinfo.c: Moved to ... * sysdeps/i386/cacheinfo.c: Here. * sysdeps/unix/sysv/linux/i386/sysconf.c: Removed. * sysdeps/unix/sysv/linux/i386/i686/sysconf.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysconf.c: Moved to ... * sysdeps/unix/sysv/linux/x86/sysconf.c: Here. --- sysdeps/i386/Makefile | 4 ++++ sysdeps/i386/cacheinfo.c | 3 +++ sysdeps/i386/i686/Makefile | 4 ---- sysdeps/i386/i686/cacheinfo.c | 3 --- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 sysdeps/i386/cacheinfo.c delete mode 100644 sysdeps/i386/i686/cacheinfo.c (limited to 'sysdeps/i386') diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile index 11f425dc92..717d8e7454 100644 --- a/sysdeps/i386/Makefile +++ b/sysdeps/i386/Makefile @@ -5,6 +5,10 @@ asm-CPPFLAGS += -DGAS_SYNTAX # The i386 `long double' is a distinct type we support. long-double-fcts = yes +ifeq ($(subdir),string) +sysdep_routines += cacheinfo +endif + ifeq ($(subdir),gmon) sysdep_routines += i386-mcount endif diff --git a/sysdeps/i386/cacheinfo.c b/sysdeps/i386/cacheinfo.c new file mode 100644 index 0000000000..0b50c6d346 --- /dev/null +++ b/sysdeps/i386/cacheinfo.c @@ -0,0 +1,3 @@ +#define DISABLE_PREFETCHW + +#include diff --git a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile index 5ce9fc670a..bafe5f7d61 100644 --- a/sysdeps/i386/i686/Makefile +++ b/sysdeps/i386/i686/Makefile @@ -1,10 +1,6 @@ # So that we can test __m128's alignment stack-align-test-flags += -msse -ifeq ($(subdir),string) -sysdep_routines += cacheinfo -endif - ifeq (yes,$(config-asflags-i686)) CFLAGS-.o += -Wa,-mtune=i686 CFLAGS-.os += -Wa,-mtune=i686 diff --git a/sysdeps/i386/i686/cacheinfo.c b/sysdeps/i386/i686/cacheinfo.c deleted file mode 100644 index 0b50c6d346..0000000000 --- a/sysdeps/i386/i686/cacheinfo.c +++ /dev/null @@ -1,3 +0,0 @@ -#define DISABLE_PREFETCHW - -#include -- cgit 1.4.1