diff mbox

Disable libitm if unsupported

Message ID 4EB97355.70704@redhat.com
State New
Headers show

Commit Message

Richard Henderson Nov. 8, 2011, 6:22 p.m. UTC
On 11/08/2011 09:56 AM, Pedro Alves wrote:
> On Tuesday 08 November 2011 17:31:45, Richard Henderson wrote:
>> On 11/08/2011 09:26 AM, Pedro Alves wrote:
>>> On Tuesday 08 November 2011 16:33:52, Richard Henderson wrote:
>>>> toplevel/
>>>>         * configure.ac: Adjust srcdir for running libitm/configure.tgt.
>>>
>>>> +# Disable libitm on unsupported hosted systems.
>>>> +if test x$enable_libitm = x; then
>>>> +   AC_MSG_CHECKING([for libitm support])
>>>> +   if (srcdir=${srcdir}/libitm; \
>>>> +       . ${srcdir}/configure.tgt; \
>>>
>>> This should check that libitm exists before sourcing the script,
>>> as otherwise it will error out on src tree
>>> checkouts (binutils, gdb, ...), given that the libitm directory
>>> doesn't exist there.
>>
>> Should I bother with an explicit test, or just use "set -e"?
> 
> Whatever works is fine with me.  :-)
> 

Tested and committed the following.


r~

Comments

Iain Sandoe Nov. 8, 2011, 9:20 p.m. UTC | #1
Hi Chaps....

On 8 Nov 2011, at 18:22, Richard Henderson wrote:

> On 11/08/2011 09:56 AM, Pedro Alves wrote:
>> On Tuesday 08 November 2011 17:31:45, Richard Henderson wrote:
>>> On 11/08/2011 09:26 AM, Pedro Alves wrote:
>>>> On Tuesday 08 November 2011 16:33:52, Richard Henderson wrote:
>>>>> toplevel/
>>>>>        * configure.ac: Adjust srcdir for running libitm/ 
>>>>> configure.tgt.
>>>>
>>>>> +# Disable libitm on unsupported hosted systems.
>>>>> +if test x$enable_libitm = x; then
>>>>> +   AC_MSG_CHECKING([for libitm support])
>>>>> +   if (srcdir=${srcdir}/libitm; \
>>>>> +       . ${srcdir}/configure.tgt; \
>>>>
>>>> This should check that libitm exists before sourcing the script,
>>>> as otherwise it will error out on src tree
>>>> checkouts (binutils, gdb, ...), given that the libitm directory
>>>> doesn't exist there.
>>>
>>> Should I bother with an explicit test, or just use "set -e"?
>>
>> Whatever works is fine with me.  :-)
>>
>
> Tested and committed the following.

is it expected for  libitm to work on x86 darwin?
(the implication of the libitm/configure.tgt is yes .. )

.. can't seem to get it to build ..

/bin/sh ./libtool --tag=CXX   --mode=compile  -B/GCC/gcc-4-7-install/ 
i686-apple-darwin9/bin/ -B/GCC/gcc-4-7-install/i686-apple-darwin9/lib/  
-isystem /GCC/gcc-4-7-install/i686-apple-darwin9/include -isystem /GCC/ 
gcc-4-7-install/i686-apple-darwin9/sys-include    -DHAVE_CONFIG_H -I. - 
I/GCC/gcc-live-trunk/libitm  -I/GCC/gcc-live-trunk/libitm/config/posix  
-I/GCC/gcc-live-trunk/libitm/config/generic -I/GCC/gcc-live-trunk/ 
libitm  -std=gnu++0x -funwind-tables -fno-exceptions -fno-rtti - 
march=i486 -mtune=i686 -fomit-frame-pointer -Wall -Werror  -Wc,- 
pthread -fabi-version=4 -g -O2 -MT cacheline.lo -MD -MP -MF .deps/ 
cacheline.Tpo -c -o cacheline.lo /GCC/gcc-live-trunk/libitm/config/ 
generic/cacheline.cc
libtool: compile: unrecognized option `-B/GCC/gcc-4-7-install/i686- 
apple-darwin9/bin/'
libtool: compile: Try `libtool --help' for more information.
make[3]: *** [barrier.lo] Error 1

Iain
Richard Henderson Nov. 8, 2011, 9:29 p.m. UTC | #2
On 11/08/2011 01:20 PM, Iain Sandoe wrote:
> is it expected for  libitm to work on x86 darwin?

Yes.

