diff options
author | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2014-11-05 22:17:22 +0000 |
---|---|---|
committer | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2014-11-05 22:17:22 +0000 |
commit | 10a241382b3fed4c7bb090fcc2b686d74eb99d6c (patch) | |
tree | 8249e806b1ac70a853b9112a20e3ef9a27d08c1f /libiberty | |
parent | 14abf8cae10a18fc348df4e1ae93c6afc097d2cb (diff) | |
download | gcc-10a241382b3fed4c7bb090fcc2b686d74eb99d6c.zip gcc-10a241382b3fed4c7bb090fcc2b686d74eb99d6c.tar.gz gcc-10a241382b3fed4c7bb090fcc2b686d74eb99d6c.tar.bz2 |
Revert revision 217149 because it breaks Ada:
gcc/testsuite/ChangeLog:
2014-11-05 Anthony Brandon <anthony.brandon@gmail.com>
PR driver/36312
* gcc.misc-tests/output.exp: New test case for identical input and
output files.
include/ChangeLog:
2014-11-05 Anthony Brandon <anthony.brandon@gmail.com>
PR driver/36312
* filenames.h: Add prototype for canonical_filename_eq.
gcc/ChangeLog:
2014-11-05 Anthony Brandon <anthony.brandon@gmail.com>
PR driver/36312
* diagnostic-core.h: Add prototype for fatal_error.
* diagnostic.c (fatal_error): New function fatal_error.
* gcc.c (store_arg): Remove have_o_argbuf_index.
(process_command): Check if input and output files are the same.
* toplev.c (init_asm_output): Check if input and output files are
the same.
libiberty/ChangeLog:
2014-11-05 Anthony Brandon <anthony.brandon@gmail.com>
PR driver/36312
* filename_cmp.c (canonical_filename_eq): New function to check if
file names are the same.
* functions.texi: Updated with documentation for new function.
From-SVN: r217159
Diffstat (limited to 'libiberty')
-rw-r--r-- | libiberty/ChangeLog | 7 | ||||
-rw-r--r-- | libiberty/filename_cmp.c | 29 | ||||
-rw-r--r-- | libiberty/functions.texi | 18 |
3 files changed, 4 insertions, 50 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 738965c..ff06b18 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,10 +1,3 @@ -2014-11-05 Anthony Brandon <anthony.brandon@gmail.com> - - PR driver/36312 - * filename_cmp.c (canonical_filename_eq): New function to check if - file names are the same. - * functions.texi: Updated with documentation for new function. - 2014-11-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * sigsetmask.c (_POSIX_SOURCE): Remove. diff --git a/libiberty/filename_cmp.c b/libiberty/filename_cmp.c index 150488c..9e16d24 100644 --- a/libiberty/filename_cmp.c +++ b/libiberty/filename_cmp.c @@ -24,13 +24,8 @@ #include <string.h> #endif -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif - #include "filenames.h" #include "safe-ctype.h" -#include "libiberty.h" /* @@ -195,27 +190,3 @@ filename_eq (const void *s1, const void *s2) /* The casts are for -Wc++-compat. */ return filename_cmp ((const char *) s1, (const char *) s2) == 0; } - -/* - -@deftypefn Extension int canonical_filename_eq (const char *@var{a}, const char *@var{b}) - -Return non-zero if file names @var{a} and @var{b} are equivalent. -This function compares the canonical versions of the filenames as returned by -@code{lrealpath()}, so that so that different file names pointing to the same -underlying file are treated as being identical. - -@end deftypefn - -*/ - -int -canonical_filename_eq (const char * a, const char * b) -{ - char * ca = lrealpath(a); - char * cb = lrealpath(b); - int res = filename_eq (ca, cb); - free (ca); - free (cb); - return res; -} diff --git a/libiberty/functions.texi b/libiberty/functions.texi index 9ed9ff0..3627285 100644 --- a/libiberty/functions.texi +++ b/libiberty/functions.texi @@ -125,16 +125,6 @@ Uses @code{malloc} to allocate storage for @var{nelem} objects of @end deftypefn -@c filename_cmp.c:201 -@deftypefn Extension int canonical_filename_eq (const char *@var{a}, const char *@var{b}) - -Return non-zero if file names @var{a} and @var{b} are equivalent. -This function compares the canonical versions of the filenames as returned by -@code{lrealpath()}, so that so that different file names pointing to the same -underlying file are treated as being identical. - -@end deftypefn - @c choose-temp.c:45 @deftypefn Extension char* choose_temp_base (void) @@ -296,7 +286,7 @@ value 1). If @var{valu} is zero, zero is returned. @end deftypefn -@c filename_cmp.c:37 +@c filename_cmp.c:32 @deftypefn Extension int filename_cmp (const char *@var{s1}, const char *@var{s2}) Return zero if the two file names @var{s1} and @var{s2} are equivalent. @@ -313,7 +303,7 @@ and backward slashes are equal. @end deftypefn -@c filename_cmp.c:183 +@c filename_cmp.c:178 @deftypefn Extension int filename_eq (const void *@var{s1}, const void *@var{s2}) Return non-zero if file names @var{s1} and @var{s2} are equivalent. @@ -321,7 +311,7 @@ This function is for use with hashtab.c hash tables. @end deftypefn -@c filename_cmp.c:152 +@c filename_cmp.c:147 @deftypefn Extension hashval_t filename_hash (const void *@var{s}) Return the hash value for file name @var{s} that will be compared @@ -330,7 +320,7 @@ This function is for use with hashtab.c hash tables. @end deftypefn -@c filename_cmp.c:94 +@c filename_cmp.c:89 @deftypefn Extension int filename_ncmp (const char *@var{s1}, const char *@var{s2}, size_t @var{n}) Return zero if the two file names @var{s1} and @var{s2} are equivalent |