diff options
| author | taesub.kim <taesub.kim@samsung.com> | 2015-11-16 17:28:24 +0900 |
|---|---|---|
| committer | taesub.kim <taesub.kim@samsung.com> | 2015-11-16 17:28:36 +0900 |
| commit | ff9f0eb35d80c251e9a54162eae18f44349ae59d (patch) | |
| tree | 10a20bd420864ba529d87794b27ebf303ae7c86a /m4 | |
| parent | d69d98bb1e0435e6d0a6358677725bd663f598c0 (diff) | |
| download | curl-ff9f0eb35d80c251e9a54162eae18f44349ae59d.tar.gz curl-ff9f0eb35d80c251e9a54162eae18f44349ae59d.tar.bz2 curl-ff9f0eb35d80c251e9a54162eae18f44349ae59d.zip | |
Imported Upstream version 7.40.0
Change-Id: I744943f451cb7db8f796a53f10dd6f57c297287d
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/curl-compilers.m4 | 6 | ||||
| -rw-r--r-- | m4/curl-functions.m4 | 2 | ||||
| -rw-r--r-- | m4/libtool.m4 | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index 2467128eb..f1a634bff 100644 --- a/m4/curl-compilers.m4 +++ b/m4/curl-compilers.m4 @@ -615,12 +615,12 @@ AC_DEFUN([CURL_SET_COMPILER_BASIC_OPTS], [ dnl #147: declaration is incompatible with 'previous one' dnl #165: too few arguments in function call dnl #266: function declared implicitly - tmp_CPPFLAGS="$tmp_CPPFLAGS -we 140,147,165,266" + tmp_CPPFLAGS="$tmp_CPPFLAGS -we140,147,165,266" dnl Disable some remarks dnl #279: controlling expression is constant dnl #981: operands are evaluated in unspecified order dnl #1469: "cc" clobber ignored - tmp_CPPFLAGS="$tmp_CPPFLAGS -wd 279,981,1469" + tmp_CPPFLAGS="$tmp_CPPFLAGS -wd279,981,1469" ;; # INTEL_WINDOWS_C) @@ -1479,7 +1479,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_PROTOTYPE_MISMATCH], [ return n; } ]],[[ - int i[2]; + int i[2]={0,0}; int j = rand(i[0]); if(j) return j; diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index fdf004b8e..0d6542121 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -4729,7 +4729,7 @@ AC_DEFUN([CURL_CHECK_FUNC_POLL], [ tst_allow_poll="unknown" # case $host_os in - darwin*|interix*) + darwin[[123456789]].*|darwin10.*|darwin11.*|darwin12.*|interix*) dnl poll() does not work on these platforms dnl Interix: "does provide poll(), but the implementing developer must dnl have been in a bad mood, because poll() only works on the /proc diff --git a/m4/libtool.m4 b/m4/libtool.m4 index a849b9db2..2930a7d9f 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) |