Use Ada.Numerics.Aux wrapper for float on x86 vx7r2cert

TN: U126-004
Change-Id: I4634eb4c7a7c52dbe297d5ef67a683e9f0d5ccdd
(cherry picked from commit 952571b)

Author: jklmnn

src/system/system-vxworks7-x86-ravenscar-sfp.ads

@@ -78,8 +78,8 @@ package System is
    Max_Binary_Modulus    : constant := 2 ** Standard'Max_Integer_Size;
    Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
 
-   Max_Base_Digits       : constant := Long_Long_Float'Digits;
-   Max_Digits            : constant := Long_Long_Float'Digits;
+   Max_Base_Digits       : constant := Long_Float'Digits;
+   Max_Digits            : constant := Long_Float'Digits;
 
    Max_Mantissa          : constant := Standard'Max_Integer_Size - 1;
    Fine_Delta            : constant := 2.0 ** (-Max_Mantissa);

src/system/system-vxworks7-x86-zfp.ads

@@ -75,8 +75,8 @@ package System is
    Max_Binary_Modulus    : constant := 2 ** Standard'Max_Integer_Size;
    Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
 
-   Max_Base_Digits       : constant := Long_Long_Float'Digits;
-   Max_Digits            : constant := Long_Long_Float'Digits;
+   Max_Base_Digits       : constant := Long_Float'Digits;
+   Max_Digits            : constant := Long_Float'Digits;
 
    Max_Mantissa          : constant := Standard'Max_Integer_Size - 1;
    Fine_Delta            : constant := 2.0 ** (-Max_Mantissa);

support/rts_sources/sources.py

@@ -912,11 +912,11 @@
         ]
     },
     'math/long_long_64bit': {
-        'conditions': ['Add_Math_Lib:!no', 'CPU_Family:!x86_64'],
+        'conditions': ['Add_Math_Lib:!no', 'CPU_Family:!x86,!x86_64'],
         'srcs': ['libgnat/a-nllefu.ads']
     },
     'math/long_long_80bit': {
-        'conditions': ['Add_Math_Lib:!no', 'CPU_Family:x86_64'],
+        'conditions': ['Add_Math_Lib:!no', 'CPU_Family:x86,x86_64'],
         'bb_srcs': [
             'hie/s-lilodo__ada.ads', 'hie/s-lilodo__ada.adb',
             'hie/s-lldosq__ada.ads', 'hie/s-lldosq__fpu.adb',
@@ -925,7 +925,10 @@
             'hie/s-lilodo__ada.ads', 'hie/s-lilodo__ada.adb',
             'hie/s-lldosq__ada.ads', 'hie/s-lldosq__fpu.adb',
             'hie/a-nllefu__ada.ads'],
-        'vx7r2cert_srcs': ['hie/a-nllefu__cert.ads']
+        'vx7r2cert_srcs': ['hie/a-nllefu__cert.ads',
+                           'libgnat/a-nalofl.ads',
+                           'libgnat/a-nallfl__wraplf.ads',
+                           'libgnat/a-naliop__nolibm.ads']
     },
     'math/complex': {
         'conditions': ['Add_Math_Lib:!no', 'Add_Complex_Type_Support:yes'],