Skip to content

R
riscv-gcc-1
Commit bf654c94 by Mohan Embar Committed by Mohan Embar
Options

configure: Rebuilt. 

	* configure: Rebuilt.
	* configure.ac (GCJH): Reverted second part of patch of 2006-12-20.

From-SVN: r121797
parent cef04d59
Showing with 15 additions and 137 deletions
libjava/ChangeLog
2007-02-10 Mohan Embar <gnustuff@thisiscool.com> 2007-02-10 Mohan Embar <gnustuff@thisiscool.com>
* configure: Rebuilt.
* configure.ac (GCJH): Reverted second part of patch of 2006-12-20.
2007-02-10 Mohan Embar <gnustuff@thisiscool.com>
* Makefile.in: Rebuilt. * Makefile.in: Rebuilt.
* Makefile.am (BUILD_ECJ1): Unify the command for renaming ecjx to * Makefile.am (BUILD_ECJ1): Unify the command for renaming ecjx to
the host's ecj1 executable. the host's ecj1 executable.
......
libjava/configure
...@@ -5150,7 +5150,7 @@ case "${which_gcj}" in ...@@ -5150,7 +5150,7 @@ case "${which_gcj}" in
else else
GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/" GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
fi fi
GCJH="$built_gcc_dir/gcjh" GCJH='$(target_noncanonical)-gcjh'
;; ;;
path) path)
GCJ="gcj -B`${PWDCMD-pwd}`/" GCJ="gcj -B`${PWDCMD-pwd}`/"
...@@ -7819,7 +7819,7 @@ ac_x_header_dirs=' ...@@ -7819,7 +7819,7 @@ ac_x_header_dirs='
/usr/openwin/share/include' /usr/openwin/share/include'
if test "$ac_x_includes" = no; then if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h. # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified. # First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
...@@ -7827,7 +7827,7 @@ _ACEOF ...@@ -7827,7 +7827,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <X11/Xlib.h> #include <X11/Intrinsic.h>
_ACEOF _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
...@@ -7854,7 +7854,7 @@ else ...@@ -7854,7 +7854,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir ac_x_includes=$ac_dir
break break
fi fi
...@@ -7868,7 +7868,7 @@ if test "$ac_x_libraries" = no; then ...@@ -7868,7 +7868,7 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options. # See if we find them without any special options.
# Don't add to $LIBS permanently. # Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS" LIBS="-lXt $LIBS"
if test x$gcc_no_link = xyes; then if test x$gcc_no_link = xyes; then
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
...@@ -7880,11 +7880,11 @@ _ACEOF ...@@ -7880,11 +7880,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <X11/Xlib.h> #include <X11/Intrinsic.h>
int int
main () main ()
{ {
XrmInitialize () XtMalloc (0)
; ;
return 0; return 0;
} }
...@@ -16870,7 +16870,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ...@@ -16870,7 +16870,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
chktls_save_LDFLAGS="$LDFLAGS" save_LDFLAGS="$LDFLAGS"
LDFLAGS="-static $LDFLAGS" LDFLAGS="-static $LDFLAGS"
if test x$gcc_no_link = xyes; then if test x$gcc_no_link = xyes; then
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
...@@ -16942,134 +16942,7 @@ have_tls=yes ...@@ -16942,134 +16942,7 @@ have_tls=yes
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$chktls_save_LDFLAGS" LDFLAGS="$save_LDFLAGS"
if test $have_tls = yes; then
chktls_save_CFLAGS="$CFLAGS"
thread_CFLAGS=failed
for flag in '' '-pthread' '-lpthread'; do
CFLAGS="$flag $chktls_save_CFLAGS"
if test x$gcc_no_link = xyes; then
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
{ (exit 1); exit 1; }; }
fi
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <pthread.h>
void *g(void *d) { return NULL; }
int
main ()
{
pthread_t t; pthread_create(&t,NULL,g,NULL);
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
thread_CFLAGS="$flag"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "X$thread_CFLAGS" != Xfailed; then
break
fi
done
CFLAGS="$chktls_save_CFLAGS"
if test "X$thread_CFLAGS" != Xfailed; then
CFLAGS="$thread_CFLAGS $chktls_save_CFLAGS"
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <pthread.h>
__thread int a;
static int *a_in_other_thread;
static void *
thread_func (void *arg)
{
a_in_other_thread = &a;
return (void *)0;
}
int
main ()
{
pthread_t thread;
void *thread_retval;
int *a_in_main_thread;
if (pthread_create (&thread, (pthread_attr_t *)0,
thread_func, (void *)0))
return 0;
a_in_main_thread = &a;
if (pthread_join (thread, &thread_retval))
return 0;
return (a_in_other_thread == a_in_main_thread);
;
return 0;
}
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
have_tls=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
have_tls=no
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
CFLAGS="$chktls_save_CFLAGS"
fi
fi
else else
echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
......
libjava/configure.ac
...@@ -358,7 +358,7 @@ case "${which_gcj}" in ...@@ -358,7 +358,7 @@ case "${which_gcj}" in
else else
GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/" GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
fi fi
GCJH="$built_gcc_dir/gcjh" GCJH='$(target_noncanonical)-gcjh'
;; ;;
path) path)
GCJ="gcj -B`${PWDCMD-pwd}`/" GCJ="gcj -B`${PWDCMD-pwd}`/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment