diff options
Diffstat (limited to 'autoconf')
| -rwxr-xr-x | autoconf/config.sub | 15 | ||||
| -rw-r--r-- | autoconf/configure.ac | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/autoconf/config.sub b/autoconf/config.sub index a8d85281f9..0e013633dd 100755 --- a/autoconf/config.sub +++ b/autoconf/config.sub @@ -239,6 +239,10 @@ case $os in basic_machine=m68k-atari os=-mint ;; + -nacl*) + basic_machine=i686-pc + os=-nacl + ;; esac # Decode aliases for certain CPU-COMPANY combinations. @@ -348,6 +352,14 @@ case $basic_machine in i*86 | x86_64) basic_machine=$basic_machine-pc ;; + nacl64*) + basic_machine=x86_64-pc + os=-nacl + ;; + nacl*) + basic_machine=i686-pc + os=-nacl + ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -1366,6 +1378,9 @@ case $os in ;; esac ;; + -nacl*) + os=-nacl + ;; -nto-qnx*) ;; -nto*) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index a5caac971b..cd0a981c6f 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -297,6 +297,11 @@ AC_CACHE_CHECK([type of operating system we're going to host on], llvm_cv_no_link_all_option="-Wl,--no-whole-archive" llvm_cv_os_type="Freestanding" llvm_cv_platform_type="Unix" ;; + *-*-nacl*) + llvm_cv_link_all_option="-Wl,--whole-archive" + llvm_cv_no_link_all_option="-Wl,--no-whole-archive" + llvm_cv_os_type="Freestanding" + llvm_cv_platform_type="Unix" ;; *) llvm_cv_link_all_option="" llvm_cv_no_link_all_option="" |