[gofrontend] push by i...@golang.org - libgo: Solaris portability for syscall package.... on 2013-02-11 19:02 GMT

[gofro...@googlecode.com]

Revision: e1872b6db171
Branch: default
Author: Ian Lance Taylor <ia...@golang.org>
Date: Mon Feb 11 11:02:39 2013
Log: libgo: Solaris portability for syscall package.

http://gcc.gnu.org/PR56171

From Rainer Orth.

R=iant
CC=gofrontend-dev
https://codereview.appspot.com/7307094
http://code.google.com/p/gofrontend/source/detail?r=e1872b6db171

Modified:
/libgo/Makefile.am
/libgo/Makefile.in
/libgo/configure
/libgo/configure.ac
/libgo/mksysinfo.sh

=======================================
--- /libgo/Makefile.am Sat Feb 9 15:18:33 2013
+++ /libgo/Makefile.am Mon Feb 11 11:02:39 2013
@@ -1997,7 +1997,7 @@
CHECK = \
GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L
`${PWD_COMMAND}`/.libs"; \
export GC; \
- GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \
+ GOLIBS="$(MATH_LIBS) $(NET_LIBS) $(LIBS)"; \
export GOLIBS; \
RUNTESTFLAGS="$(RUNTESTFLAGS)"; \
export RUNTESTFLAGS; \
=======================================
--- /libgo/Makefile.in Sat Feb 9 15:18:33 2013
+++ /libgo/Makefile.in Mon Feb 11 11:02:39 2013
@@ -2114,7 +2114,7 @@
CHECK = \
GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L
`${PWD_COMMAND}`/.libs"; \
export GC; \
- GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \
+ GOLIBS="$(MATH_LIBS) $(NET_LIBS) $(LIBS)"; \
export GOLIBS; \
RUNTESTFLAGS="$(RUNTESTFLAGS)"; \
export RUNTESTFLAGS; \
=======================================
--- /libgo/configure Thu Feb 7 10:01:36 2013
+++ /libgo/configure Mon Feb 11 11:02:39 2013
@@ -14211,6 +14211,62 @@
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing
nanosleep" >&5
+$as_echo_n "checking for library containing nanosleep... " >&6; }
+if test "${ac_cv_search_nanosleep+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nanosleep ();
+int
+main ()
+{
+return nanosleep ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' rt; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_nanosleep=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_nanosleep+set}" = set; then :
+ break
+fi
+done
+if test "${ac_cv_search_nanosleep+set}" = set; then :
+
+else
+ ac_cv_search_nanosleep=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep"
>&5
+$as_echo "$ac_cv_search_nanosleep" >&6; }
+ac_res=$ac_cv_search_nanosleep
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
fi


=======================================
--- /libgo/configure.ac Thu Feb 7 10:01:36 2013
+++ /libgo/configure.ac Mon Feb 11 11:02:39 2013
@@ -413,8 +413,9 @@
AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
AC_SUBST(PTHREAD_LIBS)

-dnl Test if -lrt is required for sched_yield.
+dnl Test if -lrt is required for sched_yield and/or nanosleep.
AC_SEARCH_LIBS([sched_yield], [rt])
+AC_SEARCH_LIBS([nanosleep], [rt])

AC_C_BIGENDIAN

=======================================
--- /libgo/mksysinfo.sh Fri Feb 8 11:22:34 2013
+++ /libgo/mksysinfo.sh Mon Feb 11 11:02:39 2013
@@ -309,6 +309,13 @@
fi
done

+# The syscall package requires AF_LOCAL.
+if ! grep '^const AF_LOCAL ' ${OUT} >/dev/null 2>&1; then
+ if grep '^const AF_UNIX ' ${OUT} >/dev/null 2>&1; then
+ echo "const AF_LOCAL = AF_UNIX" >> ${OUT}
+ fi
+fi
+
# pathconf constants.
grep '^const __PC' gen-sysinfo.go |
sed -e 's/^\(const \)__\(PC[^= ]*\)\(.*\)$/\1\2 = __\2/' >> ${OUT}