diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-07-09 10:52:46 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-07-09 11:00:37 -0700 |
| commit | 5dbcc7e0c9c12f4a4042fb4a226654aee927999c (patch) | |
| tree | b316a3370e9286cb4e6f81b2f9d8bd8b54ce5123 /projects | |
| parent | 86dc97be9ac3b4804528e087b04b4f4192cdee54 (diff) | |
LOCALMODs from hg 0b098ca44de7 against r158408 (hg 90a87d6bfe45)
(only non-new files; new files in git 4f429c8b)
Change-Id: Ia39f818088485bd90e4d048db404f8d6ba5f836b
Diffstat (limited to 'projects')
| -rwxr-xr-x | projects/sample/autoconf/config.sub | 8 | ||||
| -rwxr-xr-x | projects/sample/configure | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/projects/sample/autoconf/config.sub b/projects/sample/autoconf/config.sub index 9942491533..8f5793aef3 100755 --- a/projects/sample/autoconf/config.sub +++ b/projects/sample/autoconf/config.sub @@ -132,6 +132,10 @@ case $maybe_os in os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + nacl) + os=-nacl + basic_machine=pnacl-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -347,6 +351,8 @@ case $basic_machine in i*86 | x86_64) basic_machine=$basic_machine-pc ;; + pnacl-*) + ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -1364,6 +1370,8 @@ case $os in ;; esac ;; + -nacl) + ;; -nto-qnx*) ;; -nto*) diff --git a/projects/sample/configure b/projects/sample/configure index d92588815a..cb1bb0b2bb 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -3686,6 +3686,11 @@ else llvm_cv_no_link_all_option="-Wl,--no-whole-archive" llvm_cv_os_type="GNU" 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="NativeClient" + llvm_cv_platform_type="Unix" ;; *-*-solaris*) llvm_cv_link_all_option="-Wl,-z,allextract" llvm_cv_no_link_all_option="-Wl,-z,defaultextract" |