Revert of untrusted.gypi: Remove support for old gcc newlib toolchain

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': {
     'variables': {
       # Enable -Werror by default, but put it in a variable so it can
       # be optionally disabled.
       'werror%': '-Werror',
       # 1 to use goma.
       'use_goma%': 0,
+      # Set to 1 to use nacl-clang rather than gcc newlib toolchain.
+      # This is designed to be set globally by GYP_DEFINES and currently
+      # only affects x86-32 and x86-64 newlib builds.
+      'use_nacl_clang%': 0,
     },
     'common_args': [
       'python',
       '<(DEPTH)/native_client/build/build_nexe.py',
       '--root', '<(DEPTH)',
       # Horrible hack: postfix the product-dir with a fake child.
       # Without this hack, MSVS will expand the PRODUCT_DIR variable to a path
       # with a trailing backslash, and that backslash will escape the rightmost
       # quote around the path causing serious problems parsing the resulting
       # command line. The fake child prevents an accidental escape while also
@@ skipping 25 matching lines @@
       '-Wall',
       '-fdiagnostics-show-option',
       '<(werror)',
     ],
     # The flag gomadir is one of the flag to enable goma on build_nexe.py.
     # It should be set only if use_goma is true.
     'conditions': [
       ['use_goma==0', {
         'gomadir%': '',
       }],
+      ['use_nacl_clang==1', {
+        'newlib_nlib_arg': 'newlib_nlib_clang',
+        'newlib_nexe_arg': 'newlib_nexe_clang',
+        'arm_compile_flags': '',
+      }, {
+        'newlib_nlib_arg': 'newlib_nlib',
+        'newlib_nexe_arg': 'newlib_nexe',
+        'arm_compile_flags': '-Wno-unused-local-typedefs -Wno-psabi',
+      }],
       ['OS=="android"', {
         'TOOLCHAIN_OS': 'linux',
       }, {
         'TOOLCHAIN_OS': '<(OS)',
       }],
     ],
   },
   'conditions': [
     ['target_arch=="ia32" or target_arch=="x64"', {
       # Common defaults for all x86 nacl-gcc targets
@@ skipping 165 matching lines @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
                     '<(DEPTH)/native_client/toolchain/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/nacl_x86_newlib.json',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    '<@(common_args)',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
-                   '--build', 'newlib_nexe_clang',
+                   '--build', '<(newlib_nexe_arg)',
                    '--name', '>(out_newlib64)',
                    '--objdir', '>(objdir_newlib64)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m64 ^(compile_flags) >(_compile_flags)',
                    '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-B>(tc_lib_dir_newlib64) -L>(tc_lib_dir_newlib64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                  ],
                },
@@ skipping 20 matching lines @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib64)',
                     '^(source_list_newlib64)',
                     '<(DEPTH)/native_client/toolchain/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/nacl_x86_newlib.json',
                  ],
                  'outputs': ['>(out_newlib64)'],
                  'action': [
                    '<@(common_args)',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
-                   '--build', 'newlib_nlib_clang',
+                   '--build', '<(newlib_nlib_arg)',
                    '--name', '>(out_newlib64)',
                    '--objdir', '>(objdir_newlib64)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m64 ^(compile_flags) >(_compile_flags)',
                    '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-B>(tc_lib_dir_newlib64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                  ],
                },
@@ skipping 107 matching lines @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
                     '<(DEPTH)/native_client/toolchain/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/nacl_x86_newlib.json',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    '<@(common_args)',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
-                   '--build', 'newlib_nexe_clang',
+                   '--build', '<(newlib_nexe_arg)',
                    '--name', '>(out_newlib32)',
                    '--objdir', '>(objdir_newlib32)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32 ^(compile_flags) >(_compile_flags)',
                    '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_newlib32) -L>(tc_lib_dir_newlib32) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib32)',
                  ],
                },
@@ skipping 20 matching lines @@
                     '>@(extra_deps)',
                     '>@(extra_deps_newlib32)',
                     '^(source_list_newlib32)',
                     '<(DEPTH)/native_client/toolchain/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib/nacl_x86_newlib.json',
                  ],
                  'outputs': ['>(out_newlib32)'],
                  'action': [
                    '<@(common_args)',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
-                   '--build', 'newlib_nlib_clang',
+                   '--build', '<(newlib_nlib_arg)',
                    '--name', '>(out_newlib32)',
                    '--objdir', '>(objdir_newlib32)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32  ^(compile_flags) >(_compile_flags)',
                    '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_newlib32) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib32)',
                  ],
                },
