projects / platform / framework / web / crosswalk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git] / src / native_client / build / untrusted.gypi
diff --git a/src/native_client/build/untrusted.gypi b/src/native_client/build/untrusted.gypi
index ca7c066..ff74c18 100755 (executable)
--- a/src/native_client/build/untrusted.gypi
+++ b/src/native_client/build/untrusted.gypi
@@ -62,8 +62,9 @@
           'enable_x86_64': 1,
           'enable_arm': 0,
           'enable_mips': 0,
-          'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc',
-          'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib',
+          'enable_x86_32_nonsfi': 0,
+          'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc',
+          'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib',
           'tc_lib_dir_newlib32': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32',
           'tc_lib_dir_newlib64': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64',
           'tc_lib_dir_glibc32': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
@@ -119,12 +120,13 @@
           'enable_x86_64': 0,
           'enable_arm': 1,
           'enable_mips': 0,
+          'enable_x86_32_nonsfi': 0,
           'extra_deps': [],
           'extra_deps_newlib_arm': [],
           'extra_deps_bionic_arm': [],
           'native_sources': [],
-          'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_nacl_arm/nacl_arm_glibc',
-          'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_nacl_arm/nacl_arm_newlib',
+          'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_arm_glibc',
+          'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_arm_newlib',
           'tc_lib_dir_bionic_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_bionic/libarm',
           'tc_lib_dir_newlib_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
           'tc_lib_dir_irt_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libarm',
@@ -171,11 +173,12 @@
           'enable_x86_64': 0,
           'enable_arm': 0,
           'enable_mips': 1,
+          'enable_x86_32_nonsfi': 0,
           'extra_deps': [],
           'extra_deps_newlib_mips': [],
           'native_sources': [],
-          'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_nacl_mips/nacl_mips_glibc',
-          'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_nacl_mips/nacl_mips_newlib',
+          'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_mips_glibc',
+          'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_mips_newlib',
           'tc_lib_dir_newlib_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libmips',
           'tc_lib_dir_irt_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libmips',
           'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include',
@@ -222,13 +225,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nexe',
@@ -266,13 +269,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nlib',
@@ -310,14 +313,14 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/stamp.prep',
                     '<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nexe_pnacl',
@@ -326,10 +329,10 @@
                    '--objdir', '>(objdir_newlib64)',
                    '--config-name', '<(CONFIGURATION_NAME)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
-                   '--compile_flags=--target=x86_64-nacl -stdlib=libstdc++ ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
+                   '--compile_flags=--target=x86_64-unknown-nacl -stdlib=libstdc++ ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
                    '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
-                   '--link_flags=--target=x86_64-nacl -stdlib=libstdc++ -arch x86-64 --pnacl-allow-translate --pnacl-allow-native -B>(tc_lib_dir_irt64) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)',
+                   '--link_flags=--target=x86_64-unknown-nacl -stdlib=libstdc++ -arch x86-64 --pnacl-allow-translate --pnacl-allow-native -B>(tc_lib_dir_irt64) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                    '--tls-edit=<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                    '--irt-layout',
@@ -358,13 +361,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nlib_pnacl',
@@ -373,10 +376,10 @@
                    '--objdir', '>(objdir_newlib64)',
                    '--config-name', '<(CONFIGURATION_NAME)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
-                   '--compile_flags=--target=x86_64-nacl -stdlib=libstdc++ ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
+                   '--compile_flags=--target=x86_64-unknown-nacl -stdlib=libstdc++ ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
                    '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
-                   '--link_flags=--target=x86_64-nacl -stdlib=libstdc++ -B>(tc_lib_dir_irt64) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)',
+                   '--link_flags=--target=x86_64-unknown-nacl -stdlib=libstdc++ -B>(tc_lib_dir_irt64) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                  ],
                },
@@ -403,13 +406,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nexe',
@@ -447,13 +450,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nlib',
@@ -491,14 +494,14 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/stamp.prep',
                     '<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nexe',
@@ -538,13 +541,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/stamp.prep',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nlib',
@@ -588,13 +591,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_arm_newlib/stamp.prep',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_arm_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nexe',
@@ -632,13 +635,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_arm_newlib/stamp.prep',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_arm_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nlib',
@@ -675,13 +678,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_bionic_arm)',
                    '^(source_list_bionic_arm)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_nacl_arm/nacl_arm_bionic',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86_nacl_arm/nacl_arm_bionic',
                 ],
                 'outputs': ['>(out_bionic_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'bionic_nlib',
@@ -719,14 +722,14 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_arm_newlib/stamp.prep',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_arm_newlib/stamp.prep',
                    '<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nexe',
@@ -766,13 +769,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_arm_newlib/stamp.prep',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_arm_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nlib',
@@ -799,7 +802,7 @@
           ['nexe_target!="" and build_newlib!=0', {
             'variables': {
                'tool_name': 'newlib',
-               'out_newlib_mips%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_mips.nexe',
+               'out_newlib_mips%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_mips32.nexe',
                'objdir_newlib_mips%': '>(INTERMEDIATE_DIR)/<(tool_name)-mips/>(_target_name)',
             },
             'actions': [
@@ -816,13 +819,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_mips)',
                    '^(source_list_newlib_mips)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nexe',
@@ -860,13 +863,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_mips)',
                    '^(source_list_newlib_mips)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nlib',
@@ -887,7 +890,7 @@
           ['nexe_target!="" and build_irt!=0', {
             'variables': {
                'tool_name': 'irt',
-               'out_newlib_mips%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_mips.nexe',
+               'out_newlib_mips%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_mips32.nexe',
                'objdir_newlib_mips%': '>(INTERMEDIATE_DIR)/<(tool_name)-mips/>(_target_name)',
             },
             'actions': [
@@ -904,14 +907,14 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_mips)',
                    '^(source_list_newlib_mips)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep',
                    '<(PRODUCT_DIR)/tls_edit<(EXECUTABLE_SUFFIX)',
                 ],
                 'outputs': ['>(out_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nexe',
@@ -951,13 +954,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_mips)',
                    '^(source_list_newlib_mips)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep',
                 ],
                 'outputs': ['>(out_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nlib',
@@ -1001,13 +1004,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc64)',
                     '^(source_list_glibc64)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'glibc_nexe',
@@ -1045,13 +1048,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc32)',
                     '^(source_list_glibc32)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'glibc_nexe',
@@ -1089,13 +1092,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc64)',
                     '^(source_list_glibc64)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'glibc_nlib',
@@ -1133,13 +1136,13 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc32)',
                     '^(source_list_glibc32)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'glibc_nlib',
@@ -1177,14 +1180,14 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc64)',
                     '^(source_list_glibc64)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '>@(extra_args)',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '--arch', 'x86-64',
                    '--build', 'glibc_nso',
                    '--root', '<(DEPTH)',
@@ -1221,14 +1224,14 @@
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc32)',
                     '^(source_list_glibc32)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/stamp.prep',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '>@(extra_args)',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '--arch', 'x86-32',
                    '--build', 'glibc_nso',
                    '--root', '<(DEPTH)',
@@ -1304,7 +1307,8 @@
            'out_pnacl_newlib_x86_32_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32.nexe',
            'out_pnacl_newlib_x86_64_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x64.nexe',
            'out_pnacl_newlib_arm_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_arm.nexe',
-           'out_pnacl_newlib_mips_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_mips.nexe',
+           'out_pnacl_newlib_mips_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_mips32.nexe',
+           'out_pnacl_newlib_x86_32_nonsfi_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32_nonsfi.nexe',
            'tool_name': 'pnacl_newlib',
            'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib',
            'out_pnacl_newlib%': '<(PRODUCT_DIR)/>(nexe_target)_newlib.pexe',
@@ -1328,13 +1332,13 @@
                '>@(extra_deps)',
                '>@(extra_deps_pnacl_newlib)',
                '^(source_list_pnacl_newlib)',
