public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* gprof broken since recent commit
       [not found] <20120727163058.16382.qmail@sourceware.org>
@ 2012-07-27 22:01 ` Jan-Benedict Glaw
  2012-07-29  4:10   ` Alan Modra
  0 siblings, 1 reply; 3+ messages in thread
From: Jan-Benedict Glaw @ 2012-07-27 22:01 UTC (permalink / raw)
  To: vapier, binutils, vapier

[-- Attachment #1: Type: text/plain, Size: 6670 bytes --]

Hi Mike!

On Fri, 2012-07-27 16:30:58 -0000, vapier@sourceware.org <vapier@sourceware.org> wrote:
> CVSROOT:	/cvs/src
> Module name:	src
> Changes by:	vapier@sourceware.org	2012-07-27 16:30:57
> 
> Modified files:
> 	bfd            : ChangeLog configure configure.in 
> 	binutils       : ChangeLog configure configure.in 
> 	gas            : ChangeLog configure configure.in 
> 	gprof          : ChangeLog configure configure.in 
> 	ld             : ChangeLog configure configure.in 
> 	opcodes        : ChangeLog configure configure.in 

It seems this commit breaks cross-building for me:

$ ../../../binutils/configure --target=alpha-linux --prefix="${MY_INSTALL_DIR}" --enable-gold=yes
[...]
$ make all-binutils all-ld all-gas all-gprof install-binutils install-ld install-gas install-gprof
[...]
make[5]: Entering directory `/mnt/devel/src/linux/build/alpha-linux/binutils/gprof'
echo "@set top_srcdir ../../../../binutils/gprof" >> ./config.texi
restore=: && backupdir=".am$$" && \
        rm -rf $backupdir && mkdir $backupdir && \
        if (makeinfo --split-size=5000000 --version) >/dev/null 2>&1; then \
          for f in gprof.info gprof.info-[0-9] gprof.info-[0-9][0-9] gprof.i[0-9] gprof.i[0-9][0-9]; do \
            if test -f $f; then mv $f $backupdir; restore=mv; else :; fi; \
          done; \
        else :; fi && \
        if makeinfo --split-size=5000000 -I "../../../../binutils/gprof" -I "../../../../binutils/gprof/../bfd/doc" -I ../bfd/doc  -I ../../../../binutils/gprof \
         -o gprof.info `test -f 'gprof.texi' || echo '../../../../binutils/gprof/'`gprof.texi; \
        then \
          rc=0; \
        else \
          rc=$?; \
          $restore $backupdir/* `echo "./gprof.info" | sed 's|[^/]*$||'`; \
        fi; \
        rm -rf $backupdir; exit $rc
gcc -DHAVE_CONFIG_H -I. -I../../../../binutils/gprof  -DDEBUG -I../bfd -I../../../../binutils/gprof/../include -I../../../../binutils/gprof/../bfd  -I. -DLOCALEDIR="\"/mnt/devel/src/linux/_in
In file included from ../../../../binutils/gprof/../bfd/sysdep.h:30:0,
                 from ../../../../binutils/gprof/gprof.h:37,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
../bfd/config.h:273:0: error: "PACKAGE_NAME" redefined [-Werror]
In file included from ../../../../binutils/gprof/gprof.h:32:0,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
./gconfig.h:58:0: note: this is the location of the previous definition
In file included from ../../../../binutils/gprof/../bfd/sysdep.h:30:0,
                 from ../../../../binutils/gprof/gprof.h:37,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
../bfd/config.h:276:0: error: "PACKAGE_STRING" redefined [-Werror]
In file included from ../../../../binutils/gprof/gprof.h:32:0,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
./gconfig.h:61:0: note: this is the location of the previous definition
In file included from ../../../../binutils/gprof/../bfd/sysdep.h:30:0,
                 from ../../../../binutils/gprof/gprof.h:37,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
../bfd/config.h:279:0: error: "PACKAGE_TARNAME" redefined [-Werror]
In file included from ../../../../binutils/gprof/gprof.h:32:0,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
./gconfig.h:64:0: note: this is the location of the previous definition
In file included from ../../../../binutils/gprof/../bfd/sysdep.h:30:0,
                 from ../../../../binutils/gprof/gprof.h:37,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
../bfd/config.h:285:0: error: "PACKAGE_VERSION" redefined [-Werror]
In file included from ../../../../binutils/gprof/gprof.h:32:0,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
./gconfig.h:70:0: note: this is the location of the previous definition
In file included from ../../../../binutils/gprof/gprof.h:45:0,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
./gconfig.h:58:0: error: "PACKAGE_NAME" redefined [-Werror]
In file included from ../../../../binutils/gprof/../bfd/sysdep.h:30:0,
                 from ../../../../binutils/gprof/gprof.h:37,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
../bfd/config.h:273:0: note: this is the location of the previous definition
In file included from ../../../../binutils/gprof/gprof.h:45:0,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
./gconfig.h:61:0: error: "PACKAGE_STRING" redefined [-Werror]
In file included from ../../../../binutils/gprof/../bfd/sysdep.h:30:0,
                 from ../../../../binutils/gprof/gprof.h:37,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
../bfd/config.h:276:0: note: this is the location of the previous definition
In file included from ../../../../binutils/gprof/gprof.h:45:0,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
./gconfig.h:64:0: error: "PACKAGE_TARNAME" redefined [-Werror]
In file included from ../../../../binutils/gprof/../bfd/sysdep.h:30:0,
                 from ../../../../binutils/gprof/gprof.h:37,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
../bfd/config.h:279:0: note: this is the location of the previous definition
In file included from ../../../../binutils/gprof/gprof.h:45:0,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
./gconfig.h:70:0: error: "PACKAGE_VERSION" redefined [-Werror]
In file included from ../../../../binutils/gprof/../bfd/sysdep.h:30:0,
                 from ../../../../binutils/gprof/gprof.h:37,
                 from ../../../../binutils/gprof/basic_blocks.c:25:
../bfd/config.h:285:0: note: this is the location of the previous definition
cc1: all warnings being treated as errors
make[5]: *** [basic_blocks.o] Error 1
make[5]: Leaving directory `/mnt/devel/src/linux/build/alpha-linux/binutils/gprof'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/mnt/devel/src/linux/build/alpha-linux/binutils/gprof'
make[3]: *** [all] Error 2
make[3]: Leaving directory `/mnt/devel/src/linux/build/alpha-linux/binutils/gprof'
make[2]: *** [all-gprof] Error 2
make[2]: Leaving directory `/mnt/devel/src/linux/build/alpha-linux/binutils'


MfG, JBG

-- 
      Jan-Benedict Glaw      jbglaw@lug-owl.de              +49-172-7608481
Signature of:               The real problem with C++ for kernel modules is:
the second  :                                 the language just sucks.
                                                   -- Linus Torvalds

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: gprof broken since recent commit
  2012-07-27 22:01 ` gprof broken since recent commit Jan-Benedict Glaw
@ 2012-07-29  4:10   ` Alan Modra
  2012-07-29  4:45     ` Mike Frysinger
  0 siblings, 1 reply; 3+ messages in thread
From: Alan Modra @ 2012-07-29  4:10 UTC (permalink / raw)
  To: Jan-Benedict Glaw; +Cc: vapier, binutils, vapier

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: gprof broken since recent commit
  2012-07-29  4:10   ` Alan Modra
@ 2012-07-29  4:45     ` Mike Frysinger
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2012-07-29  4:45 UTC (permalink / raw)
  To: Alan Modra; +Cc: Jan-Benedict Glaw, binutils

[-- Attachment #1: Type: Text/Plain, Size: 790 bytes --]

On Sunday 29 July 2012 00:09:36 Alan Modra wrote:
> 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 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.

thanks.  i was having trouble picking apart the intentions of the code due to 
the comments in the file.  and i've been out.
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-07-29  4:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20120727163058.16382.qmail@sourceware.org>
2012-07-27 22:01 ` gprof broken since recent commit Jan-Benedict Glaw
2012-07-29  4:10   ` Alan Modra
2012-07-29  4:45     ` Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).