From 5566993b4076d586cd681ccfd7007b1aef423fed Mon Sep 17 00:00:00 2001 From: hunt Date: Thu, 9 Nov 2006 18:01:31 +0000 Subject: [PATCH] 2006-11-09 Martin Hunt * Makefile.am (staprun_CFLAGS): New. Use PROCFLAGS. * configure.ac: Add PROCFLAGS. Processor-dependent compilation flags. * configure: Rebuilt. * Makefile.in: Rebuilt. --- ChangeLog | 8 ++++++ Makefile.am | 3 +++ Makefile.in | 72 +++++++++++++++++++++++++++------------------------- configure | 12 ++++++++- configure.ac | 9 +++++++ 5 files changed, 68 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index afb18e34d..ec1ffe108 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-11-09 Martin Hunt + + * Makefile.am (staprun_CFLAGS): New. Use PROCFLAGS. + * configure.ac: Add PROCFLAGS. Processor-dependent + compilation flags. + * configure: Rebuilt. + * Makefile.in: Rebuilt. + 2006-11-09 David Smith * tapsets.cxx (dwarf_query::dwarf_query): Looks for "maxactive" diff --git a/Makefile.am b/Makefile.am index 688f27a4f..c43438929 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,9 @@ install-exec-local: install-elfutils endif staprun_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c runtime/stpd/symbols.c + +staprun_CFLAGS = @PROCFLAGS@ + staprun_LDADD = -lpthread pkglibexec_SCRIPTS = stp_check diff --git a/Makefile.in b/Makefile.in index 25645010a..a2ae444e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -98,8 +98,8 @@ am_stap_OBJECTS = stap-main.$(OBJEXT) stap-parse.$(OBJEXT) \ stap-hash.$(OBJEXT) stap-mdfour.$(OBJEXT) stap-cache.$(OBJEXT) \ stap-util.$(OBJEXT) stap_OBJECTS = $(am_stap_OBJECTS) -am_staprun_OBJECTS = stpd.$(OBJEXT) librelay.$(OBJEXT) \ - symbols.$(OBJEXT) +am_staprun_OBJECTS = staprun-stpd.$(OBJEXT) staprun-librelay.$(OBJEXT) \ + staprun-symbols.$(OBJEXT) staprun_OBJECTS = $(am_staprun_OBJECTS) staprun_DEPENDENCIES = pkglibexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) @@ -199,6 +199,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PROCFLAGS = @PROCFLAGS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -264,6 +265,7 @@ CLEANFILES = $(am__append_3) $(pkglibexec_SCRIPTS) @BUILD_ELFUTILS_TRUE@BUILT_SOURCES = stamp-elfutils @BUILD_ELFUTILS_TRUE@stap_DEPENDENCIES = lib-elfutils/libdw.so staprun_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c runtime/stpd/symbols.c +staprun_CFLAGS = @PROCFLAGS@ staprun_LDADD = -lpthread pkglibexec_SCRIPTS = stp_check loc2c_test_SOURCES = loc2c-test.c loc2c.c @@ -433,7 +435,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librelay.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loc2c_test-loc2c-test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loc2c_test-loc2c.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-buildrun.Po@am__quote@ @@ -448,8 +449,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-tapsets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-translate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-util.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symbols.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/staprun-librelay.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/staprun-stpd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/staprun-symbols.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -521,47 +523,47 @@ stap-mdfour.obj: mdfour.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stap_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stap-mdfour.obj `if test -f 'mdfour.c'; then $(CYGPATH_W) 'mdfour.c'; else $(CYGPATH_W) '$(srcdir)/mdfour.c'; fi` -stpd.o: runtime/stpd/stpd.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stpd.o -MD -MP -MF "$(DEPDIR)/stpd.Tpo" -c -o stpd.o `test -f 'runtime/stpd/stpd.c' || echo '$(srcdir)/'`runtime/stpd/stpd.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/stpd.Tpo" "$(DEPDIR)/stpd.Po"; else rm -f "$(DEPDIR)/stpd.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/stpd.c' object='stpd.o' libtool=no @AMDEPBACKSLASH@ +staprun-stpd.o: runtime/stpd/stpd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -MT staprun-stpd.o -MD -MP -MF "$(DEPDIR)/staprun-stpd.Tpo" -c -o staprun-stpd.o `test -f 'runtime/stpd/stpd.c' || echo '$(srcdir)/'`runtime/stpd/stpd.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/staprun-stpd.Tpo" "$(DEPDIR)/staprun-stpd.Po"; else rm -f "$(DEPDIR)/staprun-stpd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/stpd.c' object='staprun-stpd.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stpd.o `test -f 'runtime/stpd/stpd.c' || echo '$(srcdir)/'`runtime/stpd/stpd.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -c -o staprun-stpd.o `test -f 'runtime/stpd/stpd.c' || echo '$(srcdir)/'`runtime/stpd/stpd.c -stpd.obj: runtime/stpd/stpd.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stpd.obj -MD -MP -MF "$(DEPDIR)/stpd.Tpo" -c -o stpd.obj `if test -f 'runtime/stpd/stpd.c'; then $(CYGPATH_W) 'runtime/stpd/stpd.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/stpd.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/stpd.Tpo" "$(DEPDIR)/stpd.Po"; else rm -f "$(DEPDIR)/stpd.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/stpd.c' object='stpd.obj' libtool=no @AMDEPBACKSLASH@ +staprun-stpd.obj: runtime/stpd/stpd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -MT staprun-stpd.obj -MD -MP -MF "$(DEPDIR)/staprun-stpd.Tpo" -c -o staprun-stpd.obj `if test -f 'runtime/stpd/stpd.c'; then $(CYGPATH_W) 'runtime/stpd/stpd.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/stpd.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/staprun-stpd.Tpo" "$(DEPDIR)/staprun-stpd.Po"; else rm -f "$(DEPDIR)/staprun-stpd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/stpd.c' object='staprun-stpd.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stpd.obj `if test -f 'runtime/stpd/stpd.c'; then $(CYGPATH_W) 'runtime/stpd/stpd.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/stpd.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -c -o staprun-stpd.obj `if test -f 'runtime/stpd/stpd.c'; then $(CYGPATH_W) 'runtime/stpd/stpd.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/stpd.c'; fi` -librelay.o: runtime/stpd/librelay.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT librelay.o -MD -MP -MF "$(DEPDIR)/librelay.Tpo" -c -o librelay.o `test -f 'runtime/stpd/librelay.c' || echo '$(srcdir)/'`runtime/stpd/librelay.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/librelay.Tpo" "$(DEPDIR)/librelay.Po"; else rm -f "$(DEPDIR)/librelay.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/librelay.c' object='librelay.o' libtool=no @AMDEPBACKSLASH@ +staprun-librelay.o: runtime/stpd/librelay.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -MT staprun-librelay.o -MD -MP -MF "$(DEPDIR)/staprun-librelay.Tpo" -c -o staprun-librelay.o `test -f 'runtime/stpd/librelay.c' || echo '$(srcdir)/'`runtime/stpd/librelay.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/staprun-librelay.Tpo" "$(DEPDIR)/staprun-librelay.Po"; else rm -f "$(DEPDIR)/staprun-librelay.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/librelay.c' object='staprun-librelay.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o librelay.o `test -f 'runtime/stpd/librelay.c' || echo '$(srcdir)/'`runtime/stpd/librelay.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -c -o staprun-librelay.o `test -f 'runtime/stpd/librelay.c' || echo '$(srcdir)/'`runtime/stpd/librelay.c -librelay.obj: runtime/stpd/librelay.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT librelay.obj -MD -MP -MF "$(DEPDIR)/librelay.Tpo" -c -o librelay.obj `if test -f 'runtime/stpd/librelay.c'; then $(CYGPATH_W) 'runtime/stpd/librelay.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/librelay.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/librelay.Tpo" "$(DEPDIR)/librelay.Po"; else rm -f "$(DEPDIR)/librelay.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/librelay.c' object='librelay.obj' libtool=no @AMDEPBACKSLASH@ +staprun-librelay.obj: runtime/stpd/librelay.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -MT staprun-librelay.obj -MD -MP -MF "$(DEPDIR)/staprun-librelay.Tpo" -c -o staprun-librelay.obj `if test -f 'runtime/stpd/librelay.c'; then $(CYGPATH_W) 'runtime/stpd/librelay.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/librelay.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/staprun-librelay.Tpo" "$(DEPDIR)/staprun-librelay.Po"; else rm -f "$(DEPDIR)/staprun-librelay.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/librelay.c' object='staprun-librelay.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o librelay.obj `if test -f 'runtime/stpd/librelay.c'; then $(CYGPATH_W) 'runtime/stpd/librelay.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/librelay.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -c -o staprun-librelay.obj `if test -f 'runtime/stpd/librelay.c'; then $(CYGPATH_W) 'runtime/stpd/librelay.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/librelay.c'; fi` -symbols.o: runtime/stpd/symbols.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT symbols.o -MD -MP -MF "$(DEPDIR)/symbols.Tpo" -c -o symbols.o `test -f 'runtime/stpd/symbols.c' || echo '$(srcdir)/'`runtime/stpd/symbols.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/symbols.Tpo" "$(DEPDIR)/symbols.Po"; else rm -f "$(DEPDIR)/symbols.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/symbols.c' object='symbols.o' libtool=no @AMDEPBACKSLASH@ +staprun-symbols.o: runtime/stpd/symbols.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -MT staprun-symbols.o -MD -MP -MF "$(DEPDIR)/staprun-symbols.Tpo" -c -o staprun-symbols.o `test -f 'runtime/stpd/symbols.c' || echo '$(srcdir)/'`runtime/stpd/symbols.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/staprun-symbols.Tpo" "$(DEPDIR)/staprun-symbols.Po"; else rm -f "$(DEPDIR)/staprun-symbols.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/symbols.c' object='staprun-symbols.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o symbols.o `test -f 'runtime/stpd/symbols.c' || echo '$(srcdir)/'`runtime/stpd/symbols.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -c -o staprun-symbols.o `test -f 'runtime/stpd/symbols.c' || echo '$(srcdir)/'`runtime/stpd/symbols.c -symbols.obj: runtime/stpd/symbols.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT symbols.obj -MD -MP -MF "$(DEPDIR)/symbols.Tpo" -c -o symbols.obj `if test -f 'runtime/stpd/symbols.c'; then $(CYGPATH_W) 'runtime/stpd/symbols.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/symbols.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/symbols.Tpo" "$(DEPDIR)/symbols.Po"; else rm -f "$(DEPDIR)/symbols.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/symbols.c' object='symbols.obj' libtool=no @AMDEPBACKSLASH@ +staprun-symbols.obj: runtime/stpd/symbols.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -MT staprun-symbols.obj -MD -MP -MF "$(DEPDIR)/staprun-symbols.Tpo" -c -o staprun-symbols.obj `if test -f 'runtime/stpd/symbols.c'; then $(CYGPATH_W) 'runtime/stpd/symbols.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/symbols.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/staprun-symbols.Tpo" "$(DEPDIR)/staprun-symbols.Po"; else rm -f "$(DEPDIR)/staprun-symbols.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/stpd/symbols.c' object='staprun-symbols.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o symbols.obj `if test -f 'runtime/stpd/symbols.c'; then $(CYGPATH_W) 'runtime/stpd/symbols.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/symbols.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(staprun_CFLAGS) $(CFLAGS) -c -o staprun-symbols.obj `if test -f 'runtime/stpd/symbols.c'; then $(CYGPATH_W) 'runtime/stpd/symbols.c'; else $(CYGPATH_W) '$(srcdir)/runtime/stpd/symbols.c'; fi` .cxx.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/configure b/configure index c1330b64d..02ab895b6 100755 --- a/configure +++ b/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB BUILD_ELFUTILS_TRUE BUILD_ELFUTILS_FALSE elfutils_abs_srcdir BUILD_LKET_B2A_TRUE BUILD_LKET_B2A_FALSE MYSQL_CONFIG CXXCPP HAS_MYSQL_TRUE HAS_MYSQL_FALSE HAS_MYSQL_CONFIG_TRUE HAS_MYSQL_CONFIG_FALSE stap_LIBS DATE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB BUILD_ELFUTILS_TRUE BUILD_ELFUTILS_FALSE elfutils_abs_srcdir BUILD_LKET_B2A_TRUE BUILD_LKET_B2A_FALSE MYSQL_CONFIG CXXCPP HAS_MYSQL_TRUE HAS_MYSQL_FALSE HAS_MYSQL_CONFIG_TRUE HAS_MYSQL_CONFIG_FALSE stap_LIBS DATE PROCFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5876,6 +5876,14 @@ _ACEOF DATE="$date" +processor=`uname -p` +case "$processor" in +powerpc) PROCFLAGS=-m64 ;; +x86_64) PROCFLAGS=-m64 ;; +*) PROCFLAGS="" +esac + + ac_config_headers="$ac_config_headers config.h:config.in" ac_config_files="$ac_config_files Makefile systemtap.spec stp_check stap.1 stapprobes.5 stapfuncs.5 stapex.5 lket.5 lket-b2a.1 runtime/lket/b2a/Makefile testsuite/Makefile man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.tcp.5 man/stapprobes.udp.5" @@ -6654,6 +6662,7 @@ s,@HAS_MYSQL_CONFIG_TRUE@,$HAS_MYSQL_CONFIG_TRUE,;t t s,@HAS_MYSQL_CONFIG_FALSE@,$HAS_MYSQL_CONFIG_FALSE,;t t s,@stap_LIBS@,$stap_LIBS,;t t s,@DATE@,$DATE,;t t +s,@PROCFLAGS@,$PROCFLAGS,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -7395,3 +7404,4 @@ echo "$as_me: running ${elfutils_srcdir}/configure" >&6;} LDFLAGS="$LDFLAGS $elfutils_rpath" ) fi + diff --git a/configure.ac b/configure.ac index 0220ccbf7..ce797ac93 100644 --- a/configure.ac +++ b/configure.ac @@ -114,6 +114,14 @@ date=`date +%Y-%m-%d` AC_DEFINE_UNQUOTED(DATE, "$date", [Configuration/build date]) AC_SUBST(DATE, "$date") +processor=`uname -p` +case "$processor" in +ppc64) PROCFLAGS=-m64 ;; +x86_64) PROCFLAGS=-m64 ;; +*) PROCFLAGS="" +esac +AC_SUBST([PROCFLAGS]) + AC_CONFIG_HEADERS([config.h:config.in]) AC_CONFIG_FILES(Makefile systemtap.spec stp_check stap.1 stapprobes.5 stapfuncs.5 stapex.5 lket.5 lket-b2a.1 runtime/lket/b2a/Makefile testsuite/Makefile man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.tcp.5 man/stapprobes.udp.5) AC_OUTPUT @@ -140,3 +148,4 @@ if test $build_elfutils = yes; then LDFLAGS="$LDFLAGS $elfutils_rpath" ) fi + -- 2.43.5