summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/ChangeLog4
-rwxr-xr-xcontrib/mklog2
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index d789cd8cf7b..e40db53ed64 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-06 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
+ * mklog: Look for the ChangeLog file in $cwd.
+
2016-02-26 Joel Sherrill <joel@rtems.org>
* config-list.mk: Add aarch64-rtems and x86_64-rtems
diff --git a/contrib/mklog b/contrib/mklog
index 455614bfb42..61126280f1f 100755
--- a/contrib/mklog
+++ b/contrib/mklog
@@ -104,7 +104,7 @@ sub get_clname ($) {
my $dirname = $_[0];
while ($dirname) {
my $clname = "$dirname/ChangeLog";
- if (-f "$gcc_root/$clname") {
+ if (-f "$gcc_root/$clname" || -f "$clname") {
my $relname = substr ($_[0], length ($dirname) + 1);
return ($clname, $relname);
} else {