summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cfg.mk84
-rw-r--r--lib/accelerated/x86/Makefile.am12
-rw-r--r--lib/accelerated/x86/coff/appro-aes-gcm-x86-64-coff.s (renamed from lib/accelerated/x86/asm-coff/appro-aes-gcm-x86-64-coff.s)0
-rw-r--r--lib/accelerated/x86/coff/appro-aes-x86-64-coff.s (renamed from lib/accelerated/x86/asm-coff/appro-aes-x86-64-coff.s)0
-rw-r--r--lib/accelerated/x86/coff/appro-aes-x86-coff.s (renamed from lib/accelerated/x86/asm-coff/appro-aes-x86-coff.s)0
-rw-r--r--lib/accelerated/x86/coff/cpuid-x86-64-coff.s (renamed from lib/accelerated/x86/asm-coff/cpuid-x86-64-coff.s)0
-rw-r--r--lib/accelerated/x86/coff/cpuid-x86-coff.s (renamed from lib/accelerated/x86/asm-coff/cpuid-x86-coff.s)0
-rw-r--r--lib/accelerated/x86/coff/padlock-x86-64-coff.s (renamed from lib/accelerated/x86/asm-coff/padlock-x86-64-coff.s)0
-rw-r--r--lib/accelerated/x86/coff/padlock-x86-coff.s (renamed from lib/accelerated/x86/asm-coff/padlock-x86-coff.s)0
-rw-r--r--lib/accelerated/x86/elf/appro-aes-gcm-x86-64.s (renamed from lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s)0
-rw-r--r--lib/accelerated/x86/elf/appro-aes-x86-64.s (renamed from lib/accelerated/x86/asm/appro-aes-x86-64.s)0
-rw-r--r--lib/accelerated/x86/elf/appro-aes-x86.s (renamed from lib/accelerated/x86/asm/appro-aes-x86.s)0
-rw-r--r--lib/accelerated/x86/elf/cpuid-x86-64.s (renamed from lib/accelerated/x86/asm/cpuid-x86-64.s)0
-rw-r--r--lib/accelerated/x86/elf/cpuid-x86.s (renamed from lib/accelerated/x86/asm/cpuid-x86.s)0
-rw-r--r--lib/accelerated/x86/elf/padlock-x86-64.s (renamed from lib/accelerated/x86/asm/padlock-x86-64.s)0
-rw-r--r--lib/accelerated/x86/elf/padlock-x86.s (renamed from lib/accelerated/x86/asm/padlock-x86.s)0
-rw-r--r--lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s (renamed from lib/accelerated/x86/asm-macosx/appro-aes-gcm-x86-64-macosx.s)0
-rw-r--r--lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s (renamed from lib/accelerated/x86/asm-macosx/appro-aes-x86-64-macosx.s)0
-rw-r--r--lib/accelerated/x86/macosx/appro-aes-x86-macosx.s (renamed from lib/accelerated/x86/asm-macosx/appro-aes-x86-macosx.s)0
-rw-r--r--lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s (renamed from lib/accelerated/x86/asm-macosx/cpuid-x86-64-macosx.s)0
-rw-r--r--lib/accelerated/x86/macosx/cpuid-x86-macosx.s (renamed from lib/accelerated/x86/asm-macosx/cpuid-x86-macosx.s)0
-rw-r--r--lib/accelerated/x86/macosx/padlock-x86-64-macosx.s (renamed from lib/accelerated/x86/asm-macosx/padlock-x86-64-macosx.s)0
-rw-r--r--lib/accelerated/x86/macosx/padlock-x86-macosx.s (renamed from lib/accelerated/x86/asm-macosx/padlock-x86-macosx.s)0
23 files changed, 48 insertions, 48 deletions
diff --git a/cfg.mk b/cfg.mk
index ac64acf362..9e71e3fa20 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -158,128 +158,128 @@ upload-web:
doxygen/ devel/ cyclo/
ASM_SOURCES:= \
- lib/accelerated/x86/asm/cpuid-x86-64.s \
- lib/accelerated/x86/asm/cpuid-x86.s \
- lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s \
- lib/accelerated/x86/asm/appro-aes-x86-64.s \
- lib/accelerated/x86/asm/appro-aes-x86.s \
- lib/accelerated/x86/asm/padlock-x86-64.s \
- lib/accelerated/x86/asm/padlock-x86.s \
- lib/accelerated/x86/asm-coff/cpuid-x86-coff.s \
- lib/accelerated/x86/asm-coff/cpuid-x86-64-coff.s \
- lib/accelerated/x86/asm-coff/appro-aes-gcm-x86-64-coff.s \
- lib/accelerated/x86/asm-coff/appro-aes-x86-64-coff.s \
- lib/accelerated/x86/asm-coff/appro-aes-x86-coff.s \
- lib/accelerated/x86/asm-coff/padlock-x86-64-coff.s \
- lib/accelerated/x86/asm-coff/padlock-x86-coff.s \
- lib/accelerated/x86/asm-macosx/cpuid-x86-64-macosx.s \
- lib/accelerated/x86/asm-macosx/cpuid-x86-macosx.s \
- lib/accelerated/x86/asm-macosx/appro-aes-gcm-x86-64-macosx.s \
- lib/accelerated/x86/asm-macosx/appro-aes-x86-64-macosx.s \
- lib/accelerated/x86/asm-macosx/appro-aes-x86-macosx.s \
- lib/accelerated/x86/asm-macosx/padlock-x86-64-macosx.s \
- lib/accelerated/x86/asm-macosx/padlock-x86-macosx.s
+ lib/accelerated/x86/elf/cpuid-x86-64.s \
+ lib/accelerated/x86/elf/cpuid-x86.s \
+ lib/accelerated/x86/elf/appro-aes-gcm-x86-64.s \
+ lib/accelerated/x86/elf/appro-aes-x86-64.s \
+ lib/accelerated/x86/elf/appro-aes-x86.s \
+ lib/accelerated/x86/elf/padlock-x86-64.s \
+ lib/accelerated/x86/elf/padlock-x86.s \
+ lib/accelerated/x86/coff/cpuid-x86-coff.s \
+ lib/accelerated/x86/coff/cpuid-x86-64-coff.s \
+ lib/accelerated/x86/coff/appro-aes-gcm-x86-64-coff.s \
+ lib/accelerated/x86/coff/appro-aes-x86-64-coff.s \
+ lib/accelerated/x86/coff/appro-aes-x86-coff.s \
+ lib/accelerated/x86/coff/padlock-x86-64-coff.s \
+ lib/accelerated/x86/coff/padlock-x86-coff.s \
+ lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s \
+ lib/accelerated/x86/macosx/cpuid-x86-macosx.s \
+ lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s \
+ lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s \
+ lib/accelerated/x86/macosx/appro-aes-x86-macosx.s \
+ lib/accelerated/x86/macosx/padlock-x86-64-macosx.s \
+ lib/accelerated/x86/macosx/padlock-x86-macosx.s
asm-sources: $(ASM_SOURCES)
asm-sources-clean:
rm -f $(ASM_SOURCES)
-lib/accelerated/x86/asm/cpuid-x86-64.s: devel/perlasm/cpuid-x86_64.pl
+lib/accelerated/x86/elf/cpuid-x86-64.s: devel/perlasm/cpuid-x86_64.pl
cat devel/perlasm/license-gnutls.txt > $@
perl $< elf >> $@
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
-lib/accelerated/x86/asm/cpuid-x86.s: devel/perlasm/cpuid-x86.pl
+lib/accelerated/x86/elf/cpuid-x86.s: devel/perlasm/cpuid-x86.pl
cat devel/perlasm/license-gnutls.txt > $@
perl $< elf >> $@
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
-lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s: devel/perlasm/ghash-x86_64.pl
+lib/accelerated/x86/elf/appro-aes-gcm-x86-64.s: devel/perlasm/ghash-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< elf >> $@
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
-lib/accelerated/x86/asm/appro-aes-x86-64.s: devel/perlasm/aesni-x86_64.pl
+lib/accelerated/x86/elf/appro-aes-x86-64.s: devel/perlasm/aesni-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< elf >> $@
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
-lib/accelerated/x86/asm/appro-aes-x86.s: devel/perlasm/aesni-x86.pl
+lib/accelerated/x86/elf/appro-aes-x86.s: devel/perlasm/aesni-x86.pl
cat devel/perlasm/license.txt > $@
perl $< elf >> $@
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
-lib/accelerated/x86/asm/padlock-x86-64.s: devel/perlasm/e_padlock-x86_64.pl
+lib/accelerated/x86/elf/padlock-x86-64.s: devel/perlasm/e_padlock-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< elf >> $@
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
-lib/accelerated/x86/asm/padlock-x86.s: devel/perlasm/e_padlock-x86.pl
+lib/accelerated/x86/elf/padlock-x86.s: devel/perlasm/e_padlock-x86.pl
cat devel/perlasm/license.txt > $@
perl $< elf >> $@
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
-lib/accelerated/x86/asm-coff/appro-aes-gcm-x86-64-coff.s: devel/perlasm/ghash-x86_64.pl
+lib/accelerated/x86/coff/appro-aes-gcm-x86-64-coff.s: devel/perlasm/ghash-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< mingw64 >> $@
-lib/accelerated/x86/asm-coff/appro-aes-x86-64-coff.s: devel/perlasm/aesni-x86_64.pl
+lib/accelerated/x86/coff/appro-aes-x86-64-coff.s: devel/perlasm/aesni-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< mingw64 >> $@
-lib/accelerated/x86/asm-coff/appro-aes-x86-coff.s: devel/perlasm/aesni-x86.pl
+lib/accelerated/x86/coff/appro-aes-x86-coff.s: devel/perlasm/aesni-x86.pl
cat devel/perlasm/license.txt > $@
perl $< coff >> $@
-lib/accelerated/x86/asm-coff/padlock-x86-64-coff.s: devel/perlasm/e_padlock-x86_64.pl
+lib/accelerated/x86/coff/padlock-x86-64-coff.s: devel/perlasm/e_padlock-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< mingw64 >> $@
-lib/accelerated/x86/asm-coff/padlock-x86-coff.s: devel/perlasm/e_padlock-x86.pl
+lib/accelerated/x86/coff/padlock-x86-coff.s: devel/perlasm/e_padlock-x86.pl
cat devel/perlasm/license.txt > $@
perl $< coff >> $@
-lib/accelerated/x86/asm-coff/cpuid-x86-64-coff.s: devel/perlasm/cpuid-x86_64.pl
+lib/accelerated/x86/coff/cpuid-x86-64-coff.s: devel/perlasm/cpuid-x86_64.pl
cat devel/perlasm/license-gnutls.txt > $@
perl $< mingw64 >> $@
-lib/accelerated/x86/asm-coff/cpuid-x86-coff.s: devel/perlasm/cpuid-x86.pl
+lib/accelerated/x86/coff/cpuid-x86-coff.s: devel/perlasm/cpuid-x86.pl
cat devel/perlasm/license-gnutls.txt > $@
perl $< coff >> $@
-lib/accelerated/x86/asm-macosx/appro-aes-gcm-x86-64-macosx.s: devel/perlasm/ghash-x86_64.pl
+lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s: devel/perlasm/ghash-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< macosx >> $@
-lib/accelerated/x86/asm-macosx/appro-aes-x86-64-macosx.s: devel/perlasm/aesni-x86_64.pl
+lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s: devel/perlasm/aesni-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< macosx >> $@
-lib/accelerated/x86/asm-macosx/appro-aes-x86-macosx.s: devel/perlasm/aesni-x86.pl
+lib/accelerated/x86/macosx/appro-aes-x86-macosx.s: devel/perlasm/aesni-x86.pl
cat devel/perlasm/license.txt > $@
perl $< macosx >> $@
-lib/accelerated/x86/asm-macosx/padlock-x86-64-macosx.s: devel/perlasm/e_padlock-x86_64.pl
+lib/accelerated/x86/macosx/padlock-x86-64-macosx.s: devel/perlasm/e_padlock-x86_64.pl
cat devel/perlasm/license.txt > $@
perl $< macosx >> $@
-lib/accelerated/x86/asm-macosx/padlock-x86-macosx.s: devel/perlasm/e_padlock-x86.pl
+lib/accelerated/x86/macosx/padlock-x86-macosx.s: devel/perlasm/e_padlock-x86.pl
cat devel/perlasm/license.txt > $@
perl $< macosx >> $@
-lib/accelerated/x86/asm-macosx/cpuid-x86-64-macosx.s: devel/perlasm/cpuid-x86_64.pl
+lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s: devel/perlasm/cpuid-x86_64.pl
cat devel/perlasm/license-gnutls.txt > $@
perl $< macosx >> $@
-lib/accelerated/x86/asm-macosx/cpuid-x86-macosx.s: devel/perlasm/cpuid-x86.pl
+lib/accelerated/x86/macosx/cpuid-x86-macosx.s: devel/perlasm/cpuid-x86.pl
cat devel/perlasm/license-gnutls.txt > $@
perl $< macosx >> $@
diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am
index 9abadfd2c4..400f15dadc 100644
--- a/lib/accelerated/x86/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -42,30 +42,30 @@ AM_CFLAGS += -DASM_X86_64 -DASM_X86
libx86_la_SOURCES += aes-gcm-x86.c
if WINDOWS
-libx86_la_SOURCES += asm-coff/appro-aes-x86-64-coff.s asm-coff/padlock-x86-64-coff.s asm-coff/cpuid-x86-64-coff.s asm-coff/appro-aes-gcm-x86-64-coff.s
+libx86_la_SOURCES += coff/appro-aes-x86-64-coff.s coff/padlock-x86-64-coff.s coff/cpuid-x86-64-coff.s coff/appro-aes-gcm-x86-64-coff.s
endif
if MACOSX
-libx86_la_SOURCES += asm-macosx/appro-aes-x86-64-macosx.s asm-macosx/padlock-x86-64-macosx.s asm-macosx/cpuid-x86-64-macosx.s asm-macosx/appro-aes-gcm-x86-64-macosx.s
+libx86_la_SOURCES += macosx/appro-aes-x86-64-macosx.s macosx/padlock-x86-64-macosx.s macosx/cpuid-x86-64-macosx.s macosx/appro-aes-gcm-x86-64-macosx.s
endif
if ELF
-libx86_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s asm/padlock-x86-64.s asm/cpuid-x86-64.s
+libx86_la_SOURCES += elf/appro-aes-x86-64.s elf/appro-aes-gcm-x86-64.s elf/padlock-x86-64.s elf/cpuid-x86-64.s
endif
else #ASM_X86_64
AM_CFLAGS += -DASM_X86_32 -DASM_X86
if WINDOWS
-libx86_la_SOURCES += asm-coff/appro-aes-x86-coff.s asm-coff/padlock-x86-coff.s asm-coff/cpuid-x86-coff.s
+libx86_la_SOURCES += coff/appro-aes-x86-coff.s coff/padlock-x86-coff.s coff/cpuid-x86-coff.s
endif
if MACOSX
-libx86_la_SOURCES += asm-macosx/appro-aes-x86-macosx.s asm-macosx/padlock-x86-macosx.s asm-macosx/cpuid-x86-macosx.s
+libx86_la_SOURCES += macosx/appro-aes-x86-macosx.s macosx/padlock-x86-macosx.s macosx/cpuid-x86-macosx.s
endif
if ELF
-libx86_la_SOURCES += asm/appro-aes-x86.s asm/padlock-x86.s asm/cpuid-x86.s
+libx86_la_SOURCES += elf/appro-aes-x86.s elf/padlock-x86.s elf/cpuid-x86.s
endif
endif #ASM_X86_64
diff --git a/lib/accelerated/x86/asm-coff/appro-aes-gcm-x86-64-coff.s b/lib/accelerated/x86/coff/appro-aes-gcm-x86-64-coff.s
index 201a7903c2..201a7903c2 100644
--- a/lib/accelerated/x86/asm-coff/appro-aes-gcm-x86-64-coff.s
+++ b/lib/accelerated/x86/coff/appro-aes-gcm-x86-64-coff.s
diff --git a/lib/accelerated/x86/asm-coff/appro-aes-x86-64-coff.s b/lib/accelerated/x86/coff/appro-aes-x86-64-coff.s
index 5a69465116..5a69465116 100644
--- a/lib/accelerated/x86/asm-coff/appro-aes-x86-64-coff.s
+++ b/lib/accelerated/x86/coff/appro-aes-x86-64-coff.s
diff --git a/lib/accelerated/x86/asm-coff/appro-aes-x86-coff.s b/lib/accelerated/x86/coff/appro-aes-x86-coff.s
index 74e236bd75..74e236bd75 100644
--- a/lib/accelerated/x86/asm-coff/appro-aes-x86-coff.s
+++ b/lib/accelerated/x86/coff/appro-aes-x86-coff.s
diff --git a/lib/accelerated/x86/asm-coff/cpuid-x86-64-coff.s b/lib/accelerated/x86/coff/cpuid-x86-64-coff.s
index c7e9cc462f..c7e9cc462f 100644
--- a/lib/accelerated/x86/asm-coff/cpuid-x86-64-coff.s
+++ b/lib/accelerated/x86/coff/cpuid-x86-64-coff.s
diff --git a/lib/accelerated/x86/asm-coff/cpuid-x86-coff.s b/lib/accelerated/x86/coff/cpuid-x86-coff.s
index cf5365ee8c..cf5365ee8c 100644
--- a/lib/accelerated/x86/asm-coff/cpuid-x86-coff.s
+++ b/lib/accelerated/x86/coff/cpuid-x86-coff.s
diff --git a/lib/accelerated/x86/asm-coff/padlock-x86-64-coff.s b/lib/accelerated/x86/coff/padlock-x86-64-coff.s
index 4701809a1c..4701809a1c 100644
--- a/lib/accelerated/x86/asm-coff/padlock-x86-64-coff.s
+++ b/lib/accelerated/x86/coff/padlock-x86-64-coff.s
diff --git a/lib/accelerated/x86/asm-coff/padlock-x86-coff.s b/lib/accelerated/x86/coff/padlock-x86-coff.s
index c9231f19a7..c9231f19a7 100644
--- a/lib/accelerated/x86/asm-coff/padlock-x86-coff.s
+++ b/lib/accelerated/x86/coff/padlock-x86-coff.s
diff --git a/lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s b/lib/accelerated/x86/elf/appro-aes-gcm-x86-64.s
index 55da343a60..55da343a60 100644
--- a/lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s
+++ b/lib/accelerated/x86/elf/appro-aes-gcm-x86-64.s
diff --git a/lib/accelerated/x86/asm/appro-aes-x86-64.s b/lib/accelerated/x86/elf/appro-aes-x86-64.s
index 73c3798f25..73c3798f25 100644
--- a/lib/accelerated/x86/asm/appro-aes-x86-64.s
+++ b/lib/accelerated/x86/elf/appro-aes-x86-64.s
diff --git a/lib/accelerated/x86/asm/appro-aes-x86.s b/lib/accelerated/x86/elf/appro-aes-x86.s
index 4dd1a503c5..4dd1a503c5 100644
--- a/lib/accelerated/x86/asm/appro-aes-x86.s
+++ b/lib/accelerated/x86/elf/appro-aes-x86.s
diff --git a/lib/accelerated/x86/asm/cpuid-x86-64.s b/lib/accelerated/x86/elf/cpuid-x86-64.s
index 7520978fe8..7520978fe8 100644
--- a/lib/accelerated/x86/asm/cpuid-x86-64.s
+++ b/lib/accelerated/x86/elf/cpuid-x86-64.s
diff --git a/lib/accelerated/x86/asm/cpuid-x86.s b/lib/accelerated/x86/elf/cpuid-x86.s
index b0fb52f5f6..b0fb52f5f6 100644
--- a/lib/accelerated/x86/asm/cpuid-x86.s
+++ b/lib/accelerated/x86/elf/cpuid-x86.s
diff --git a/lib/accelerated/x86/asm/padlock-x86-64.s b/lib/accelerated/x86/elf/padlock-x86-64.s
index 020d6e55b6..020d6e55b6 100644
--- a/lib/accelerated/x86/asm/padlock-x86-64.s
+++ b/lib/accelerated/x86/elf/padlock-x86-64.s
diff --git a/lib/accelerated/x86/asm/padlock-x86.s b/lib/accelerated/x86/elf/padlock-x86.s
index fc5f9accb3..fc5f9accb3 100644
--- a/lib/accelerated/x86/asm/padlock-x86.s
+++ b/lib/accelerated/x86/elf/padlock-x86.s
diff --git a/lib/accelerated/x86/asm-macosx/appro-aes-gcm-x86-64-macosx.s b/lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s
index 732332ba28..732332ba28 100644
--- a/lib/accelerated/x86/asm-macosx/appro-aes-gcm-x86-64-macosx.s
+++ b/lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s
diff --git a/lib/accelerated/x86/asm-macosx/appro-aes-x86-64-macosx.s b/lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s
index de7ca030c1..de7ca030c1 100644
--- a/lib/accelerated/x86/asm-macosx/appro-aes-x86-64-macosx.s
+++ b/lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s
diff --git a/lib/accelerated/x86/asm-macosx/appro-aes-x86-macosx.s b/lib/accelerated/x86/macosx/appro-aes-x86-macosx.s
index ca05d9e496..ca05d9e496 100644
--- a/lib/accelerated/x86/asm-macosx/appro-aes-x86-macosx.s
+++ b/lib/accelerated/x86/macosx/appro-aes-x86-macosx.s
diff --git a/lib/accelerated/x86/asm-macosx/cpuid-x86-64-macosx.s b/lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s
index b4a4e941a4..b4a4e941a4 100644
--- a/lib/accelerated/x86/asm-macosx/cpuid-x86-64-macosx.s
+++ b/lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s
diff --git a/lib/accelerated/x86/asm-macosx/cpuid-x86-macosx.s b/lib/accelerated/x86/macosx/cpuid-x86-macosx.s
index a69a5c7fad..a69a5c7fad 100644
--- a/lib/accelerated/x86/asm-macosx/cpuid-x86-macosx.s
+++ b/lib/accelerated/x86/macosx/cpuid-x86-macosx.s
diff --git a/lib/accelerated/x86/asm-macosx/padlock-x86-64-macosx.s b/lib/accelerated/x86/macosx/padlock-x86-64-macosx.s
index a19e824ad3..a19e824ad3 100644
--- a/lib/accelerated/x86/asm-macosx/padlock-x86-64-macosx.s
+++ b/lib/accelerated/x86/macosx/padlock-x86-64-macosx.s
diff --git a/lib/accelerated/x86/asm-macosx/padlock-x86-macosx.s b/lib/accelerated/x86/macosx/padlock-x86-macosx.s
index b3822f424d..b3822f424d 100644
--- a/lib/accelerated/x86/asm-macosx/padlock-x86-macosx.s
+++ b/lib/accelerated/x86/macosx/padlock-x86-macosx.s