Commit 78128009 authored by Andy Polyakov's avatar Andy Polyakov Committed by Dr. Stephen Henson
Browse files

c6x/* "facelift": 



- make scripts executable;
- "parameterize" platform selection in c6x/do_fips;
- add c6x/fips_algvs.mak;
- add c6x/run6x.js launcher for more recent CCS versions;

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarStephen Henson <steve@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4265)
parent 5526e579

Configure

+2 −1
Original line number Diff line number Diff line
@@ -636,13 +636,14 @@ my %table=( 
"uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",



"c64xplus","cl6x:-mv6400+ -o2 -ox -ms -pden -DNO_SYS_TYPES_H -DGETPID_IS_MEANINGLESS -DMD32_REG_T=int -DOPENSSL_SMALL_FOOTPRINT:<c6x.h>::DSPBIOS::BN_LLONG:c64xpluscpuid.o:bn-c64xplus.o c64xplus-gf2m.o::aes-c64xplus.o aes_cbc.o aes_ctr.o:::sha1-c64xplus.o sha256-c64xplus.o sha512-c64xplus.o:::::::ghash-c64xplus.o::void:",

"c64x","cl6x:-mv6400 -o2 -ox -ms -as -pden -DNO_SYS_TYPES_H -DGETPID_IS_MEANINGLESS -DMD32_REG_T=int -DOPENSSL_SMALL_FOOTPRINT:<c6x.h>::DSPBIOS:::c64xcpuid.o:::aes-c64x.o aes_cbc.o aes_ctr.o:::sha1-c64x.o sha256-c64x.o sha512-c64x.o:::::::::void:",



);



my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A

		    debug-VC-WIN64I debug-VC-WIN64A

		    VC-NT VC-CE VC-WIN32 debug-VC-WIN32

		    BC-32 c64xplus

		    BC-32 c64xplus c64x

		    netware-clib netware-clib-bsdsock

		    netware-libc netware-libc-bsdsock);

c6x/do_fips

100644 → 100755
+6 −1
Original line number Diff line number Diff line 
#!/bin/sh



perl Configure c64xplus fipscanisteronly no-engine

if ! which cl6x > /dev/null 2>&1; then

	echo 'fatal: cl6x is not on $PATH'

	exit 1

fi



perl Configure ${C6XPLATFORM:-c64xplus} fipscanisteronly no-engine

perl util/mkfiles.pl > MINFO

perl util/mk1mf.pl auto > c6x/fips.mak

make -f c6x/fips.mak

c6x/fips_algvs.mak

0 → 100644
+14 −0
Original line number Diff line number Diff line 
CC=cl6x

CFLAGS=-mv$${C6XSILICON:-6400+} -o2 -I. -Ic6x/inc -Ifips -DNO_SYS_TYPES_H

OBJ_D=c6x/tmp

OUT_D=c6x



all:	$(OUT_D)/fips_algvs.out



$(OBJ_D)/fips_algvs.obj:	test/fips_algvs.c

	$(CC) --obj_directory=$(OBJ_D) $(CFLAGS) -c $<



$(OUT_D)/fips_algvs.out:	$(OBJ_D)/fips_algvs.obj $(OUT_D)/fipscanister.obj c6x/fips_algvs.cmd

	$(OUT_D)/fips_standalone_sha1 -verify $(OUT_D)/fipscanister.obj

	$(CC) -z -o $@ -m $(OUT_D)/fips_algvs.map $< $(OUT_D)/fipscanister.obj c6x/fips_algvs.cmd

	$(OUT_D)/incore6x $@ || rm $@

c6x/fips_standalone_sha1

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

c6x/incore6x

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file