Skip to content

Commit 68c80c1

Browse files
author
sewardj
committed
Preliminary support for Fedora 8, which includes initial support for
glibc-2.7. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7181 a5019735-40e9-0310-863c-91ae7b9d1cf9
1 parent b9354be commit 68c80c1

File tree

4 files changed

+52
-6
lines changed

4 files changed

+52
-6
lines changed

Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DIST_SUBDIRS = $(SUBDIRS)
2020
SUPP_FILES = \
2121
glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \
2222
glibc-2.6.supp aix5libc.supp xfree-3.supp xfree-4.supp \
23-
glibc-2.3456-NPTL-helgrind.supp \
23+
glibc-2.34567-NPTL-helgrind.supp \
2424
glibc-2.2-LinuxThreads-helgrind.supp
2525

2626
dist_val_DATA = $(SUPP_FILES) default.supp

configure.in

+21-5
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,16 @@ AC_EGREP_CPP([GLIBC_26], [
459459
],
460460
libc="2.6")
461461

462+
AC_EGREP_CPP([GLIBC_27], [
463+
#include <features.h>
464+
#ifdef __GNU_LIBRARY__
465+
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 7)
466+
GLIBC_27
467+
#endif
468+
#endif
469+
],
470+
libc="2.7")
471+
462472
AC_EGREP_CPP([AIX5_LIBC], [
463473
#include <standards.h>
464474
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
@@ -481,27 +491,33 @@ case "${libc}" in
481491
AC_MSG_RESULT(2.3 family)
482492
AC_DEFINE([GLIBC_2_3], 1, [Define to 1 if you're using glibc 2.3.x])
483493
DEFAULT_SUPP="glibc-2.3.supp ${DEFAULT_SUPP}"
484-
DEFAULT_SUPP="glibc-2.3456-NPTL-helgrind.supp ${DEFAULT_SUPP}"
494+
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
485495
;;
486496

487497
2.4)
488498
AC_MSG_RESULT(2.4 family)
489499
AC_DEFINE([GLIBC_2_4], 1, [Define to 1 if you're using glibc 2.4.x])
490500
DEFAULT_SUPP="glibc-2.4.supp ${DEFAULT_SUPP}"
491-
DEFAULT_SUPP="glibc-2.3456-NPTL-helgrind.supp ${DEFAULT_SUPP}"
501+
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
492502
;;
493503

494504
2.5)
495505
AC_MSG_RESULT(2.5 family)
496506
AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x])
497507
DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
498-
DEFAULT_SUPP="glibc-2.3456-NPTL-helgrind.supp ${DEFAULT_SUPP}"
508+
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
499509
;;
500510
2.6)
501511
AC_MSG_RESULT(2.6 family)
502512
AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x])
503513
DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
504-
DEFAULT_SUPP="glibc-2.3456-NPTL-helgrind.supp ${DEFAULT_SUPP}"
514+
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
515+
;;
516+
2.7)
517+
AC_MSG_RESULT(2.7 family)
518+
AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x])
519+
DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}"
520+
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
505521
;;
506522
aix5)
507523
AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
@@ -511,7 +527,7 @@ case "${libc}" in
511527

512528
*)
513529
AC_MSG_RESULT(unsupported version)
514-
AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6])
530+
AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.7])
515531
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 libc])
516532
;;
517533
esac
File renamed without changes.

glibc-2.7.supp

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
# Errors to suppress by default with glibc 2.7.x
3+
4+
# Format of this file is:
5+
# {
6+
# name_of_suppression
7+
# tool_name:supp_kind
8+
# (optional extra info for some suppression types)
9+
# caller0 name, or /name/of/so/file.so
10+
# caller1 name, or ditto
11+
# (optionally: caller2 name)
12+
# (optionally: caller3 name)
13+
# }
14+
#
15+
# For Memcheck, the supp_kinds are:
16+
#
17+
# Param Value1 Value2 Value4 Value8 Value16 Jump
18+
# Free Addr1 Addr2 Addr4 Addr8 Addr16
19+
# Cond (previously known as Value0)
20+
#
21+
# and the optional extra info is:
22+
# if Param: name of system call param
23+
24+
{
25+
dl-hack3-1
26+
Memcheck:Cond
27+
obj:/lib*/ld-2.7*.so*
28+
obj:/lib*/ld-2.7*.so*
29+
obj:/lib*/ld-2.7*.so*
30+
}

0 commit comments

Comments
 (0)