intel directory renamed to x86.

20 files changed, 6 insertions, 6 deletions

diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index 440a73bd7b..b0f199de34 100644
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -37,7 +37,7 @@ libaccelerated_la_SOURCES = accelerated.c cryptodev.c
 libaccelerated_la_LIBADD =
 
 if ASM_X86
-SUBDIRS += intel
+SUBDIRS += x86
 AM_CFLAGS += -DASM_X86
-libaccelerated_la_LIBADD += intel/libintel.la
+libaccelerated_la_LIBADD += x86/libx86.la
 endif
diff --git a/lib/accelerated/intel/.gitignore b/lib/accelerated/x86/.gitignore
index 954b3b01ea..954b3b01ea 100644
--- a/lib/accelerated/intel/.gitignore
+++ b/lib/accelerated/x86/.gitignore
diff --git a/lib/accelerated/intel/Makefile.am b/lib/accelerated/x86/Makefile.am
index 315c2775a1..afd77ce659 100644
--- a/lib/accelerated/intel/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -32,15 +32,15 @@ endif
 
 EXTRA_DIST = README license.txt
 
-noinst_LTLIBRARIES = libintel.la
+noinst_LTLIBRARIES = libx86.la
 
-libintel_la_SOURCES = sha-padlock.c aes-x86.c aes-padlock.c aes-gcm-padlock.c aes-padlock.h aes-x86.h x86.h
+libx86_la_SOURCES = sha-padlock.c aes-x86.c aes-padlock.c aes-gcm-padlock.c aes-padlock.h aes-x86.h x86.h
 
 if ASM_X86_64
 AM_CPPFLAGS += -DASM_X86_64
-libintel_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s aes-gcm-x86.c asm/padlock-x86-64.s asm/cpuid-x86-64.s
+libx86_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s aes-gcm-x86.c asm/padlock-x86-64.s asm/cpuid-x86-64.s
 else
 AM_CPPFLAGS += -DASM_X86_32
-libintel_la_SOURCES += asm/appro-aes-x86.s asm/padlock-x86.s asm/cpuid-x86.s
+libx86_la_SOURCES += asm/appro-aes-x86.s asm/padlock-x86.s asm/cpuid-x86.s
 endif
 
diff --git a/lib/accelerated/intel/README b/lib/accelerated/x86/README
index dc1f43fa42..dc1f43fa42 100644
--- a/lib/accelerated/intel/README
+++ b/lib/accelerated/x86/README
diff --git a/lib/accelerated/intel/aes-gcm-padlock.c b/lib/accelerated/x86/aes-gcm-padlock.c
index 28292adc87..28292adc87 100644
--- a/lib/accelerated/intel/aes-gcm-padlock.c
+++ b/lib/accelerated/x86/aes-gcm-padlock.c
diff --git a/lib/accelerated/intel/aes-gcm-x86.c b/lib/accelerated/x86/aes-gcm-x86.c
index 2e37b0abb2..2e37b0abb2 100644
--- a/lib/accelerated/intel/aes-gcm-x86.c
+++ b/lib/accelerated/x86/aes-gcm-x86.c
diff --git a/lib/accelerated/intel/aes-padlock.c b/lib/accelerated/x86/aes-padlock.c
index 4e7b8cc2a0..4e7b8cc2a0 100644
--- a/lib/accelerated/intel/aes-padlock.c
+++ b/lib/accelerated/x86/aes-padlock.c
diff --git a/lib/accelerated/intel/aes-padlock.h b/lib/accelerated/x86/aes-padlock.h
index c3798d6b0e..c3798d6b0e 100644
--- a/lib/accelerated/intel/aes-padlock.h
+++ b/lib/accelerated/x86/aes-padlock.h
diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/x86/aes-x86.c
index 5f465a5290..5f465a5290 100644
--- a/lib/accelerated/intel/aes-x86.c
+++ b/lib/accelerated/x86/aes-x86.c
diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/x86/aes-x86.h
index 7b842c4501..7b842c4501 100644
--- a/lib/accelerated/intel/aes-x86.h
+++ b/lib/accelerated/x86/aes-x86.h
diff --git a/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s b/lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s
index 7e3c40737e..7e3c40737e 100644
--- a/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s
+++ b/lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s
diff --git a/lib/accelerated/intel/asm/appro-aes-x86-64.s b/lib/accelerated/x86/asm/appro-aes-x86-64.s
index 675e112ac9..675e112ac9 100644
--- a/lib/accelerated/intel/asm/appro-aes-x86-64.s
+++ b/lib/accelerated/x86/asm/appro-aes-x86-64.s
diff --git a/lib/accelerated/intel/asm/appro-aes-x86.s b/lib/accelerated/x86/asm/appro-aes-x86.s
index f095a63d87..f095a63d87 100644
--- a/lib/accelerated/intel/asm/appro-aes-x86.s
+++ b/lib/accelerated/x86/asm/appro-aes-x86.s
diff --git a/lib/accelerated/intel/asm/cpuid-x86-64.s b/lib/accelerated/x86/asm/cpuid-x86-64.s
index 48b2cc4b66..48b2cc4b66 100644
--- a/lib/accelerated/intel/asm/cpuid-x86-64.s
+++ b/lib/accelerated/x86/asm/cpuid-x86-64.s
diff --git a/lib/accelerated/intel/asm/cpuid-x86.s b/lib/accelerated/x86/asm/cpuid-x86.s
index b286225048..b286225048 100644
--- a/lib/accelerated/intel/asm/cpuid-x86.s
+++ b/lib/accelerated/x86/asm/cpuid-x86.s
diff --git a/lib/accelerated/intel/asm/padlock-x86-64.s b/lib/accelerated/x86/asm/padlock-x86-64.s
index a30e212f5e..a30e212f5e 100644
--- a/lib/accelerated/intel/asm/padlock-x86-64.s
+++ b/lib/accelerated/x86/asm/padlock-x86-64.s
diff --git a/lib/accelerated/intel/asm/padlock-x86.s b/lib/accelerated/x86/asm/padlock-x86.s
index 932337a1ed..932337a1ed 100644
--- a/lib/accelerated/intel/asm/padlock-x86.s
+++ b/lib/accelerated/x86/asm/padlock-x86.s
diff --git a/lib/accelerated/intel/license.txt b/lib/accelerated/x86/license.txt
index c87ba42b08..c87ba42b08 100755
--- a/lib/accelerated/intel/license.txt
+++ b/lib/accelerated/x86/license.txt
diff --git a/lib/accelerated/intel/sha-padlock.c b/lib/accelerated/x86/sha-padlock.c
index 8c707fac38..8c707fac38 100644
--- a/lib/accelerated/intel/sha-padlock.c
+++ b/lib/accelerated/x86/sha-padlock.c
diff --git a/lib/accelerated/intel/x86.h b/lib/accelerated/x86/x86.h
index 4a5d5c7701..4a5d5c7701 100644
--- a/lib/accelerated/intel/x86.h
+++ b/lib/accelerated/x86/x86.h