X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=blobdiff_plain;f=glibcbug.in;h=0f392e7151c3dff11558e595ec55102b099f1b6b;hp=c915f34f04cb0c42e3a67948d1db0c1e4104900b;hb=3552e7b22f3877c849c73478f56bf3389809d8b5;hpb=759045807e2beade2ce9cd0118c3560cff88d68e

diff --git a/glibcbug.in b/glibcbug.in
index c915f34f04..0f392e7151 100644
--- a/glibcbug.in
+++ b/glibcbug.in
@@ -6,11 +6,12 @@
 #       these variables are filled in by configure
 #
 VERSION="@VERSION@"
-BUGGLIBC="bugs@gnu.org"
+RELEASE="@RELEASE@"
 ADDONS="@subdirs@"
 HOST="@host@"
 CC='@CC@'
 CFLAGS="@CFLAGS@"
+SYSINCLUDES="@SYSINCLUDES@"
 VERSIONING="@VERSIONING@"
 BUILD_STATIC="@static@"
 BUILD_SHARED="@shared@"
@@ -21,9 +22,6 @@ BUILD_BOUNDED="@bounded@"
 BUILD_STATIC_NSS="@static_nss@"
 STDIO="@stdio@"
 
-PATH=/bin:/usr/bin:/usr/local/bin:$PATH
-export PATH
-
 TEMP=`mktemp -q /tmp/glibcbugXXXXXX 2>/dev/null`
 if test $? -ne 0; then
   TEMP=/tmp/glibcbug.$$
@@ -37,8 +35,13 @@ if test $? -ne 0; then
   chmod 600 $TEMPx
 fi
 
+if test "$RELEASE" = "stable"; then
+  BUGGLIBC="bugs@gnu.org"
+else
+  BUGGLIBC="libc-alpha@cygnus.com"
+fi
+
 BUGADDR=${1-$BUGGLIBC}
-ENVIRONMENT=`uname -a`
 
 : ${EDITOR=emacs}
 
@@ -76,7 +79,6 @@ else
   # and to protect shell metacharacters in the expansion of $LOGNAME
   $PASSWD | grep "^$LOGNAME:" | awk -F: '{print $5}' | sed -e 's/,.*//' > $TEMP
   ORIGINATOR="`cat $TEMP`"
-  rm -f $TEMP
 fi
 
 if [ -n "$ORGANIZATION" ]; then
@@ -107,6 +109,13 @@ SYSTEM=`( [ -f /bin/uname ] && /bin/uname -a ) || \
         ( [ -f /usr/bin/uname ] && /usr/bin/uname -a ) || echo ""`
 ARCH=`[ -f /bin/arch ] && /bin/arch`
 MACHINE=`[ -f /bin/machine ] && /bin/machine`
+CCVERSION=`$CC -v 2>&1 | sed -n 's/gcc version //p'`
+
+case $HOST in *linux*)
+  KHDRS=`(echo '#include <linux/version.h>'
+	  echo '! UTS_RELEASE' ) |
+	 $CC $SYSINCLUDES -E - | sed -n '/!/s/[! "]//gp'`;;
+esac
 
 ORGANIZATION_C='<organization of PR author (multiple lines)>'
 SYNOPSIS_C='<synopsis of the problem (one line)>'
@@ -149,7 +158,9 @@ ${ORGANIZATION- $ORGANIZATION_C}
 `[ -n "$ADDONS" ] && echo Addons: $ADDONS`
 `[ -n "$CFLAGS" ] && echo Build CFLAGS: $CFLAGS`
 `[ -n "$CC" ] && echo Build CC: $CC`
-`[ -n "$VERSIONING" ] && echo Versioning: $VERSIONING`
+`[ -n "$CCVERSION" ] && echo Compiler version: $CCVERSION`
+`[ -n "$KHDRS" ] && echo Kernel headers: $KHDRS`
+`[ -n "$VERSIONING" ] && echo Symbol versioning: $VERSIONING`
 `[ -n "$BUILD_STATIC" ] && echo Build static: $BUILD_STATIC`
 `[ -n "$BUILD_SHARED" ] && echo Build shared: $BUILD_SHARED`
 `[ -n "$BUILD_PIC_DEFAULT" ] && echo Build pic-default: $BUILD_PIC_DEFAULT`