> /bin/sh ./libtool --tag=CXX   --mode=compile  -B/GCC/gcc-4-7-install/i686-apple-darwin9/bin/ -B/GCC/gcc-4-7-install/i686-apple-darwin9/lib/ -isystem /GCC/gcc-4-7-install/i686-apple-darwin9/include -isystem /GCC/gcc-4-7-install/i686-apple-darwin9/sys-include    -DHAVE_CONFIG_H -I. -I/GCC/gcc-live-trunk/libitm  -I/GCC/gcc-live-trunk/libitm/config/posix -I/GCC/gcc-live-trunk/libitm/config/generic -I/GCC/gcc-live-trunk/libitm  -std=gnu++0x -funwind-tables -fno-exceptions -fno-rtti -march=i486 -mtune=i686 -fomit-frame-pointer -Wall -Werror  -Wc,-pthread -fabi-version=4 -g -O2 -MT cacheline.lo -MD -MP -MF .deps/cacheline.Tpo -c -o cacheline.lo /GCC/gcc-live-trunk/libitm/config/generic/cacheline.cc
> libtool: compile: unrecognized option `-B/GCC/gcc-4-7-install/i686-apple-darwin9/bin/'
> libtool: compile: Try `libtool --help' for more information.
> make[3]: *** [barrier.lo] Error 1

That's ... odd.

Top-level makefile has passed down the empty string instead of the g++ executable.
I have zero idea how to fix this.  It sounds similar to the horror that I eventually
bypassed wrt the include paths.


r~
Iain Sandoe Nov. 8, 2011, 9:33 p.m. UTC | #3
On 8 Nov 2011, at 21:29, Richard Henderson wrote:

> On 11/08/2011 01:20 PM, Iain Sandoe wrote:
>> is it expected for  libitm to work on x86 darwin?
>
> Yes.

OK, I'll persevere ;-)

Iain
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index 89eb37a..c25db94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@ 
 2011-11-08  Richard Henderson  <rth@redhat.com>
 
+	* configure.ac: Test for libitm directory present first.
+
 	* configure.ac: Adjust srcdir for running libitm/configure.tgt.
 
 	* configure.ac: Test libitm/configure.tgt to disable libitm.
diff --git a/configure b/configure
index 7a7f287..8a37411 100755
--- a/configure
+++ b/configure
@@ -3057,20 +3057,23 @@  if test x$enable_libgomp = x ; then
     esac
 fi
 
-# Disable libitm on unsupported hosted systems.
-if test x$enable_libitm = x; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5
+# Disable libitm on unsupported systems.
+if test -d ${srcdir}/libitm; then
+    if test x$enable_libitm = x; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5
 $as_echo_n "checking for libitm support... " >&6; }
-   if (srcdir=${srcdir}/libitm; \
-       . ${srcdir}/configure.tgt; \
-       test -n "$UNSUPPORTED"); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	noconfigdirs="$noconfigdirs target-libitm"
-   else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	if (srcdir=${srcdir}/libitm; \
+		. ${srcdir}/configure.tgt; \
+		test -n "$UNSUPPORTED")
+	then
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	    noconfigdirs="$noconfigdirs target-libitm"
+	else
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-   fi
+	fi
+    fi
 fi
 
 # Disable libssp for some systems.
diff --git a/configure.ac b/configure.ac
index 888d051..efabad4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -493,17 +493,20 @@  if test x$enable_libgomp = x ; then
     esac
 fi
 
-# Disable libitm on unsupported hosted systems.
-if test x$enable_libitm = x; then
-   AC_MSG_CHECKING([for libitm support])
-   if (srcdir=${srcdir}/libitm; \
-       . ${srcdir}/configure.tgt; \
-       test -n "$UNSUPPORTED"); then
-	AC_MSG_RESULT([no])
-	noconfigdirs="$noconfigdirs target-libitm"
-   else
-	AC_MSG_RESULT([yes])
-   fi
+# Disable libitm on unsupported systems.
+if test -d ${srcdir}/libitm; then
+    if test x$enable_libitm = x; then
+	AC_MSG_CHECKING([for libitm support])
+	if (srcdir=${srcdir}/libitm; \
+		. ${srcdir}/configure.tgt; \
+		test -n "$UNSUPPORTED")
+	then
+	    AC_MSG_RESULT([no])
+	    noconfigdirs="$noconfigdirs target-libitm"
+	else
+	    AC_MSG_RESULT([yes])
+	fi
+    fi
 fi
 
 # Disable libssp for some systems.