From 58608c7c7ac664e03d8f4acffd9420e56d148320 Mon Sep 17 00:00:00 2001
From: "Randall S. Becker" <rsbecker@nexbridge.com>
Date: Fri, 9 Oct 2020 15:17:34 -0600
Subject: [PATCH] Reconciled c99 and loader arguments for float on NonStop
 TNS/E and TNS/X.

The default settings are now IEEE float.

CLA: Permission is granted by the author to the ITUGLIB team to use these modifications.

Fixes #12919

Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13108)
---
 Configurations/50-nonstop.conf | 48 +++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf
index 21cd64833d..37ccbb40a5 100644
--- a/Configurations/50-nonstop.conf
+++ b/Configurations/50-nonstop.conf
@@ -134,20 +134,32 @@
         template         => 1,
         lflags           => '-Wld="-set floattype tandem_float"',
     },
+    'nonstop-efloat-itanium' => {
+        template         => 1,
+        cflags           => '-WIEEE_float',
+        lflags           => '-Weld="-set floattype ieee_float"',
+    },
     'nonstop-nfloat-itanium' => {
         template         => 1,
         lflags           => '-Weld="-set floattype neutral_float"',
     },
     'nonstop-tfloat-itanium' => {
         template         => 1,
+        cflags           => '-WTandem_float',
         lflags           => '-Weld="-set floattype tandem_float"',
     },
+    'nonstop-efloat-x86_64' => {
+        template         => 1,
+        cflags           => '-WIEEE_float',
+        lflags           => '-Wxld="-set floattype ieee_float"',
+    },
     'nonstop-nfloat-x86_64' => {
         template         => 1,
         lflags           => '-Wxld="-set floattype neutral_float"',
     },
     'nonstop-tfloat-x86_64' => {
         template         => 1,
+        cflags           => '-WTandem_float',
         lflags           => '-Wxld="-set floattype tandem_float"',
     },
 
@@ -181,39 +193,45 @@
     'nonstop-nsx' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-x86_64-oss',
-                              'nonstop-ilp32', 'nonstop-nfloat-x86_64',
+                              'nonstop-ilp32',
+                              'nonstop-efloat-x86_64',
                               'nonstop-model-floss' ],
         disable          => ['threads'],
     },
     'nonstop-nsx_put' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-x86_64-oss',
-                              'nonstop-ilp32', 'nonstop-nfloat-x86_64',
+                              'nonstop-ilp32',
+                              'nonstop-efloat-x86_64',
                               'nonstop-model-put' ],
     },
     'nonstop-nsx_64' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-x86_64-oss',
-                              'nonstop-lp64-x86_64', 'nonstop-nfloat-x86_64',
+                              'nonstop-lp64-x86_64',
+                              'nonstop-efloat-x86_64',
                               'nonstop-model-floss' ],
         disable          => ['threads'],
     },
     'nonstop-nsx_64_put' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-x86_64-oss',
-                              'nonstop-lp64-x86_64', 'nonstop-nfloat-x86_64',
+                              'nonstop-lp64-x86_64',
+                              'nonstop-efloat-x86_64',
                               'nonstop-model-put' ],
     },
     'nonstop-nsx_spt' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-x86_64-oss', 
-                              'nonstop-ilp32', 'nonstop-nfloat-x86_64',
+                              'nonstop-ilp32',
+                              'nonstop-efloat-x86_64',
                               'nonstop-model-spt' ],
     },
     'nonstop-nsx_spt_floss' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-x86_64-oss',
-                              'nonstop-ilp32', 'nonstop-nfloat-x86_64',
+                              'nonstop-ilp32',
+                              'nonstop-efloat-x86_64',
                               'nonstop-model-floss', 'nonstop-model-spt'],
     },
     'nonstop-nsx_g' => {
@@ -234,39 +252,45 @@
     'nonstop-nse' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-itanium-oss',
-                              'nonstop-ilp32', 'nonstop-nfloat-itanium',
+                              'nonstop-ilp32',
+                              'nonstop-efloat-itanium',
                               'nonstop-model-floss' ],
         disable          => ['threads'],
     },
     'nonstop-nse_put' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-itanium-oss',
-                              'nonstop-ilp32', 'nonstop-nfloat-itanium',
+                              'nonstop-ilp32',
+                              'nonstop-efloat-itanium',
                               'nonstop-model-put' ],
     },
     'nonstop-nse_64' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-itanium-oss',
-                              'nonstop-lp64-itanium', 'nonstop-nfloat-itanium',
+                              'nonstop-lp64-itanium',
+                              'nonstop-efloat-itanium',
                               'nonstop-model-floss' ],
         disable          => ['threads'],
     },
     'nonstop-nse_64_put' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-itanium-oss',
-                              'nonstop-lp64-itanium', 'nonstop-nfloat-itanium',
+                              'nonstop-lp64-itanium',
+                              'nonstop-efloat-itanium',
                               'nonstop-model-put' ],
     },
     'nonstop-nse_spt' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-itanium-oss',
-                              'nonstop-ilp32', 'nonstop-nfloat-itanium',
+                              'nonstop-ilp32',
+                              'nonstop-efloat-itanium',
                               'nonstop-model-spt' ],
     },
     'nonstop-nse_spt_floss' => {
         inherit_from     => [ 'nonstop-common',
                               'nonstop-archenv-itanium-oss',
-                              'nonstop-ilp32', 'nonstop-nfloat-itanium',
+                              'nonstop-ilp32',
+                              'nonstop-efloat-itanium',
                               'nonstop-model-floss', 'nonstop-model-spt' ],
     },
     'nonstop-nse_g' => {