arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename rdrand.S to rdrand.s

pull/398/head
Jeffrey Walton 2017-03-23 16:05:30 -04:00
parent 30263ee497
commit 6381faf277
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile
View File

@ -767,7 +767,7 @@ INPUT = . \
GNUmakefile \ GNUmakefile \
GNUmakefile-cross \ GNUmakefile-cross \
rdrand.asm \ rdrand.asm \
rdrand.S rdrand.s
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

2
Filelist.txt
View File

@ -210,7 +210,7 @@ rc6.cpp
rc6.h rc6.h
rdrand-masm.cmd rdrand-masm.cmd
rdrand-nasm.sh rdrand-nasm.sh
rdrand.S rdrand.s
rdrand.asm rdrand.asm
rdrand.cpp rdrand.cpp
rdrand.h rdrand.h

10
GNUmakefile
View File

@ -704,21 +704,21 @@ endif
.PHONY: trim .PHONY: trim
trim: trim:
ifneq ($(IS_DARWIN),0) ifneq ($(IS_DARWIN),0)
sed -i '' -e's/[[:space:]]*$$//' *.sh *.h *.cpp *.asm *.S *.sln *.vcxproj *.filters GNUmakefile GNUmakefile-cross sed -i '' -e's/[[:space:]]*$$//' *.sh *.h *.cpp *.asm *.s *.sln *.vcxproj *.filters GNUmakefile GNUmakefile-cross
make convert make convert
else else
sed -i -e's/[[:space:]]*$$//' *.sh *.h *.cpp *.asm *.S *.sln *.vcxproj *.filters GNUmakefile GNUmakefile-cross sed -i -e's/[[:space:]]*$$//' *.sh *.h *.cpp *.asm *.s *.sln *.vcxproj *.filters GNUmakefile GNUmakefile-cross
make convert make convert
endif endif
.PHONY: convert .PHONY: convert
convert: convert:
@-$(CHMOD) 0700 TestVectors/ TestData/ TestScripts/ @-$(CHMOD) 0700 TestVectors/ TestData/ TestScripts/
@-$(CHMOD) 0600 $(TEXT_FILES) *.asm *.S *.zip *.cmake TestVectors/*.txt TestData/*.dat @-$(CHMOD) 0600 $(TEXT_FILES) *.asm *.s *.zip *.cmake TestVectors/*.txt TestData/*.dat
@-$(CHMOD) 0700 $(EXEC_FILES) *.sh *.cmd TestScripts/*.sh TestScripts/*.pl TestScripts/*.cmd @-$(CHMOD) 0700 $(EXEC_FILES) *.sh *.cmd TestScripts/*.sh TestScripts/*.pl TestScripts/*.cmd
@-$(CHMOD) 0700 *.cmd *.sh GNUmakefile GNUmakefile-cross TestScripts/*.sh TestScripts/*.pl @-$(CHMOD) 0700 *.cmd *.sh GNUmakefile GNUmakefile-cross TestScripts/*.sh TestScripts/*.pl
-unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake TestScripts/*.pl TestScripts/*.cmd -unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake TestScripts/*.pl TestScripts/*.cmd
-dos2unix --keepdate --quiet GNUmakefile GNUmakefile-cross *.S *.sh TestScripts/*.sh -dos2unix --keepdate --quiet GNUmakefile GNUmakefile-cross *.s *.sh TestScripts/*.sh
ifneq ($(IS_DARWIN),0) ifneq ($(IS_DARWIN),0)
@-xattr -c * @-xattr -c *
endif endif
@ -764,7 +764,7 @@ endif # Dependencies
# Run rdrand-nasm.sh to create the object files # Run rdrand-nasm.sh to create the object files
ifeq ($(USE_NASM),1) ifeq ($(USE_NASM),1)
rdrand.o: rdrand.h rdrand.cpp rdrand.S rdrand.o: rdrand.h rdrand.cpp rdrand.s
$(CXX) $(strip $(CXXFLAGS)) -DNASM_RDRAND_ASM_AVAILABLE=1 -DNASM_RDSEED_ASM_AVAILABLE=1 -c rdrand.cpp $(CXX) $(strip $(CXXFLAGS)) -DNASM_RDRAND_ASM_AVAILABLE=1 -DNASM_RDSEED_ASM_AVAILABLE=1 -c rdrand.cpp
rdrand-%.o: rdrand-%.o:
./rdrand-nasm.sh ./rdrand-nasm.sh

26
rdrand-nasm.sh
View File

@ -20,39 +20,39 @@ fi
if [ "$IS_LINUX" -eq "1" ]; then if [ "$IS_LINUX" -eq "1" ]; then
echo "Building rdrand and rdseed modules for Linux" echo "Building rdrand and rdseed modules for Linux"
nasm -f elf32 rdrand.S -DX86 -g -o rdrand-x86.o nasm -f elf32 rdrand.s -DX86 -g -o rdrand-x86.o
nasm -f elfx32 rdrand.S -DX32 -g -o rdrand-x32.o nasm -f elfx32 rdrand.s -DX32 -g -o rdrand-x32.o
nasm -f elf64 rdrand.S -DX64 -g -o rdrand-x64.o nasm -f elf64 rdrand.s -DX64 -g -o rdrand-x64.o
SUCCESS=1 SUCCESS=1
fi fi
if [ "$IS_OPENBSD" -eq "1" ] || [ "$IS_NETBSD" -eq "1" ] || [ "$IS_FREEBSD" -eq "1" ] || [ "$IS_DRAGONFLY" -eq "1" ]; then if [ "$IS_OPENBSD" -eq "1" ] || [ "$IS_NETBSD" -eq "1" ] || [ "$IS_FREEBSD" -eq "1" ] || [ "$IS_DRAGONFLY" -eq "1" ]; then
echo "Building rdrand and rdseed modules for BSD" echo "Building rdrand and rdseed modules for BSD"
nasm -f elf32 rdrand.S -DX86 -g -o rdrand-x86.o nasm -f elf32 rdrand.s -DX86 -g -o rdrand-x86.o
nasm -f elfx32 rdrand.S -DX32 -g -o rdrand-x32.o nasm -f elfx32 rdrand.s -DX32 -g -o rdrand-x32.o
nasm -f elf64 rdrand.S -DX64 -g -o rdrand-x64.o nasm -f elf64 rdrand.s -DX64 -g -o rdrand-x64.o
SUCCESS=1 SUCCESS=1
fi fi
if [ "$IS_SOLARIS" -eq "1" ]; then if [ "$IS_SOLARIS" -eq "1" ]; then
echo "Building rdrand and rdseed modules for Solaris" echo "Building rdrand and rdseed modules for Solaris"
nasm -f elf32 rdrand.S -DX86 -o rdrand-x86.o nasm -f elf32 rdrand.s -DX86 -o rdrand-x86.o
nasm -f elfx32 rdrand.S -DX32 -o rdrand-x32.o nasm -f elfx32 rdrand.s -DX32 -o rdrand-x32.o
nasm -f elf64 rdrand.S -DX64 -o rdrand-x64.o nasm -f elf64 rdrand.s -DX64 -o rdrand-x64.o
SUCCESS=1 SUCCESS=1
fi fi
if [ "$IS_DARWIN" -eq "1" ]; then if [ "$IS_DARWIN" -eq "1" ]; then
echo "Building rdrand and rdseed modules for Darwin" echo "Building rdrand and rdseed modules for Darwin"
nasm -f macho32 rdrand.S -DDARWIN -DX86 -g -o rdrand-x86.o nasm -f macho32 rdrand.s -DDARWIN -DX86 -g -o rdrand-x86.o
nasm -f macho64 rdrand.S -DDARWIN -DX64 -g -o rdrand-x64.o nasm -f macho64 rdrand.s -DDARWIN -DX64 -g -o rdrand-x64.o
SUCCESS=1 SUCCESS=1
fi fi
if [ "$IS_CYGWIN" -eq "1" ]; then if [ "$IS_CYGWIN" -eq "1" ]; then
echo "Building rdrand and rdseed modules for Cygwin" echo "Building rdrand and rdseed modules for Cygwin"
nasm -f win32 rdrand.S -DCYGWIN -DX86 -g -o rdrand-x86.o nasm -f win32 rdrand.s -DCYGWIN -DX86 -g -o rdrand-x86.o
nasm -f win64 rdrand.S -DCYGWIN -DX64 -g -o rdrand-x64.o nasm -f win64 rdrand.s -DCYGWIN -DX64 -g -o rdrand-x64.o
SUCCESS=1 SUCCESS=1
fi fi

6
rdrand.s
View File

@ -6,9 +6,9 @@
;; of intrinsics. The routines below run a little faster than the intrinsic ;; of intrinsics. The routines below run a little faster than the intrinsic
;; based routines. ;; based routines.
;; nasm -f elf32 rdrand.S -DX86 -g -o rdrand-x86.o ;; nasm -f elf32 rdrand.s -DX86 -g -o rdrand-x86.o
;; nasm -f elfx32 rdrand.S -DX32 -g -o rdrand-x32.o ;; nasm -f elfx32 rdrand.s -DX32 -g -o rdrand-x32.o
;; nasm -f elf64 rdrand.S -DX64 -g -o rdrand-x64.o ;; nasm -f elf64 rdrand.s -DX64 -g -o rdrand-x64.o
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;