merge from gcc
This commit is contained in:
		| @@ -1,3 +1,7 @@ | |||||||
|  | 2014-05-21  John Marino  <gnugcc@marino.st> | ||||||
|  |  | ||||||
|  | 	* liberty.h: Use basename function on DragonFly. | ||||||
|  |  | ||||||
| 2014-05-01  Steve Ellcey  <sellcey@mips.com> | 2014-05-01  Steve Ellcey  <sellcey@mips.com> | ||||||
|  |  | ||||||
| 	* include/longlong.h: Use 'defined()' to check __mips16. | 	* include/longlong.h: Use 'defined()' to check __mips16. | ||||||
|   | |||||||
| @@ -106,7 +106,10 @@ extern int countargv (char**); | |||||||
|    to find the declaration so provide a fully prototyped one.  If it |    to find the declaration so provide a fully prototyped one.  If it | ||||||
|    is 1, we found it so don't provide any declaration at all.  */ |    is 1, we found it so don't provide any declaration at all.  */ | ||||||
| #if !HAVE_DECL_BASENAME | #if !HAVE_DECL_BASENAME | ||||||
| #if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME) | #if defined (__GNU_LIBRARY__ ) || defined (__linux__) \ | ||||||
|  |  || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) \ | ||||||
|  |  || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) \ | ||||||
|  |  || defined (__DragonFly__) || defined (HAVE_DECL_BASENAME)  | ||||||
| extern char *basename (const char *) ATTRIBUTE_RETURNS_NONNULL ATTRIBUTE_NONNULL(1); | extern char *basename (const char *) ATTRIBUTE_RETURNS_NONNULL ATTRIBUTE_NONNULL(1); | ||||||
| #else | #else | ||||||
| /* Do not allow basename to be used if there is no prototype seen.  We | /* Do not allow basename to be used if there is no prototype seen.  We | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user