Reapply change 9663

build/untrusted.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # See native_client/Sconstruct for more details.
     # Expected address for beginning of data in for the IRT.
     'NACL_IRT_DATA_START': '0x3ef00000',
     # Expected address for beginning of code in for the IRT.
@@ skipping 43 matching lines @@
           }],
         ],
         'defines': [],
         'sources': [],
         'compile_flags': [],
         'link_flags': [],
         'include_dirs': [],
         'variables': {
           'nexe_target': '',
           'nlib_target': '',
+          'nso_target': '',
           'build_newlib': 0,
           'build_glibc': 0,
           'disable_glibc%': 0,
           'extra_args': [],
           'enable_x86_32': 1,
           'enable_x86_64': 1,
           'extra_deps_newlib64': [],
           'extra_deps_newlib32': [],
           'extra_deps_glibc64': [],
           'extra_deps_glibc32': [],
@@ skipping 35 matching lines @@
       'target_defaults': {
         'defines': [],
         'sources': [],
         'compile_flags': [],
         'link_flags': [],
         'include_dirs': [],
         'variables': {
           'python_exe': 'python',
           'nexe_target': '',
           'nlib_target': '',
+          'nso_target': '',
           'build_newlib': 0,
           'build_glibc': 0,
           'disable_glibc%': 1,
           'extra_args': [],
           'enable_arm': 1,
           'extra_deps_newlib_arm': [],
           'lib_dirs_newlib_arm': [],
           'include_dirs': ['<(DEPTH)'],
           'defines': [
             '<@(nacl_default_defines)',
@@ skipping 432 matching lines @@
                    '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
                    '--lib-dirs=>(lib_dirs_glibc32)',
                    '--compile_flags=-m32 ^(compile_flags) >(_compile_flags)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32 ^(link_flags) >(_link_flags)',
                    '--source-list=^|(<(source_list_glibc32) ^(_sources) ^(sources))',
                  ],
                },
              ],
            }],
+           ['nso_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
+             'variables': {
+                'tool_name': 'glibc',
+                'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc',
+                'objdir_glibc64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64-so/>(_target_name)',
+                'source_list_glibc64%': '<(tool_name)-x86-64-so.>(_target_name).source_list.gypcmd',
+                'out_glibc64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nso_target)',
+             },
+             'actions': [
+               {
+                 'action_name': 'build glibc x86-64 nso',
+                 'msvs_cygwin_shell': 0,
+                 'description': 'building >(out_glibc64)',
+                 'inputs': [
+                    '<(DEPTH)/native_client/build/build_nexe.py',
+                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>@(extra_deps_glibc64)',
+                    '>(source_list_glibc64)',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
+                 ],
+                 'outputs': ['>(out_glibc64)'],
+                 'action': [
+                   '>(python_exe)',
+                   '<(DEPTH)/native_client/build/build_nexe.py',
+                   '>@(extra_args)',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '--arch', 'x86-64',
+                   '--build', 'glibc_nso',
+                   '--root', '<(DEPTH)',
+                   '--name', '>(out_glibc64)',
+                   '--objdir', '>(objdir_glibc64)',
+                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
+                   '--lib-dirs=>(lib_dirs_glibc64) ',
+                   '--compile_flags=-m64 -fPIC ^(compile_flags) >(_compile_flags)',
+                   '--defines=^(defines) >(_defines)',
+                   '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64 ^(link_flags) >(_link_flags)',
+                   '--source-list=^|(<(source_list_glibc64) ^(_sources) ^(sources))',
+                 ],
+               },
+             ],
+           }],
+           ['nso_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
+             'variables': {
+                'tool_name': 'glibc',
+                'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc',
+                'out_glibc32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nso_target)',
+                'objdir_glibc32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32-so/>(_target_name)',
+                'source_list_glibc32%': '<(tool_name)-x86-32-so.>(_target_name).source_list.gypcmd',
+             },
+             'actions': [
+               {
+                 'action_name': 'build glibc x86-32 nso',
+                 'msvs_cygwin_shell': 0,
+                 'description': 'building >(out_glibc32)',
+                 'inputs': [
+                    '<(DEPTH)/native_client/build/build_nexe.py',
+                    '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+                    '>@(extra_deps_glibc32)',
+                    '>(source_list_glibc32)',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/stamp.untar',
+                 ],
+                 'outputs': ['>(out_glibc32)'],
+                 'action': [
+                   '>(python_exe)',
+                   '<(DEPTH)/native_client/build/build_nexe.py',
+                   '>@(extra_args)',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
+                   '--arch', 'x86-32',
+                   '--build', 'glibc_nso',
+                   '--root', '<(DEPTH)',
+                   '--name', '>(out_glibc32)',
+                   '--objdir', '>(objdir_glibc32)',
+                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
+                   '--lib-dirs=>(lib_dirs_glibc32)',
+                   '--compile_flags=-m32 -fPIC ^(compile_flags) >(_compile_flags)',
+                   '--defines=^(defines) >(_defines)',
+                   '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32 ^(link_flags) >(_link_flags)',
+                   '--source-list=^|(<(source_list_glibc32) ^(_sources) ^(sources))',
+                 ],
+               },
+             ],
+           }],
         ],
       },
     }],
   ],
 }