aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Celier <celier@adacore.com>2010-09-09 12:56:05 +0000
committerArnaud Charlet <charlet@gcc.gnu.org>2010-09-09 14:56:05 +0200
commit616191687c41a451ace74b1682e8d0afa706e705 (patch)
tree2dfab5e24b92d9c3db060b728e0b476fb152200e
parentcb1a6faeef1b3174a47a76579222aa88615bdff7 (diff)
downloadgcc-616191687c41a451ace74b1682e8d0afa706e705.zip
gcc-616191687c41a451ace74b1682e8d0afa706e705.tar.gz
gcc-616191687c41a451ace74b1682e8d0afa706e705.tar.bz2
prj.adb (Get_Object_Directory): Return object directory display name
2010-09-09 Vincent Celier <celier@adacore.com> * 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
-rw-r--r--gcc/ada/ChangeLog7
-rw-r--r--gcc/ada/adaint.c11
-rw-r--r--gcc/ada/prj.adb2
3 files changed, 17 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a336ba8..4d5f66d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-09 Vincent Celier <celier@adacore.com>
+
+ * 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 <charlet@adacore.com>
* gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Update
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index bba176d..bfb58e0 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 e0f9937..4ec2349 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;