From 616191687c41a451ace74b1682e8d0afa706e705 Mon Sep 17 00:00:00 2001 From: Vincent Celier Date: Thu, 9 Sep 2010 12:56:05 +0000 Subject: [PATCH] prj.adb (Get_Object_Directory): Return object directory display name 2010-09-09 Vincent Celier * prj.adb (Get_Object_Directory): Return object directory display name * adaint.c (__gnat_get_file_names_case_sensitive): When environment variable GNAT_FILE_NAME_CASE_SENSITIVE has a value of "0" or "1", return this value, otherwise return the default for the platform. From-SVN: r164086 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/adaint.c | 11 +++++++++-- gcc/ada/prj.adb | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index a336ba89f79..4d5f66d226c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2010-09-09 Vincent Celier + + * prj.adb (Get_Object_Directory): Return object directory display name + * adaint.c (__gnat_get_file_names_case_sensitive): When environment + variable GNAT_FILE_NAME_CASE_SENSITIVE has a value of "0" or "1", + return this value, otherwise return the default for the platform. + 2010-09-09 Arnaud Charlet * gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Update diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index bba176db3fa..bfb58e07aa9 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -579,10 +579,17 @@ __gnat_get_maximum_file_name_length (void) int __gnat_get_file_names_case_sensitive (void) { + const char *sensitive = getenv ("GNAT_FILE_NAME_CASE_SENSITIVE"); + + if (sensitive != NULL + && (sensitive[0] == '0' || sensitive[0] == '1') + && sensitive[1] == '\0') + return sensitive[0] - '0'; + else #if defined (VMS) || defined (WINNT) || defined (__APPLE__) - return 0; + return 0; #else - return 1; + return 1; #endif } diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb index e0f99370ef7..4ec2349edaf 100644 --- a/gcc/ada/prj.adb +++ b/gcc/ada/prj.adb @@ -1045,7 +1045,7 @@ package body Prj is end loop; if Add_Object_Dir then - return Project.Object_Directory.Name; + return Project.Object_Directory.Display_Name; end if; end; end if;