@@ skipping 221 matching lines @@
                 ],
                 'outputs': ['>(out_glibc_arm)'],
                 'action': [
                   '<@(common_args)',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'glibc_nexe',
                   '--name', '>(out_glibc_arm)',
                   '--objdir', '>(objdir_glibc_arm)',
                   '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
-                  '--compile_flags=^(compile_flags) >(_compile_flags)',
+                  '--compile_flags=<(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
                   '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_glibc_arm) -L>(tc_lib_dir_glibc_arm) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_glibc_arm)',
                 ],
               },
             ],
           }],
           # arm glibc static library action
           ['nlib_target!="" and build_glibc!=0 and disable_glibc==0', {
@@ skipping 19 matching lines @@
                 ],
                 'outputs': ['>(out_glibc_arm)'],
                 'action': [
                   '<@(common_args)',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'glibc_nlib',
                   '--name', '>(out_glibc_arm)',
                   '--objdir', '>(objdir_glibc_arm)',
                   '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
-                  '--compile_flags=^(compile_flags) >(_compile_flags)',
+                  '--compile_flags=<(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
                   '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_glibc_arm) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_glibc_arm)',
                 ],
               },
             ],
           }],
           # arm glibc shared library action
           ['nso_target!="" and build_glibc!=0 and disable_glibc==0', {
@@ skipping 19 matching lines @@
                  ],
                  'outputs': ['>(out_glibc_arm)'],
                  'action': [
                    '<@(common_args)',
                    '>@(extra_args)',
                    '--arch', 'arm',
                    '--build', 'glibc_nso',
                    '--name', '>(out_glibc_arm)',
                    '--objdir', '>(objdir_glibc_arm)',
                    '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
-                   '--compile_flags=-fPIC ^(compile_flags) >(_compile_flags)',
+                   '--compile_flags=-fPIC <(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
                    '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-B>(tc_lib_dir_glibc_arm) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_glibc_arm)',
                  ],
                },
              ],
            }],
           # arm newlib nexe action
           ['nexe_target!="" and build_newlib!=0 and disable_newlib==0', {
@@ skipping 16 matching lines @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
                    '<(DEPTH)/native_client/toolchain/<(TOOLCHAIN_OS)_x86/nacl_arm_newlib/nacl_arm_newlib.json',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   '<@(common_args)',
                   '>@(extra_args)',
                   '--arch', 'arm',
-                  '--build', 'newlib_nexe_clang',
+                  '--build', '<(newlib_nexe_arg)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
-                  '--compile_flags=^(compile_flags) >(_compile_flags)',
+                  '--compile_flags=<(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
                   '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_newlib_arm) -L>(tc_lib_dir_newlib_arm) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_arm)',
                 ],
               },
             ],
           }],
           # arm newlib library action
           ['nlib_target!="" and build_newlib!=0 and disable_newlib==0', {
@@ skipping 16 matching lines @@
                    '>@(extra_deps)',
                    '>@(extra_deps_newlib_arm)',
                    '^(source_list_newlib_arm)',
                    '<(DEPTH)/native_client/toolchain/<(TOOLCHAIN_OS)_x86/nacl_arm_newlib/nacl_arm_newlib.json',
                 ],
                 'outputs': ['>(out_newlib_arm)'],
                 'action': [
                   '<@(common_args)',
                   '>@(extra_args)',
                   '--arch', 'arm',
-                  '--build', 'newlib_nlib_clang',
+                  '--build', '<(newlib_nlib_arg)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
-                  '--compile_flags=^(compile_flags) >(_compile_flags)',
+                  '--compile_flags=<(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
                   '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_newlib_arm) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_arm)',
                 ],
               },
             ],
           }],
           # arm irt nexe action
           ['nexe_target!="" and build_irt!=0', {
@@ skipping 1077 matching lines @@
                 ],
               },
             ],
           }],
         ],
       }], # end MIPS
       # end pnacl actions for building ABI-biased native libraries
     ], # end conditions for pnacl biased nlib
   },
 }