intel directory renamed to x86.

diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index 440a73bd7bf94ec5b4bb2bea53cf05d0974fe290..b0f199de348b6db951376df885582a794f6f92dc 100644 (file)
--- 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
similarity index 100%
rename from lib/accelerated/intel/.gitignore
rename to lib/accelerated/x86/.gitignore

diff --git a/lib/accelerated/intel/Makefile.am b/lib/accelerated/x86/Makefile.am
similarity index 78%
rename from lib/accelerated/intel/Makefile.am
rename to lib/accelerated/x86/Makefile.am
index 315c2775a147a51c78fa3ec482fa441e4be326fa..afd77ce659b39094a9ef0037ca78c1c1cb03bf11 100644 (file)
--- 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
similarity index 100%
rename from lib/accelerated/intel/README
rename to lib/accelerated/x86/README

diff --git a/lib/accelerated/intel/aes-gcm-padlock.c b/lib/accelerated/x86/aes-gcm-padlock.c
similarity index 100%
rename from lib/accelerated/intel/aes-gcm-padlock.c
rename to 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
similarity index 100%
rename from lib/accelerated/intel/aes-gcm-x86.c
rename to lib/accelerated/x86/aes-gcm-x86.c

diff --git a/lib/accelerated/intel/aes-padlock.c b/lib/accelerated/x86/aes-padlock.c
similarity index 100%
rename from lib/accelerated/intel/aes-padlock.c
rename to lib/accelerated/x86/aes-padlock.c

diff --git a/lib/accelerated/intel/aes-padlock.h b/lib/accelerated/x86/aes-padlock.h
similarity index 100%
rename from lib/accelerated/intel/aes-padlock.h
rename to lib/accelerated/x86/aes-padlock.h

diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/x86/aes-x86.c
similarity index 100%
rename from lib/accelerated/intel/aes-x86.c
rename to lib/accelerated/x86/aes-x86.c

diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/x86/aes-x86.h
similarity index 100%
rename from lib/accelerated/intel/aes-x86.h
rename to 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
similarity index 100%
rename from lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s
rename to 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
similarity index 100%
rename from lib/accelerated/intel/asm/appro-aes-x86-64.s
rename to 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
similarity index 100%
rename from lib/accelerated/intel/asm/appro-aes-x86.s
rename to 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
similarity index 100%
rename from lib/accelerated/intel/asm/cpuid-x86-64.s
rename to 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
similarity index 100%
rename from lib/accelerated/intel/asm/cpuid-x86.s
rename to 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
similarity index 100%
rename from lib/accelerated/intel/asm/padlock-x86-64.s
rename to 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
similarity index 100%
rename from lib/accelerated/intel/asm/padlock-x86.s
rename to lib/accelerated/x86/asm/padlock-x86.s

diff --git a/lib/accelerated/intel/license.txt b/lib/accelerated/x86/license.txt
similarity index 100%
rename from lib/accelerated/intel/license.txt
rename to lib/accelerated/x86/license.txt

diff --git a/lib/accelerated/intel/sha-padlock.c b/lib/accelerated/x86/sha-padlock.c
similarity index 100%
rename from lib/accelerated/intel/sha-padlock.c
rename to lib/accelerated/x86/sha-padlock.c

diff --git a/lib/accelerated/intel/x86.h b/lib/accelerated/x86/x86.h
similarity index 100%
rename from lib/accelerated/intel/x86.h
rename to lib/accelerated/x86/x86.h