Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

Conflicts:

	configure

1 files changed, 4 insertions, 16 deletions

diff --git a/configure b/configure
index f3b4bc6a..ce9309c7 100755
--- a/configure
+++ b/configure
@@ -751,7 +751,6 @@ BUILD_ELFUTILS_FALSE
 elfutils_abs_srcdir
 stap_LIBS
 DATE
-PROCFLAGS
 subdirs
 LIBOBJS
 LTLIBOBJS'
@@ -8439,19 +8438,9 @@ _ACEOF
 DATE="$date"
 
 
-
-# This procflags business is for staprun/stapio, which need to
-# be compiled with the same bitness as the kernel.  On e.g. PPC,
-# userspace might be 32-bit default, but staprun needs to be
-# 64-bit.  See also bug #4037.
-
-processor=`uname -p`
-case "$processor" in
-ppc64) PROCFLAGS=-m64 ;;
-x86_64) PROCFLAGS=-m64 ;;
-*) PROCFLAGS=""
-esac
-
+# Before PR4037, we used to arrange to pass CFLAGS+=-m64 for a staprun
+# being compiled on 32-bit userspace but running against 64-bit kernels.
+# This is no longer necessary.
 
 # Use tr1/unordered_map if available
 ac_ext=cpp
@@ -10232,13 +10221,12 @@ BUILD_ELFUTILS_FALSE!$BUILD_ELFUTILS_FALSE$ac_delim
 elfutils_abs_srcdir!$elfutils_abs_srcdir$ac_delim
 stap_LIBS!$stap_LIBS$ac_delim
 DATE!$DATE$ac_delim
-PROCFLAGS!$PROCFLAGS$ac_delim
 subdirs!$subdirs$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5