vxworks-mips: unify and add assembler. (227a822a) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+1 −2

Original line number	Diff line number	Diff line
		@@ -598,9 +598,8 @@ my %table=(
		"vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",
		"vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::",
		"vxworks-ppc860","ccppc:-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
		"vxworks-mipsle","ccmips:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -DL_ENDIAN -EL -Wl,-EL -mips2 -mno-branch-likely -G 0 -fno-builtin -msoft-float -DCPU=MIPS32 -DMIPSEL -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r::${no_asm}::::::ranlibmips:",
		"vxworks-simlinux","ccpentium:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK:::VXWORKS:-r::${no_asm}::::::ranlibpentium:",
		"vxworks-mips","ccmips:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DB_ENDIAN -DCPU=MIPS32 -G 0 -mips2 -EB -Wl,-EB -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip:::VXWORKS:-r::${no_asm}::::::ranlibmips:",
		"vxworks-mips","ccmips:-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip::-D_REENTRANT:VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon::${mips32_asm}:o32::::::ranlibmips:",

		##### Compaq Non-Stop Kernel (Tandem)
		"tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",

TABLE

+7 −40

Original line number	Diff line number	Diff line
		@@ -5843,52 +5843,19 @@ $multilib =

		*** vxworks-mips
		$cc = ccmips
		$cflags = -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE="$(WIND_BASE)/target/lib/h/config/vsbConfig.h" -DB_ENDIAN -DCPU=MIPS32 -G 0 -mips2 -EB -Wl,-EB -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip
		$cflags = -mrtp -mips2 -O -G 0 -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE="$(WIND_BASE)/target/lib/h/config/vsbConfig.h" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I$(WIND_BASE)/target/usr/h -I$(WIND_BASE)/target/h/wrn/coreip
		$unistd =
		$thread_cflag =
		$sys_id = VXWORKS
		$lflags = -r
		$bn_ops =
		$cpuid_obj =
		$bn_obj =
		$des_obj =
		$aes_obj =
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$modes_obj =
		$engines_obj =
		$perlasm_scheme = void
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		$shared_ldflag =
		$shared_extension =
		$ranlib = ranlibmips
		$arflags =
		$multilib =

		*** vxworks-mipsle
		$cc = ccmips
		$cflags = -B$(WIND_BASE)/host/$(WIND_HOST_TYPE)/lib/gcc-lib/ -DL_ENDIAN -EL -Wl,-EL -mips2 -mno-branch-likely -G 0 -fno-builtin -msoft-float -DCPU=MIPS32 -DMIPSEL -DNO_STRINGS_H -I$(WIND_BASE)/target/h
		$unistd =
		$thread_cflag =
		$thread_cflag = -D_REENTRANT
		$sys_id = VXWORKS
		$lflags = -r
		$lflags = -Wl,--defsym,__wrs_rtp_base=0xe0000000 -L $(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon
		$bn_ops =
		$cpuid_obj =
		$bn_obj =
		$bn_obj = bn-mips.o
		$des_obj =
		$aes_obj =
		$aes_obj = aes_cbc.o aes-mips.o
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$sha1_obj = sha1-mips.o sha256-mips.o
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		@@ -5897,7 +5864,7 @@ $wp_obj =
		$cmll_obj =
		$modes_obj =
		$engines_obj =
		$perlasm_scheme = void
		$perlasm_scheme = o32
		$dso_scheme =
		$shared_target=
		$shared_cflag =

crypto/aes/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ aes-ppc.s: asm/aes-ppc.pl
		aes-parisc.s: asm/aes-parisc.pl
		$(PERL) asm/aes-parisc.pl $(PERLASM_SCHEME) $@

		aes-mips.s: asm/aes-mips.pl
		aes-mips.S: asm/aes-mips.pl
		$(PERL) asm/aes-mips.pl $(PERLASM_SCHEME) $@

		# GNU make "catch all"

crypto/aes/asm/aes-mips.pl

+8 −3

Original line number	Diff line number	Diff line
		@@ -70,9 +70,9 @@ $pf = ($flavour =~ /nubi/i) ? $t0 : $t2;
		#
		######################################################################

		for (@ARGV) { $big_endian=1 if (/\-DB_ENDIAN/);
		$big_endian=0 if (/\-DL_ENDIAN/);
		$output=$_ if (/^\w[\w\-]*\.\w+$/); }
		$big_endian=(`echo MIPSEL \| $ENV{CC} -E -P -`=~/MIPSEL/)?1:0;

		for (@ARGV) { $output=$_ if (/^\w[\w\-]*\.\w+$/); }
		open STDOUT,">$output";

		if (!defined($big_endian))
		@@ -85,8 +85,13 @@ my ($MSB,$LSB)=(0,3); # automatically converted to little-endian

		$code.=<<___;
		.text
		#ifdef OPENSSL_FIPSCANISTER
		# include <openssl/fipssyms.h>
		#endif

		#if !defined(__vxworks) \|\| defined(__pic__)
		.option pic2
		#endif
		.set noat
		___

crypto/sha/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,9 +78,9 @@ sha1-parisc.s: asm/sha1-parisc.pl; $(PERL) asm/sha1-parisc.pl $(PERLASM_SCHEME)
		sha256-parisc.s:asm/sha512-parisc.pl; $(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@
		sha512-parisc.s:asm/sha512-parisc.pl; $(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@

		sha1-mips.s: asm/sha1-mips.pl; $(PERL) asm/sha1-mips.pl $(PERLASM_SCHEME) $@
		sha256-mips.s: asm/sha512-mips.pl; $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@
		sha512-mips.s: asm/sha512-mips.pl; $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@
		sha1-mips.S: asm/sha1-mips.pl; $(PERL) asm/sha1-mips.pl $(PERLASM_SCHEME) $@
		sha256-mips.S: asm/sha512-mips.pl; $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@
		sha512-mips.S: asm/sha512-mips.pl; $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@

		# GNU make "catch all"
		sha1-%.S: asm/sha1-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@