Please revert the patches in bug #54040 and #59346 and special case x32

[Eric Botcazou]

> I got
> 
> /export/build/gnu/gcc-x32/build-x86_64-linux/./gcc/xgcc
> -B/export/build/gnu/gcc-x32/build-x86_64-linux/./gcc/
> -B/usr/gcc-4.9.0-x32/x86_64-unknown-linux-gnu/bin/
> -B/usr/gcc-4.9.0-x32/x86_64-unknown-linux-gnu/lib/ -isystem
> /usr/gcc-4.9.0-x32/x86_64-unknown-linux-gnu/include -isystem
> /usr/gcc-4.9.0-x32/x86_64-unknown-linux-gnu/sys-include    -c -g -O2
> -mx32 -fpic  -W -Wall -gnatpg -nostdinc -mx32  s-osprim.adb -o
> s-osprim.o
> s-osprim.adb:121:30: expected type "Standard.Long_Long_Integer"
> s-osprim.adb:121:30: found type "System.Os_Primitives.time_t"
> make[11]: *** [s-osprim.o] Error 1

Sorry, last minute change, try:

Index: s-osprim-x32.adb
===================================================================
--- s-osprim-x32.adb    (revision 209244)
+++ s-osprim-x32.adb    (working copy)
@@ -118,7 +118,7 @@ package body System.OS_Primitives is
 
       return
         timespec'(tv_sec  => S,
-                  tv_nsec => time_t (Long_Long_Integer (F * 10#1#E9)));
+                  tv_nsec => Long_Long_Integer (F * 10#1#E9));
    end To_Timespec;
 
    -----------------


-- 
Eric Botcazou