This patch to libgo updates the configure script and a few binary
files. The configure script was changed without going through the
external repo in a way that somehow dropped the
--with-system-libunwind argument and made a few other changes. This
patch restores these changes. A few binary files were changed in the
external repo in merges from the master repo, but the changes did not
get reflected in the GCC repo. These changes are all irrelevant--a
couple of "http" became "https" in files that appeared compressed but
were not actually compressed, and a couple of timestamps were zeroed
out in files that actually were compressed. Patch bootstrapped and
ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline.
Ian
Index: libgo/configure
===================================================================
--- libgo/configure (revision 242581)
+++ libgo/configure (working copy)
@@ -810,6 +810,7 @@ enable_werror
enable_version_specific_runtime_libs
with_libffi
with_libatomic
+with_system_libunwind
'
ac_precious_vars='build_alias
host_alias
@@ -1459,6 +1460,7 @@ Optional Packages:
both]
--without-libffi don't use libffi
--without-libatomic don't use libatomic
+ --with-system-libunwind use installed libunwind
Some influential environment variables:
CC C compiler command
@@ -2483,6 +2485,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
ac_config_headers="$ac_config_headers config.h"
@@ -3467,12 +3472,10 @@ done
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
+
int
main ()
{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
;
return 0;
@@ -11206,7 +11209,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11207 "configure"
+#line 11212 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14679,7 +14682,42 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
esac
-GCC_CHECK_UNWIND_GETIPINFO
+
+
+# Check whether --with-system-libunwind was given.
+if test "${with_system_libunwind+set}" = set; then :
+ withval=$with_system_libunwind;
+fi
+
+ # If system-libunwind was not specifically set, pick a default setting.
+ if test x$with_system_libunwind = x; then
+ case ${target} in
+ ia64-*-hpux*) with_system_libunwind=yes ;;
+ *) with_system_libunwind=no ;;
+ esac
+ fi
+ # Based on system-libunwind and target, do we have ipinfo?
+ if test x$with_system_libunwind = xyes; then
+ case ${target} in
+ ia64-*-*) have_unwind_getipinfo=no ;;
+ *) have_unwind_getipinfo=yes ;;
+ esac
+ else
+ # Darwin before version 9 does not have _Unwind_GetIPInfo.
+
+ case ${target} in
+ *-*-darwin[3-8]|*-*-darwin[3-8].*) have_unwind_getipinfo=no ;;
+ *) have_unwind_getipinfo=yes ;;
+ esac
+
+ fi
+
+ if test x$have_unwind_getipinfo = xyes; then
+
+$as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h
+
+ fi
+
for ac_header in port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h
sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/user.h
sys/utsname.h sys/select.h sys/socket.h net/if.h net/if_arp.h net/route.h
netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h
sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/reboot.h netinet/icmp6.h
netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h
do :
@@ -16269,6 +16307,8 @@ ac_configure_args="${multilib_arg} ${ac_
multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
+CXX="$CXX"
+GFORTRAN="$GFORTRAN"
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
Index: libgo/go/archive/zip/testdata/readme.notzip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libgo/go/archive/zip/testdata/readme.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libgo/go/compress/gzip/testdata/issue6550.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: libgo/go/encoding/json/testdata/code.json.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
