apply patches to original opensource openssl-3.5.0. NOTE: This commit will NOT COMPILE. (#17)
Reviewed-on: http://13.234.246.121:3000/Neominds/ossl35vx69/pulls/17 Co-authored-by: siddhant <siddhant.singh@neominds.in> Co-committed-by: siddhant <siddhant.singh@neominds.in>
This commit is contained in:
@@ -2050,6 +2050,102 @@ my %targets = (
|
||||
perlasm_scheme => "o32",
|
||||
ranlib => "ranlibmips",
|
||||
},
|
||||
"vxworks-32" => {
|
||||
inherit_from => [ "BASE_unix" ],
|
||||
CC => "dummy",
|
||||
CFLAGS => picker(debug => "-O0 -g",
|
||||
release => "-O2"),
|
||||
cppflags => combine("\$(VSB_CONFIG_FILE_MACRO)"),
|
||||
cflags => "",
|
||||
sys_id => "VXWORKS",
|
||||
bn_ops => "RC4_CHAR",
|
||||
dso_scheme => "dlfcn",
|
||||
shared_target => "linux-shared",
|
||||
shared_ldflag => "-shared",
|
||||
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
|
||||
thread_scheme => "vxtasks",
|
||||
},
|
||||
"vxworks-64" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
bn_ops => "SIXTY_FOUR_BIT_LONG",
|
||||
},
|
||||
"vxworks-x86" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
bn_ops => "BN_LLONG",
|
||||
asm_arch => 'vx_x86',
|
||||
perlasm_scheme => "elf",
|
||||
},
|
||||
"vxworks-x86-64" => {
|
||||
inherit_from => [ "vxworks-64" ],
|
||||
bn_ops => "SIXTY_FOUR_BIT_LONG",
|
||||
asm_arch => 'vx_x86_64',
|
||||
perlasm_scheme => "elf",
|
||||
},
|
||||
"vxworks-arm32" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
asm_arch => 'vx_armv4',
|
||||
perlasm_scheme => "void",
|
||||
},
|
||||
"vxworks-arm32-thumb" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
asm_arch => 'vx_armv4_thumb',
|
||||
perlasm_scheme => "void",
|
||||
},
|
||||
"vxworks-arm32-armv7m" => {
|
||||
inherit_from => [ "vxworks-32"],
|
||||
},
|
||||
"vxworks-arm32-armv7a" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
asm_arch => 'vx_armv7a',
|
||||
perlasm_scheme => "void",
|
||||
},
|
||||
"vxworks-arm64" => {
|
||||
inherit_from => [ "vxworks-64" ],
|
||||
asm_arch => 'vx_aarch64',
|
||||
perlasm_scheme => "linux64",
|
||||
},
|
||||
"vxworks-ppc32" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
asm_arch => 'vx_ppc32',
|
||||
perlasm_scheme => "32",
|
||||
},
|
||||
"vxworks-ppc64" => {
|
||||
inherit_from => [ "vxworks-64" ],
|
||||
asm_arch => 'vx_ppc64',
|
||||
perlasm_scheme => "64",
|
||||
},
|
||||
"vxworks-simlinux32" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
bn_ops => "BN_LLONG",
|
||||
asm_arch => 'vx_x86',
|
||||
perlasm_scheme => "elf",
|
||||
},
|
||||
"vxworks-simlinux64" => {
|
||||
inherit_from => [ "vxworks-64" ],
|
||||
bn_ops => "SIXTY_FOUR_BIT_LONG",
|
||||
asm_arch => 'vx_x86_64',
|
||||
perlasm_scheme => "elf",
|
||||
},
|
||||
"vxworks-simpc32" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
bn_ops => "BN_LLONG",
|
||||
asm_arch => 'vx_x86',
|
||||
perlasm_scheme => "elf",
|
||||
},
|
||||
"vxworks-simpc64" => {
|
||||
inherit_from => [ "vxworks-64" ],
|
||||
bn_ops => "SIXTY_FOUR_BIT_LONG",
|
||||
asm_arch => 'vx_x86_64',
|
||||
perlasm_scheme => "elf",
|
||||
},
|
||||
"vxworks-riscv32" => {
|
||||
inherit_from => [ "vxworks-32" ],
|
||||
bn_ops => "BN_LLONG",
|
||||
},
|
||||
"vxworks-riscv64" => {
|
||||
inherit_from => [ "vxworks-64" ],
|
||||
bn_ops => "SIXTY_FOUR_BIT_LONG",
|
||||
},
|
||||
|
||||
#### uClinux
|
||||
"uClinux-dist" => {
|
||||
|
||||
+39
-7
@@ -1730,7 +1730,10 @@ EOF
|
||||
if (grep /\.s$/, @srcs) {
|
||||
$recipe .= <<"EOF";
|
||||
$obj: $deps
|
||||
$cmd $cmdflags -c -o \$\@ $srcs
|
||||
$cmd $cmdflags -x assembler-with-cpp -c -o \$\@ $srcs
|
||||
ifdef _WRS_CONFIG_SBOM
|
||||
\@ vxsbomdep -o \$\@
|
||||
endif
|
||||
EOF
|
||||
} elsif (grep /\.S$/, @srcs) {
|
||||
# Originally there was multi-step rule with $(CC) -E file.S
|
||||
@@ -1740,12 +1743,18 @@ EOF
|
||||
# hardly a point to drag it along...
|
||||
$recipe .= <<"EOF";
|
||||
$obj: $deps
|
||||
$cmd $incs $defs $cmdflags -c -o \$\@ $srcs
|
||||
$cmd $incs $defs $cmdflags -x assembler-with-cpp -c -o \$\@ $srcs
|
||||
ifdef _WRS_CONFIG_SBOM
|
||||
\@ vxsbomdep -o \$\@
|
||||
endif
|
||||
EOF
|
||||
} elsif ($makedep_scheme eq 'gcc' && !grep /\.rc$/, @srcs) {
|
||||
$recipe .= <<"EOF";
|
||||
$obj: $deps
|
||||
$cmd $incs $defs $cmdflags -MMD -MF $dep.tmp -c -o \$\@ $srcs
|
||||
ifdef _WRS_CONFIG_SBOM
|
||||
\@ vxsbomdep -o \$\@
|
||||
endif
|
||||
\@touch $dep.tmp
|
||||
\@if cmp $dep.tmp $dep > /dev/null 2> /dev/null; then \\
|
||||
rm -f $dep.tmp; \\
|
||||
@@ -1757,6 +1766,9 @@ EOF
|
||||
$recipe .= <<"EOF";
|
||||
$obj: $deps
|
||||
$cmd $incs $defs $cmdflags $cmdcompile -o \$\@ $srcs
|
||||
ifdef _WRS_CONFIG_SBOM
|
||||
\@ vxsbomdep -o \$\@
|
||||
endif
|
||||
EOF
|
||||
if ($makedep_scheme eq 'makedepend') {
|
||||
$recipe .= <<"EOF";
|
||||
@@ -1878,7 +1890,7 @@ EOF
|
||||
$recipe .= <<"EOF";
|
||||
$full: $fulldeps
|
||||
\$(CC) \$(LIB_CFLAGS) $linkflags\$(LIB_LDFLAGS)$shared_soname$shared_imp \\
|
||||
-o $full$shared_def \\
|
||||
-o $full \\
|
||||
$fullobjs \\
|
||||
$linklibs \$(LIB_EX_LIBS)
|
||||
EOF
|
||||
@@ -1937,14 +1949,35 @@ EOF
|
||||
my $deps = join(" \\\n" . ' ' x (length($dso) + 2),
|
||||
fill_lines(' ', $COLUMNS - length($dso) - 2,
|
||||
@objs, @defs, @deps));
|
||||
|
||||
return <<"EOF";
|
||||
$dso: $deps
|
||||
my $sharedefscript = index($dso, "fips");
|
||||
|
||||
my $configStr = join(", ",quotify_l(@{$config{perlargv}}));
|
||||
my $shareIndex = index($configStr, "no-shared");
|
||||
if ($shareIndex == -1){
|
||||
if ($sharedefscript == -1)
|
||||
{
|
||||
return <<"EOF";
|
||||
$dso: $deps
|
||||
\$(CC) \$(DSO_CFLAGS) $linkflags\$(DSO_LDFLAGS) \\
|
||||
-o $dso \\
|
||||
$objs \\
|
||||
$linklibs\$(DSO_EX_LIBS)
|
||||
EOF
|
||||
}else{
|
||||
return <<"EOF";
|
||||
$dso: $deps
|
||||
\$(CC) \$(DSO_CFLAGS) $linkflags\$(DSO_LDFLAGS) \\
|
||||
-o $dso$shared_def \\
|
||||
$objs \\
|
||||
$linklibs\$(DSO_EX_LIBS)
|
||||
EOF
|
||||
}
|
||||
}else{
|
||||
return <<"EOF";
|
||||
$dso: $deps
|
||||
|
||||
EOF
|
||||
}
|
||||
}
|
||||
sub obj2lib {
|
||||
my %args = @_;
|
||||
@@ -1961,7 +1994,6 @@ EOF
|
||||
$lib: $deps
|
||||
\$(RM) $lib
|
||||
$fill_lib
|
||||
\$(RANLIB) \$\@ || echo Never mind.
|
||||
EOF
|
||||
}
|
||||
sub obj2bin {
|
||||
|
||||
+3
@@ -917,6 +917,9 @@ EOF
|
||||
my $recipe = <<"EOF";
|
||||
$obj: $deps
|
||||
\$(CC) $cflags $defs -c \$(COUTFLAG)\$\@ $srcs
|
||||
ifdef _WRS_CONFIG_SBOM
|
||||
\@ vxsbomdep -o \$\@
|
||||
endif
|
||||
EOF
|
||||
$recipe .= <<"EOF" unless $disabled{makedepend};
|
||||
cmd /C "$makedepcmd $cflags $defs $srcs > $dep 2>&1"
|
||||
|
||||
Reference in New Issue
Block a user