diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 55e5b8747464..844cdd96c9a0 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-01  Pascal Obry  <obry@adacore.com>
+
+	* a-direct.adb (C_Size): Returns an int64.
+	* osint.adb (System.CRTL): New with clause.
+	(File_Length.Internal): Returns an int64.
+	* s-os_lib.ads (File_Length): Returns an int64.
+
 2014-08-01  Robert Dewar  <dewar@adacore.com>
 
 	* gnatchop.adb, gnatcmd.adb, make.adb, mlib-prj.adb, bindgen.adb,
diff --git a/gcc/ada/a-direct.adb b/gcc/ada/a-direct.adb
index 275ad7ad5031..20fd064fe805 100644
--- a/gcc/ada/a-direct.adb
+++ b/gcc/ada/a-direct.adb
@@ -1250,7 +1250,7 @@ package body Ada.Directories is
    function Size (Name : String) return File_Size is
       C_Name : String (1 .. Name'Length + 1);
 
-      function C_Size (Name : Address) return size_t;
+      function C_Size (Name : Address) return int64;
       pragma Import (C, C_Size, "__gnat_named_file_length");
 
    begin
diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb
index c0b25cc47f75..0902ae291583 100644
--- a/gcc/ada/osint.adb
+++ b/gcc/ada/osint.adb
@@ -39,6 +39,7 @@ with Unchecked_Conversion;
 pragma Warnings (Off);
 --  This package is used also by gnatcoll
 with System.Case_Util; use System.Case_Util;
+with System.CRTL;
 pragma Warnings (On);
 
 with GNAT.HTable;
@@ -1076,11 +1077,11 @@ package body Osint is
       function Internal
         (F : Integer;
          N : C_File_Name;
-         A : System.Address) return size_t;
+         A : System.Address) return CRTL.int64;
       pragma Import (C, Internal, "__gnat_file_length_attr");
 
    begin
-      --  The conversion from size_t to Long_Integer is ok here as this
+      --  The conversion from int64 to Long_Integer is ok here as this
       --  routine is only to be used by the compiler and we do not expect
       --  a unit to be larger than a 32bit integer.
 
diff --git a/gcc/ada/s-os_lib.ads b/gcc/ada/s-os_lib.ads
index 7c474007378f..d6d690560404 100644
--- a/gcc/ada/s-os_lib.ads
+++ b/gcc/ada/s-os_lib.ads
@@ -434,7 +434,7 @@ package System.OS_Lib is
    --  to the current position (origin = SEEK_CUR), end of file (origin =
    --  SEEK_END), or start of file (origin = SEEK_SET).
 
-   function File_Length (FD : File_Descriptor) return CRTL.size_t;
+   function File_Length (FD : File_Descriptor) return CRTL.int64;
    pragma Import (C, File_Length, "__gnat_file_length");
    --  Get length of file from file descriptor FD