|
From: <sv...@va...> - 2009-02-19 04:06:01
|
Author: njn
Date: 2009-02-19 04:05:41 +0000 (Thu, 19 Feb 2009)
New Revision: 9201
Log:
Fix an incorrect conditional which meant that barrier intercepts weren't
being compiled. This fixes two Helgrind regtests.
Compile PIC modules with -O again. This fixes two more Helgrind regtests;
it's unfortunate that they are sensitive to minor differences like this.
With these changes, Linux functionality is fully restored on the DARWIN
branch -- I get 1 regtest failure, the same as I get for the trunk.
Modified:
branches/DARWIN/Makefile.flags.am
branches/DARWIN/helgrind/hg_intercepts.c
Modified: branches/DARWIN/Makefile.flags.am
===================================================================
--- branches/DARWIN/Makefile.flags.am 2009-02-18 09:26:04 UTC (rev 9200)
+++ branches/DARWIN/Makefile.flags.am 2009-02-19 04:05:41 UTC (rev 9201)
@@ -16,7 +16,7 @@
AM_PIC_FLAG = -fpic
endif
-AM_CFLAGS_PIC = $(AM_PIC_FLAG) -g -fno-omit-frame-pointer -fno-strict-aliasing
+AM_CFLAGS_PIC = $(AM_PIC_FLAG) -O -g -fno-omit-frame-pointer -fno-strict-aliasing
# Flags for specific targets.
# Nb: the AM_CPPFLAGS_* values are suitable for building tools and auxprogs.
Modified: branches/DARWIN/helgrind/hg_intercepts.c
===================================================================
--- branches/DARWIN/helgrind/hg_intercepts.c 2009-02-18 09:26:04 UTC (rev 9200)
+++ branches/DARWIN/helgrind/hg_intercepts.c 2009-02-19 04:05:41 UTC (rev 9201)
@@ -756,7 +756,7 @@
/*--- pthread_barrier_t functions ---*/
/*----------------------------------------------------------------*/
-#if defined(HAVE_PTHREAD_BARRIER)
+#if defined(HAVE_PTHREAD_BARRIER_INIT)
/* Handled: pthread_barrier_init
pthread_barrier_wait
@@ -863,7 +863,7 @@
return ret;
}
-#endif // defined(HAVE_PTHREAD_BARRIER)
+#endif // defined(HAVE_PTHREAD_BARRIER_INIT)
/*----------------------------------------------------------------*/
/*--- pthread_rwlock_t functions ---*/
|