|
From: <sv...@va...> - 2012-03-31 00:06:11
|
sewardj 2012-03-31 01:06:04 +0100 (Sat, 31 Mar 2012)
New Revision: 12473
Log:
gcc-4.7.0 complains about some __attribute__((always_inline)) here,
so change them back to vanilla ones.
Modified files:
trunk/coregrind/m_debuginfo/tytypes.c
Modified: trunk/coregrind/m_debuginfo/tytypes.c (+5 -5)
===================================================================
--- trunk/coregrind/m_debuginfo/tytypes.c 2012-03-31 01:04:59 +01:00 (rev 12472)
+++ trunk/coregrind/m_debuginfo/tytypes.c 2012-03-31 01:06:04 +01:00 (rev 12473)
@@ -420,29 +420,29 @@
/* 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;
|