From 9431a48f776ae3a67a2d7fa2f955c2f0d139c0be Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Sat, 31 Mar 2012 00:06:04 +0000
Subject: [PATCH] gcc-4.7.0 complains about some __attribute__((always_inline))
 here, so change them back to vanilla ones.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12473
---
 coregrind/m_debuginfo/tytypes.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/coregrind/m_debuginfo/tytypes.c b/coregrind/m_debuginfo/tytypes.c
index 8308012ff..580df5f96 100644
--- a/coregrind/m_debuginfo/tytypes.c
+++ b/coregrind/m_debuginfo/tytypes.c
@@ -420,29 +420,29 @@ Word ML_(TyEnt__cmp_by_cuOff_only) ( TyEnt* te1, TyEnt* te2 )
 
 /* Generates a total ordering on TyEnts based on everything except
    their .cuOff fields. */
-static __attribute__((always_inline)) Word UWord__cmp ( UWord a, UWord b ) {
+static inline Word UWord__cmp ( UWord a, UWord b ) {
    if (a < b) return -1;
    if (a > b) return 1;
    return 0;
 }
-static __attribute__((always_inline)) Word Long__cmp ( Long a, Long b ) {
+static inline Word Long__cmp ( Long a, Long b ) {
    if (a < b) return -1;
    if (a > b) return 1;
    return 0;
 }
-static __attribute__((always_inline)) Word Bool__cmp ( Bool a, Bool b ) {
+static inline Word Bool__cmp ( Bool a, Bool b ) {
    vg_assert( ((UWord)a) <= 1 );
    vg_assert( ((UWord)b) <= 1 );
    if (a < b) return -1;
    if (a > b) return 1;
    return 0;
 }
-static __attribute__((always_inline)) Word UChar__cmp ( UChar a, UChar b ) {
+static inline Word UChar__cmp ( UChar a, UChar b ) {
    if (a < b) return -1;
    if (a > b) return 1;
    return 0;
 }
-static __attribute__((always_inline)) Word Int__cmp ( Int a, Int b ) {
+static inline Word Int__cmp ( Int a, Int b ) {
    if (a < b) return -1;
    if (a > b) return 1;
    return 0;