summaryrefslogtreecommitdiff
path: root/libgo
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-11-18 04:05:10 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-11-18 04:05:10 +0000
commit4a273582d43f33379b24182b26ce9d461f5238be (patch)
treed2edf3d39d3ff21f00a1481251934786905abb63 /libgo
parent95b98f235b0fe8e216e2b218b559f6706fae5fcf (diff)
downloadgcc-4a273582d43f33379b24182b26ce9d461f5238be.tar.gz
Update libgo/configure to restore it to the master version.
Update a few binary files that were changed in the master gc repo, copied into the gofrontend repo, but not correctly copied into the GCC repo. The changes are all minor and do not affect any actual tests. Two instances of "http" changed to "https", and two timestamps were zeroed out. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@242582 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
-rwxr-xr-xlibgo/configure50
-rw-r--r--libgo/go/archive/zip/testdata/readme.notzipbin1905 -> 1906 bytes
-rw-r--r--libgo/go/archive/zip/testdata/readme.zipbin1885 -> 1886 bytes
-rw-r--r--libgo/go/compress/gzip/testdata/issue6550.gzbin65536 -> 65536 bytes
-rw-r--r--libgo/go/encoding/json/testdata/code.json.gzbin120432 -> 120432 bytes
5 files changed, 45 insertions, 5 deletions
diff --git a/libgo/configure b/libgo/configure
index 868adcd4881..9eac5c0e5c5 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -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_BUILD 1" >>confdefs.h
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_configure_args}"
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"
diff --git a/libgo/go/archive/zip/testdata/readme.notzip b/libgo/go/archive/zip/testdata/readme.notzip
index 06668c4c1c0..81737275c6e 100644
--- a/libgo/go/archive/zip/testdata/readme.notzip
+++ b/libgo/go/archive/zip/testdata/readme.notzip
Binary files differ
diff --git a/libgo/go/archive/zip/testdata/readme.zip b/libgo/go/archive/zip/testdata/readme.zip
index db3bb900e4e..5642a67e77d 100644
--- a/libgo/go/archive/zip/testdata/readme.zip
+++ b/libgo/go/archive/zip/testdata/readme.zip
Binary files differ
diff --git a/libgo/go/compress/gzip/testdata/issue6550.gz b/libgo/go/compress/gzip/testdata/issue6550.gz
index 57972b63668..82b4af10263 100644
--- a/libgo/go/compress/gzip/testdata/issue6550.gz
+++ b/libgo/go/compress/gzip/testdata/issue6550.gz
Binary files differ
diff --git a/libgo/go/encoding/json/testdata/code.json.gz b/libgo/go/encoding/json/testdata/code.json.gz
index 0e2895b53ac..1572a92bfbd 100644
--- a/libgo/go/encoding/json/testdata/code.json.gz
+++ b/libgo/go/encoding/json/testdata/code.json.gz
Binary files differ