-               '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep',
+               '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep',
              ],
              'outputs': ['>(out_pnacl_newlib)'],
              'action': [
                'python',
                '<(DEPTH)/native_client/build/build_nexe.py',
-               '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+               '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                '>@(extra_args)',
                '--arch', 'pnacl',
                '--build', 'newlib_pexe',
@@ -1365,7 +1369,7 @@
                'action' : [
                  'python',
                  '<(DEPTH)/native_client/build/build_nexe.py',
-                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                  '--arch', 'x86-32',
                  '--build', 'newlib_translate',
                  '--root', '<(DEPTH)',
@@ -1375,6 +1379,31 @@
                ],
              }],
            }],
+           [ 'enable_x86_32_nonsfi!=0', {
+             'actions': [{
+               'action_name': 'translate newlib pexe to x86-32-nonsfi nexe',
+               'msvs_cygwin_shell': 0,
+               'description': 'translating >(out_pnacl_newlib_x86_32_nonsfi_nexe)',
+               'inputs': [
+                 # Having this in the input somehow causes devenv warnings
+                 # when building pnacl browser tests.
+                 # '<(DEPTH)/native_client/build/build_nexe.py',
+                 '>(out_pnacl_newlib)',
+               ],
+               'outputs': [ '>(out_pnacl_newlib_x86_32_nonsfi_nexe)' ],
+               'action' : [
+                 'python',
+                 '<(DEPTH)/native_client/build/build_nexe.py',
+                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
+                 '--arch', 'x86-32-nonsfi',
+                 '--build', 'newlib_translate',
+                 '--root', '<(DEPTH)',
+                 '--name', '>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
+                 '--link_flags=^(translate_flags) >(translate_flags) -Wl,-L>(tc_lib_dir_pnacl_translate)/lib-x86-32-nonsfi',
+                 '>(out_pnacl_newlib)',
+               ],
+             }],
+           }],
            [ 'enable_x86_64!=0', {
              'actions': [{
                'action_name': 'translate newlib pexe to x86-64 nexe',
@@ -1390,7 +1419,7 @@
                'action' : [
                  'python',
                  '<(DEPTH)/native_client/build/build_nexe.py',
-                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                  '--arch', 'x86-64',
                  '--build', 'newlib_translate',
                  '--root', '<(DEPTH)',
@@ -1415,7 +1444,7 @@
                'action' : [
                  'python',
                  '<(DEPTH)/native_client/build/build_nexe.py',
-                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                  '--arch', 'arm',
                  '--build', 'newlib_translate',
                  '--root', '<(DEPTH)',
@@ -1440,7 +1469,7 @@
                'action' : [
                  'python',
                  '<(DEPTH)/native_client/build/build_nexe.py',
-                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                 '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                  '--arch', 'mips',
                  '--build', 'newlib_translate',
                  '--root', '<(DEPTH)',
@@ -1474,13 +1503,13 @@
                '>@(extra_deps)',
                '>@(extra_deps_pnacl_newlib)',
                '^(source_list_pnacl_newlib)',
-               '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep',
+               '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep',
              ],
              'outputs': ['>(out_pnacl_newlib)'],
              'action': [
                'python',
                '<(DEPTH)/native_client/build/build_nexe.py',
-               '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+               '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                '>@(extra_args)',
                '--arch', 'pnacl',
                '--build', 'newlib_plib',
@@ -1523,13 +1552,13 @@
                   '>@(extra_deps)',
                   '>@(extra_deps_pnacl_newlib)',
                   '^(source_list_pnacl_newlib_arm)',
-                  '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep'
+                  '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep'
                 ],
                 'outputs': ['>(out_pnacl_newlib_arm)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nlib_pnacl',
@@ -1573,13 +1602,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_pnacl_newlib)',
                    '^(source_list_pnacl_newlib_x86_64)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep'
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep'
                  ],
                  'outputs': ['>(out_pnacl_newlib_x86_64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nlib_pnacl',
@@ -1618,13 +1647,13 @@
                    '>@(extra_deps)',
                    '>@(extra_deps_pnacl_newlib)',
                    '^(source_list_pnacl_newlib_x86_32)',
-                   '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep'
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep'
                  ],
                  'outputs': ['>(out_pnacl_newlib_x86_32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nlib_pnacl',
@@ -1641,6 +1670,55 @@
                },
              ],
            }], # end ia32
+          # Non-SFI mode for ia32.
+          ['enable_x86_32_nonsfi!=0 and disable_pnacl==0 and '
+           'pnacl_native_biased==1 and nlib_target!="" and '
+           'build_pnacl_newlib!=0', {
+             'variables': {
+               'tool_name': 'pnacl_newlib_x86_32',
+               # TODO(hidehiko): replace with (tc_lib_dir_pnacl_translate)/
+               # lib-x86-32-nonsfi/>(nlib_target) to be more consistent with
+               # similar configs.
+               'out_pnacl_newlib_x86_32_nonsfi%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib-x86-32-nonsfi/>(nlib_target)',
+               'objdir_pnacl_newlib_x86_32_nonsfi%': '>(INTERMEDIATE_DIR)/<(tool_name)-nonsfi/>(_target_name)',
+             },
+             'actions': [
+               {
+                 'action_name': 'build newlib x86-32-nonsfi nlib (via pnacl)',
+                 'variables': {
+                   'source_list_pnacl_newlib_x86_32_nonsfi%': '^|(<(tool_name).>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
+                 },
+                 'msvs_cygwin_shell': 0,
+                 'description': 'building >(out_pnacl_newlib_x86_32_nonsfi)',
+                 'inputs': [
+                   '<(DEPTH)/native_client/build/build_nexe.py',
+                   '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                   '>@(extra_deps)',
+                   '>@(extra_deps_pnacl_newlib)',
+                   '^(source_list_pnacl_newlib_x86_32_nonsfi)',
+                   '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep'
+                 ],
+                 'outputs': ['>(out_pnacl_newlib_x86_32_nonsfi)'],
+                 'action': [
+                   'python',
+                   '<(DEPTH)/native_client/build/build_nexe.py',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
+                   '>@(extra_args)',
+                   '--arch', 'x86-32-nonsfi',
+                   '--build', 'newlib_nlib_pnacl',
+                   '--root', '<(DEPTH)',
+                   '--name', '>(out_pnacl_newlib_x86_32_nonsfi)',
+                   '--objdir', '>(objdir_pnacl_newlib_x86_32_nonsfi)',
+                   '--include-dirs=>(tc_include_dir_pnacl_newlib) ^(include_dirs) >(_include_dirs)',
+                   '--compile_flags=--target=i686-unknown-nacl --pnacl-allow-native --pnacl-allow-translate -arch x86-32-nonsfi ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
+                   '--gomadir', '<(gomadir)',
+                   '--defines=^(defines) >(_defines)',
+                   '--link_flags=-B>(tc_lib_dir_pnacl_newlib) ^(link_flags) >(_link_flags)',
+                   '--source-list=^(source_list_pnacl_newlib_x86_32_nonsfi)',
+                 ],
+               },
+             ],
+           }], # end ia32 Non-SFI mode.
         ], # end ia32 or x64
       }],
       # MIPS
@@ -1667,13 +1745,13 @@
                   '>@(extra_deps)',
                   '>@(extra_deps_pnacl_newlib)',
                   '^(source_list_pnacl_newlib_mips)',
-                  '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/stamp.prep'
+                  '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/stamp.prep'
                 ],
                 'outputs': ['>(out_pnacl_newlib_mips)'],
                 'action': [
                   'python',
                   '<(DEPTH)/native_client/build/build_nexe.py',
-                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                  '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nlib_pnacl',
Domain: Web Framework / Uncategorized;