summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Configurations/50-nonstop.conf25
-rw-r--r--NOTES-NONSTOP.md13
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}