gprof broken since recent commit

[Alan Modra]

On Sat, Jul 28, 2012 at 12:01:15AM +0200, Jan-Benedict Glaw wrote:
> On Fri, 2012-07-27 16:30:58 -0000, vapier@sourceware.org <vapier@sourceware.org> wrote:
> > Changes by:	vapier@sourceware.org	2012-07-27 16:30:57
> 
> It seems this commit breaks cross-building for me:

In fact, it breaks all builds.  Fixed as follows.  I believe the
double inclusion of gconfig.h added here
    http://sourceware.org/ml/binutils/2009-04/msg00188.html
is no longer needed, since the bfd config.h defines _FILE_OFFSET_BITS.

	* gprof.h: Don't include gconfig.h twice.  Undef conflicting
	PACKAGE_* defines.

Index: gprof/gprof.h
===================================================================
RCS file: /cvs/src/src/gprof/gprof.h,v
retrieving revision 1.14
diff -u -p -r1.14 gprof.h
--- gprof/gprof.h	15 Apr 2009 03:22:42 -0000	1.14
+++ gprof/gprof.h	29 Jul 2012 02:07:28 -0000
@@ -29,19 +29,15 @@
 #ifndef gprof_h
 #define gprof_h
 
-#include "gconfig.h"
-
-#undef PACKAGE
-
 /* Include the BFD sysdep.h file.  */
 #include "sysdep.h"
 #include "bfd.h"
 
-/* Undefine the BFD PACKAGE and VERSION macros before including the
-   gprof config.h file.  */
 #undef PACKAGE
-#undef VERSION
-
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 #include "gconfig.h"
 
 #ifndef MIN


-- 
Alan Modra
Australia Development Lab, IBM