diff options
| author | Randall S. Becker <randall.becker@nexbridge.ca> | 2024-06-06 22:57:10 +0200 |
|---|---|---|
| committer | Todd Short <todd.short@me.com> | 2024-06-18 19:32:13 +0200 |
| commit | 929fcc57125b8ed3cc58b254bdc1790a8136247e (patch) | |
| tree | 541e0791d2deef85809275f9f5bbb95a259cf161 | |
| parent | Add support for targetingInformation X.509v3 extension (diff) | |
| download | openssl-929fcc57125b8ed3cc58b254bdc1790a8136247e.tar.xz openssl-929fcc57125b8ed3cc58b254bdc1790a8136247e.zip | |
Remove configuration targets and related documentation for Guardian builds.
The intermediate configuration items to support Guardian builds are left
in place as a convenience for users who want to set up configurations
for Guardian on their own.
Fixes: #22175
Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/24579)
| -rw-r--r-- | Configurations/50-nonstop.conf | 25 | ||||
| -rw-r--r-- | NOTES-NONSTOP.md | 13 |
2 files changed, 2 insertions, 36 deletions
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf index 7a5c5dcd45..572c5a5de8 100644 --- a/Configurations/50-nonstop.conf +++ b/Configurations/50-nonstop.conf @@ -211,18 +211,6 @@ multibin => '64-put', disable => ['atexit'], }, - 'nonstop-nsx_g' => { - inherit_from => [ 'nonstop-common', - 'nonstop-archenv-x86_64-guardian', - 'nonstop-ilp32', 'nonstop-nfloat-x86_64' ], - disable => ['threads','atexit'], - }, - 'nonstop-nsx_g_tandem' => { - inherit_from => [ 'nonstop-common', - 'nonstop-archenv-x86_64-guardian', - 'nonstop-ilp32', 'nonstop-tfloat-x86_64' ], - disable => ['threads','atexit'], - }, 'nonstop-nsv' => { inherit_from => [ 'nonstop-nsx' ], }, @@ -262,16 +250,3 @@ multibin => '64-put', disable => ['atexit'], }, - 'nonstop-nse_g' => { - inherit_from => [ 'nonstop-common', - 'nonstop-archenv-itanium-guardian', - 'nonstop-ilp32', 'nonstop-nfloat-itanium' ], - disable => ['threads','atexit'], - }, - - 'nonstop-nse_g_tandem' => { - inherit_from => [ 'nonstop-common', - 'nonstop-archenv-itanium-guardian', - 'nonstop-ilp32', 'nonstop-tfloat-itanium' ], - disable => ['threads','atexit'], - }, diff --git a/NOTES-NONSTOP.md b/NOTES-NONSTOP.md index 2b35151ec0..0ef99513bc 100644 --- a/NOTES-NONSTOP.md +++ b/NOTES-NONSTOP.md @@ -217,15 +217,12 @@ Example Configure Targets ------------------------- For OSS targets, the main DLL names will be `libssl.so` and `libcrypto.so`. -For GUARDIAN targets, DLL names will be `ssl` and `crypto`. The following -assumes that your PWD is set according to your installation standards. +The following assumes that your PWD is set according to your installation +standards. ./Configure nonstop-nsx --prefix=${PWD} \ --openssldir=${PWD}/ssl no-threads \ --with-rand-seed=rdcpu ${CIPHENABLES} ${DBGFLAG} ${SYSTEMLIBS} - ./Configure nonstop-nsx_g --prefix=${PWD} \ - --openssldir=${PWD}/ssl no-threads \ - --with-rand-seed=rdcpu ${CIPHENABLES} ${DBGFLAG} ${SYSTEMLIBS} ./Configure nonstop-nsx_put --prefix=${PWD} \ --openssldir=${PWD}/ssl threads "-D_REENTRANT" \ --with-rand-seed=rdcpu ${CIPHENABLES} ${DBGFLAG} ${SYSTEMLIBS} @@ -235,9 +232,6 @@ assumes that your PWD is set according to your installation standards. ./Configure nonstop-nsx_64_put --prefix=${PWD} \ --openssldir=${PWD}/ssl threads "-D_REENTRANT" \ --with-rand-seed=rdcpu ${CIPHENABLES} ${DBGFLAG} ${SYSTEMLIBS} - ./Configure nonstop-nsx_g_tandem --prefix=${PWD} \ - --openssldir=${PWD}/ssl no-threads \ - --with-rand-seed=rdcpu ${CIPHENABLES} ${DBGFLAG} ${SYSTEMLIBS} ./Configure nonstop-nse --prefix=${PWD} \ --openssldir=${PWD}/ssl no-threads \ @@ -254,6 +248,3 @@ assumes that your PWD is set according to your installation standards. ./Configure nonstop-nse_64_put --prefix=${PWD} \ --openssldir=${PWD}/ssl threads "-D_REENTRANT" --with-rand-seed=egd ${CIPHENABLES} ${DBGFLAG} ${SYSTEMLIBS} - ./Configure nonstop-nse_g_tandem --prefix=${PWD} \ - --openssldir=${PWD}/ssl no-threads \ - --with-rand-seed=egd ${CIPHENABLES} ${DBGFLAG} ${SYSTEMLIBS} |