|
From: Nicholas N. <n.n...@gm...> - 2009-06-22 08:07:28
Attachments:
diff.bz2
|
Hi, I'd like to merge the BUILD_TWEAKS branch. It greatly improves the build system. I still have some testing to do, to make sure it does the same things as the current trunk (eg. the same flags passed around, etc), but I thought I'd post the potential diff and log message here for people to look at. If I don't get any complaints, I'll commit it in a couple of days. BTW, Julian, I'd like VEX/Makefile to be renamed VEX/Makefile-gcc in order to avoid problems with the VEX/Makefile that is now generated by autoconf. This should be done just after the merge is committed. Nick This commit merges the BUILD_TWEAKS branch onto the trunk. It has the following improvements: - Arch/OS/platform-specific files are now included/excluded via the preprocessor, rather than via the build system. This is more consistent (we use the pre-processor for small arch/OS/platform-specific chunks within files) and makes the build system much simpler, as the sources for all programs are the same on all platforms. - Vast amounts of cut+paste Makefile.am code has been factored out. If a new platform is implemented, you need to add 11 extra Makefile.am lines. Previously it was over 100 lines. - Vex has been autotoolised. Dependency checking now works in Vex (no more incomplete builds). Parallel builds now also work. --with-vex no longer works; it's little use and a pain to support. VEX/Makefile is still in the Vex repository and gets overwritten at configure-time; it should probably be renamed Makefile-gcc to avoid possible problems, such as accidentally committing a generated Makefile. - Various small Makefile.am things have been made more standard automake style, eg. the use of pkginclude/pkglib prefixes instead of rolling our own. - The existing five top-level Makefile.am include files have been consolidated into three. - Most Makefile.am files now are structured more clearly, with comment headers separating sections, declarations relating to the same things next to each other, better spacing and layout, etc. - Removed the unused exp-ptrcheck/tests/x86 directory. - Renamed some XML files. - Factored out some duplicated dSYM handling code. - Split auxprogs/ into auxprogs/ and mpi/, which allowed the resulting Makefile.am files to be much more standard. - Cleaned up m_coredump by merging a bunch of files that had been overzealously separated. The net result is 630 fewer lines of Makefile.am code, or 897 if you exclude the added Makefile.vex.am. And the build system is much simpler. |
|
From: Florian K. <br...@ac...> - 2009-06-22 22:07:49
|
On Monday 22 June 2009 4:07:16 am Nicholas Nethercote wrote: > Hi, > > I'd like to merge the BUILD_TWEAKS branch. It greatly improves the > build system. I still have some testing to do, to make sure it does > the same things as the current trunk (eg. the same flags passed > around, etc), but I thought I'd post the potential diff and log > message here for people to look at. If I don't get any complaints, > I'll commit it in a couple of days. > I just checked out the BUILD_TWEAKS branch. After running autogen.sh and configure the make process terminates because vex_svnversion.h is not present. From Makefile.vex.am I figured that I should perhaps run make -C VEX version. That does generate the missing file but it is not in the correct spot. I worked around the issue and played a bit with the branch. I was mainly interested in VEX dependencies being handled correctly and that seems to work fine. Thanks a lot for doing this work! Florian |
|
From: Nicholas N. <n.n...@gm...> - 2009-06-23 02:11:09
|
On Tue, Jun 23, 2009 at 8:06 AM, Florian Krohm<br...@ac...> wrote: > On Monday 22 June 2009 4:07:16 am Nicholas Nethercote wrote: > > I just checked out the BUILD_TWEAKS branch. After running autogen.sh > and configure the make process terminates because vex_svnversion.h is > not present. Sigh. That file is such a pain. It should be fixed now. Thanks for the report. Nick |
|
From: Nicholas N. <n.n...@gm...> - 2009-06-23 05:01:03
|
On Mon, Jun 22, 2009 at 6:07 PM, Nicholas Nethercote<n.n...@gm...> wrote: > Hi, > > I'd like to merge the BUILD_TWEAKS branch. It greatly improves the > build system. I still have some testing to do, to make sure it does > the same things as the current trunk (eg. the same flags passed > around, etc), but I thought I'd post the potential diff and log > message here for people to look at. If I don't get any complaints, > I'll commit it in a couple of days. > > BTW, Julian, I'd like VEX/Makefile to be renamed VEX/Makefile-gcc in > order to avoid problems with the VEX/Makefile that is now generated by > autoconf. This should be done just after the merge is committed. Also, after being autotoolised, Vex is now being built with the following additional flags, which it inherits from Valgrind: -fomit-framepointer -fno-stack-protector - some -Wxyz ones Do you see any problems with this? The two -f ones should only make Vex faster, if anything. Nick |
|
From: Bart V. A. <bar...@gm...> - 2009-06-23 06:48:33
|
On Mon, Jun 22, 2009 at 10:07 AM, Nicholas Nethercote <n.n...@gm...> wrote: > I'd like to merge the BUILD_TWEAKS branch. It greatly improves the > build system. I still have some testing to do, to make sure it does > the same things as the current trunk (eg. the same flags passed > around, etc), but I thought I'd post the potential diff and log > message here for people to look at. If I don't get any complaints, > I'll commit it in a couple of days. Thanks for doing this work. The only remark I have on the posted patch is that it contains some (probably unintentional) whitespace-only changes in drd/tests/Makefile.am: ... @@ -28,7 +26,7 @@ annotate_ignore_read.vgtest \ annotate_trace_memory.stderr.exp \ annotate_trace_memory.vgtest \ - atomic_var.stderr.exp \ + atomic_var.stderr.exp \ atomic_var.vgtest \ bar_bad.stderr.exp \ bar_bad.vgtest \ @@ -37,7 +35,7 @@ bar_trivial.vgtest \ boost_thread.stderr.exp \ boost_thread.vgtest \ - circular_buffer.stderr.exp \ + circular_buffer.stderr.exp \ circular_buffer.vgtest \ custom_alloc.stderr.exp \ ... Bart. |