|
From: <sv...@va...> - 2005-08-29 01:22:56
|
Author: njn Date: 2005-08-29 02:22:54 +0100 (Mon, 29 Aug 2005) New Revision: 4557 Log: Fixed the hacky method of building libcoregrind.so. Also, we don't need to play --whole-archive games with libreplacemalloc_core.a now. Modified: branches/ASPACEM/Makefile.tool.am branches/ASPACEM/cachegrind/Makefile.am branches/ASPACEM/coregrind/Makefile.am branches/ASPACEM/lackey/Makefile.am branches/ASPACEM/massif/Makefile.am branches/ASPACEM/memcheck/Makefile.am branches/ASPACEM/none/Makefile.am Modified: branches/ASPACEM/Makefile.tool.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/Makefile.tool.am 2005-08-29 01:15:13 UTC (rev 4556) +++ branches/ASPACEM/Makefile.tool.am 2005-08-29 01:22:54 UTC (rev 4557) @@ -7,3 +7,26 @@ =20 LIBREPLACEMALLOC =3D $(top_builddir)/coregrind/m_replacemalloc/libreplac= emalloc_toolpreload.a =20 +## Nb: libscheduler.a must precede libdispatch.a in this list. +COREGRIND_LIBS =3D \ + $(top_builddir)/coregrind/libcoregrind_singles.a \ + $(top_builddir)/coregrind/m_aspacemgr/libaspacemgr.a \ + $(top_builddir)/coregrind/m_debuginfo/libdebuginfo.a \ + $(top_builddir)/coregrind/m_demangle/libdemangle.a \ + $(top_builddir)/coregrind/m_scheduler/libscheduler.a \ + $(top_builddir)/coregrind/m_dispatch/libdispatch.a \ + $(top_builddir)/coregrind/m_replacemalloc/libreplacemalloc_core.a \ + $(top_builddir)/coregrind/m_sigframe/libsigframe.a \ + $(top_builddir)/coregrind/m_syswrap/libsyswrap.a \ + @VEX_DIR@/libvex.a + + +## Nb: do not call this variables "TOOL_LINKADD" and "TOOL_LDFLAGS" -- t= hat +## makes automake think we are building something called "TOOLS". +TOOL_LINKADD =3D $(COREGRIND_LIBS) -lgcc +TOOL_LINKFLAGS =3D \ + -static \ + -Wl,-defsym,valt_load_address=3D@VALT_LOAD_ADDRESS@ \ + -Wl,-T,$(top_srcdir)/valt_load_address.lds \ + -nodefaultlibs -nostartfiles + Modified: branches/ASPACEM/cachegrind/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/cachegrind/Makefile.am 2005-08-29 01:15:13 UTC (rev = 4556) +++ branches/ASPACEM/cachegrind/Makefile.am 2005-08-29 01:22:54 UTC (rev = 4557) @@ -11,13 +11,7 @@ =20 val_PROGRAMS =3D cachegrind =20 -cachegrind_DEPENDENCIES =3D $(top_srcdir)/coregrind/libcoregrind.a -cachegrind_SOURCES =3D \ - cg_main.c \ - cg-@VG_ARCH@.c -cachegrind_LDFLAGS =3D \ - -static \ - $(top_srcdir)/coregrind/libcoregrind.a \ - -Wl,-defsym,valt_load_address=3D@VALT_LOAD_ADDRESS@ \ - -Wl,-T,$(top_srcdir)/valt_load_address.lds \ - -nodefaultlibs -lgcc -nostartfiles +cachegrind_SOURCES =3D cg_main.c cg-@VG_ARCH@.c +cachegrind_DEPENDENCIES =3D $(COREGRIND_LIBS) +cachegrind_LDADD =3D $(TOOL_LINKADD) +cachegrind_LDFLAGS =3D $(TOOL_LINKFLAGS) Modified: branches/ASPACEM/coregrind/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/coregrind/Makefile.am 2005-08-29 01:15:13 UTC (rev 4= 556) +++ branches/ASPACEM/coregrind/Makefile.am 2005-08-29 01:22:54 UTC (rev 4= 557) @@ -23,15 +23,7 @@ =20 default.supp: $(SUPP_FILES) =20 -## XXXXXXXXXXXXX JRS 8 Aug 05: the next three lines constitute an -## appalling hack. Although we purportedly create a .a file, in fact -## it is really a .o (relocatable ELF object) file. The root reason -## is that some of the inputs to libcoregrind.a are themselves .a files, -## and I don't know how to get /usr/bin/ar to accept .a files as inputs. -noinst_LIBRARIES =3D libcoregrind.a -libcoregrind_a_AR =3D $(LD) --whole-archive -r -o -RANLIB =3D echo "Not really ranlib-ing" -## end of hack +noinst_LIBRARIES =3D libcoregrind_singles.a =20 bin_PROGRAMS =3D \ valgrind @@ -98,7 +90,7 @@ m_commandline.c \ m_debuglog.c =20 -libcoregrind_a_SOURCES =3D \ +libcoregrind_singles_a_SOURCES =3D \ m_commandline.c \ m_cpuid.S \ m_debugger.c \ @@ -133,39 +125,6 @@ m_transtab.c \ m_ume.c =20 -## Nb: libscheduler.a must precede libdispatch.a in this list. -libcoregrind_a_extra=3D \ - m_debuginfo/libdebuginfo.a \ - m_demangle/libdemangle.a \ - m_scheduler/libscheduler.a \ - m_dispatch/libdispatch.a \ - m_aspacemgr/libaspacemgr.a \ - m_sigframe/libsigframe.a \ - m_syswrap/libsyswrap.a \ - @VEX_DIR@/libvex.a - -## These ones must be linked in with the --whole-archive flag, because -## they wouldn't get pulled into libcoregrind otherwise (because they -## contain symbols only referred to by tool shared objects). -libcoregrind_a_extra2 =3D \ - m_replacemalloc/libreplacemalloc_core.a - -## Nb: older versions of automake don't seem to like having +=3D within = an -## if-then-else, so we have to use these variables for the common parts. -libcoregrind_a_DEPS_common =3D \ - $(libcoregrind_a_extra) \ - $(libcoregrind_a_extra2) - -st2_LDFLAGS_common =3D \ - -Wl,--export-dynamic -g \ - -Wl,--whole-archive $(libcoregrind_a_extra2) -Wl,--no-whole-archive - -libcoregrind_a_DEPENDENCIES =3D $(libcoregrind_a_DEPS_common) -libcoregrind_a_LIBFLAGS =3D \ - $(st2_LDFLAGS_common) - -libcoregrind_a_LIBADD=3D $(libcoregrind_a_extra) $(libcoregrind_a_extra2= ) - vg_preload_core_so_SOURCES =3D vg_preloaded.c vg_preload_core_so_CFLAGS =3D $(AM_CFLAGS) -fpic vg_preload_core_so_LDADD =3D -ldl Modified: branches/ASPACEM/lackey/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/lackey/Makefile.am 2005-08-29 01:15:13 UTC (rev 4556= ) +++ branches/ASPACEM/lackey/Makefile.am 2005-08-29 01:22:54 UTC (rev 4557= ) @@ -2,12 +2,7 @@ =20 val_PROGRAMS =3D lackey =20 -lackey_DEPENDENCIES =3D $(top_srcdir)/coregrind/libcoregrind.a -lackey_SOURCES =3D \ - lk_main.c -lackey_LDFLAGS =3D \ - -static \ - $(top_srcdir)/coregrind/libcoregrind.a \ - -Wl,-defsym,valt_load_address=3D@VALT_LOAD_ADDRESS@ \ - -Wl,-T,$(top_srcdir)/valt_load_address.lds \ - -nodefaultlibs -lgcc -nostartfiles +lackey_SOURCES =3D lk_main.c +lackey_DEPENDENCIES =3D $(COREGRIND_LIBS) +lackey_LDADD =3D $(TOOL_LINKADD) +lackey_LDFLAGS =3D $(TOOL_LINKFLAGS) Modified: branches/ASPACEM/massif/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/massif/Makefile.am 2005-08-29 01:15:13 UTC (rev 4556= ) +++ branches/ASPACEM/massif/Makefile.am 2005-08-29 01:22:54 UTC (rev 4557= ) @@ -4,20 +4,15 @@ =20 val_PROGRAMS =3D massif vgpreload_massif.so =20 -vgpreload_massif_so_SOURCES =3D=20 -vgpreload_massif_so_DEPENDENCIES =3D \ - $(LIBREPLACEMALLOC) -vgpreload_massif_so_LDFLAGS =3D -shared -Wl,-z,interpose,-z,initfirst \ +vgpreload_massif_so_SOURCES =3D=20 +vgpreload_massif_so_DEPENDENCIES =3D $(LIBREPLACEMALLOC) +vgpreload_massif_so_LDFLAGS =3D \ + -shared -Wl,-z,interpose,-z,initfirst \ -Wl,--whole-archive \ $(LIBREPLACEMALLOC) \ -Wl,--no-whole-archive =20 -massif_DEPENDENCIES =3D $(top_srcdir)/coregrind/libcoregrind.a -massif_SOURCES =3D \ - ms_main.c -massif_LDFLAGS =3D \ - -static \ - $(top_srcdir)/coregrind/libcoregrind.a \ - -Wl,-defsym,valt_load_address=3D@VALT_LOAD_ADDRESS@ \ - -Wl,-T,$(top_srcdir)/valt_load_address.lds \ - -nodefaultlibs -lgcc -nostartfiles +massif_SOURCES =3D ms_main.c +massif_DEPENDENCIES =3D $(COREGRIND_LIBS) +massif_LDADD =3D $(TOOL_LINKADD) +massif_LDFLAGS =3D $(TOOL_LINKFLAGS) Modified: branches/ASPACEM/memcheck/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/memcheck/Makefile.am 2005-08-29 01:15:13 UTC (rev 45= 56) +++ branches/ASPACEM/memcheck/Makefile.am 2005-08-29 01:22:54 UTC (rev 45= 57) @@ -5,28 +5,23 @@ =20 val_PROGRAMS =3D memcheck vgpreload_memcheck.so =20 -vgpreload_memcheck_so_SOURCES =3D \ - mac_replace_strmem.c -vgpreload_memcheck_so_DEPENDENCIES =3D \ - $(LIBREPLACEMALLOC) -vgpreload_memcheck_so_LDFLAGS =3D -shared -Wl,-z,interpose,-z,initfirst = \ +vgpreload_memcheck_so_SOURCES =3D mac_replace_strmem.c +vgpreload_memcheck_so_DEPENDENCIES =3D $(LIBREPLACEMALLOC) +vgpreload_memcheck_so_LDFLAGS =3D \ + -shared -Wl,-z,interpose,-z,initfirst \ -Wl,--whole-archive \ $(LIBREPLACEMALLOC) \ -Wl,--no-whole-archive =20 -memcheck_DEPENDENCIES =3D $(top_srcdir)/coregrind/libcoregrind.a memcheck_SOURCES =3D \ mac_leakcheck.c \ mac_malloc_wrappers.c \ mc_main.c \ mac_shared.c \ mc_translate.c -memcheck_LDFLAGS =3D \ - -static \ - $(top_srcdir)/coregrind/libcoregrind.a \ - -Wl,-defsym,valt_load_address=3D@VALT_LOAD_ADDRESS@ \ - -Wl,-T,$(top_srcdir)/valt_load_address.lds \ - -nodefaultlibs -lgcc -nostartfiles +memcheck_DEPENDENCIES =3D $(COREGRIND_LIBS) +memcheck_LDADD =3D $(TOOL_LINKADD) +memcheck_LDFLAGS =3D $(TOOL_LINKFLAGS) =20 mcincludedir =3D $(includedir)/valgrind =20 Modified: branches/ASPACEM/none/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ASPACEM/none/Makefile.am 2005-08-29 01:15:13 UTC (rev 4556) +++ branches/ASPACEM/none/Makefile.am 2005-08-29 01:22:54 UTC (rev 4557) @@ -2,12 +2,7 @@ =20 val_PROGRAMS =3D none =20 -none_DEPENDENCIES =3D $(top_srcdir)/coregrind/libcoregrind.a -none_SOURCES =3D \ - nl_main.c -none_LDFLAGS =3D \ - -static \ - $(top_srcdir)/coregrind/libcoregrind.a \ - -Wl,-defsym,valt_load_address=3D@VALT_LOAD_ADDRESS@ \ - -Wl,-T,$(top_srcdir)/valt_load_address.lds \ - -nodefaultlibs -lgcc -nostartfiles +none_SOURCES =3D nl_main.c +none_DEPENDENCIES =3D $(COREGRIND_LIBS) +none_LDADD =3D $(TOOL_LINKADD) +none_LDFLAGS =3D $(TOOL_LINKFLAGS) |