Revert "Make GYP build usable for day-to-day work"

tools/gyp/v8.gyp

 # Copyright 2011 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 43 matching lines @@
     # well when compiling for the ARM target.
     'v8_use_arm_eabi_hardfloat%': 'false',
 
     'v8_use_snapshot%': 'true',
     'host_os%': '<(OS)',
     'v8_use_liveobjectlist%': 'false',
   },
   'conditions': [
     ['use_system_v8==0', {
       'target_defaults': {
+        'defines': [
+          'ENABLE_DEBUGGER_SUPPORT',
+        ],
         'conditions': [
           ['OS!="mac"', {
             # TODO(mark): The OS!="mac" conditional is temporary. It can be
             # removed once the Mac Chromium build stops setting target_arch to
             # ia32 and instead sets it to mac. Other checks in this file for
             # OS=="mac" can be removed at that time as well. This can be cleaned
             # up once http://crbug.com/44205 is fixed.
             'conditions': [
               ['v8_target_arch=="arm"', {
                 'defines': [
@@ skipping 13 matching lines @@
                   [ 'v8_can_use_vfp_instructions=="true"', {
                     'defines': [
                       'CAN_USE_VFP_INSTRUCTIONS',
                     ],
                   }],
                   [ 'v8_use_arm_eabi_hardfloat=="true"', {
                     'defines': [
                       'USE_EABI_HARDFLOAT=1',
                       'CAN_USE_VFP_INSTRUCTIONS',
                     ],
-                    'cflags': [
-                      '-mfloat-abi=hard',
-                    ],
-                  }, {
-                    'defines': [
-                      'USE_EABI_HARDFLOAT=0',
-                    ],
-                  }],
-                  # The ARM assembler assumes the host is 32 bits,
-                  # so force building 32-bit host tools.
-                  [ 'host_arch=="x64"', {
-                    'cflags': ['-m32'],
-                    'ldflags': ['-m32'],
                   }],
                 ],
               }],
               ['v8_target_arch=="ia32"', {
                 'defines': [
                   'V8_TARGET_ARCH_IA32',
                 ],
               }],
               ['v8_target_arch=="x64"', {
                 'defines': [
@@ skipping 38 matching lines @@
                 ],
               },
               'VCLinkerTool': {
                 'LinkIncremental': '2',
               },
             },
             'conditions': [
              ['OS=="freebsd" or OS=="openbsd"', {
                'cflags': [ '-I/usr/local/include' ],
              }],
-             ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-               'cflags': [ '-Wall', '-Werror', '-W', '-Wno-unused-parameter',
-                           '-Wnon-virtual-dtor' ],
-             }],
            ],
           },
           'Release': {
             'conditions': [
               ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
                 'cflags!': [
                   '-O2',
                   '-Os',
                 ],
+                'cflags': [
+                  '-fomit-frame-pointer',
+                  '-O3',
+                ],
                 'conditions': [
                   [ 'gcc_version==44', {
                     'cflags': [
                       # Avoid crashes with gcc 4.4 in the v8 test suite.
                       '-fno-tree-vrp',
                     ],
                   }],
                 ],
               }],
              ['OS=="freebsd" or OS=="openbsd"', {
@@ skipping 41 matching lines @@
                   },
                 },
               }],
             ],
           },
         },
       },
       'targets': [
         {
           'target_name': 'v8',
+          'toolsets': ['host', 'target'],
           'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host', 'target'],
-            }, {
-              'toolsets': ['target'],
-            }],
             ['v8_use_snapshot=="true"', {
               'dependencies': ['v8_snapshot'],
             },
             {
               'dependencies': ['v8_nosnapshot'],
             }],
             ['component=="shared_library"', {
               'type': '<(component)',
               'sources': [
                 # Note: on non-Windows we still build this file so that gyp
@@ skipping 19 matching lines @@
                       'V8_SHARED',
                     ],
                   },
                 }],
               ],
             },
             {
               'type': 'none',
             }],
           ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+               '../../include',
+            ],
+          },
         },
         {
           'target_name': 'v8_snapshot',
           'type': '<(library)',
+          'toolsets': ['host', 'target'],
           'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host', 'target'],
-              'dependencies': ['mksnapshot#host', 'js2c#host'],
-            }, {
-              'toolsets': ['target'],
-              'dependencies': ['mksnapshot', 'js2c'],
-            }],
             ['component=="shared_library"', {
               'conditions': [
+                # The ARM assembler assumes the host is 32 bits, so force building
+                # 32-bit host tools.
+                ['v8_target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
+                  'cflags': ['-m32'],
+                  'ldflags': ['-m32'],
+                }],
                 ['OS=="win"', {
                   'defines': [
                     'BUILDING_V8_SHARED',
                   ],
                   'direct_dependent_settings': {
                     'defines': [
                       'USING_V8_SHARED',
                     ],
                   },
                 }, {
                   'defines': [
                     'V8_SHARED',
                   ],
                   'direct_dependent_settings': {
                     'defines': [
                       'V8_SHARED',
                     ],
                   },
                 }],
               ],
             }],
           ],
           'dependencies': [
+            'mksnapshot#host',
+            'js2c#host',
             'v8_base',
           ],
           'include_dirs+': [
             '../../src',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
             '<(INTERMEDIATE_DIR)/snapshot.cc',
           ],
@@ skipping 46 matching lines @@
                 '<@(_inputs)',
                 '<@(mksnapshot_flags)',
                 '<@(_outputs)'
               ],
             },
           ],
         },
         {
           'target_name': 'v8_nosnapshot',
           'type': '<(library)',
+          'toolsets': ['host', 'target'],
           'dependencies': [
+            'js2c#host',
             'v8_base',
           ],
           'include_dirs+': [
             '../../src',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
             '../../src/snapshot-empty.cc',
           ],
           'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host', 'target'],
-              'dependencies': ['js2c#host'],
-            }, {
-              'toolsets': ['target'],
-              'dependencies': ['js2c'],
+            # The ARM assembler assumes the host is 32 bits, so force building
+            # 32-bit host tools.
+            ['v8_target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
+              'cflags': ['-m32'],
+              'ldflags': ['-m32'],
             }],
             ['component=="shared_library"', {
               'defines': [
                 'BUILDING_V8_SHARED',
                 'V8_SHARED',
               ],
             }],
           ]
         },
         {
           'target_name': 'v8_base',
           'type': '<(library)',
+          'toolsets': ['host', 'target'],
           'include_dirs+': [
             '../../src',
           ],
           'sources': [
             '../../src/accessors.cc',
             '../../src/accessors.h',
             '../../src/allocation.cc',
             '../../src/allocation.h',
             '../../src/api.cc',
             '../../src/api.h',
@@ skipping 234 matching lines @@
             '../../src/vm-state.h',
             '../../src/zone-inl.h',
             '../../src/zone.cc',
             '../../src/zone.h',
             '../../src/extensions/externalize-string-extension.cc',
             '../../src/extensions/externalize-string-extension.h',
             '../../src/extensions/gc-extension.cc',
             '../../src/extensions/gc-extension.h',
           ],
           'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host', 'target'],
-            }, {
-              'toolsets': ['target'],
-            }],
             ['v8_target_arch=="arm"', {
+              'include_dirs+': [
+                '../../src/arm',
+              ],
               'sources': [
                 '../../src/arm/assembler-arm-inl.h',
                 '../../src/arm/assembler-arm.cc',
                 '../../src/arm/assembler-arm.h',
                 '../../src/arm/builtins-arm.cc',
                 '../../src/arm/code-stubs-arm.cc',
                 '../../src/arm/code-stubs-arm.h',
                 '../../src/arm/codegen-arm.cc',
                 '../../src/arm/codegen-arm.h',
                 '../../src/arm/constants-arm.h',
@@ skipping 12 matching lines @@
                 '../../src/arm/lithium-codegen-arm.h',
                 '../../src/arm/lithium-gap-resolver-arm.cc',
                 '../../src/arm/lithium-gap-resolver-arm.h',
                 '../../src/arm/macro-assembler-arm.cc',
                 '../../src/arm/macro-assembler-arm.h',
                 '../../src/arm/regexp-macro-assembler-arm.cc',
                 '../../src/arm/regexp-macro-assembler-arm.h',
                 '../../src/arm/simulator-arm.cc',
                 '../../src/arm/stub-cache-arm.cc',
               ],
+              'conditions': [
+                # The ARM assembler assumes the host is 32 bits,
+                # so force building 32-bit host tools.
+                ['host_arch=="x64" and _toolset=="host"', {
+                  'cflags': ['-m32'],
+                  'ldflags': ['-m32'],
+                }]
+              ]
             }],
             ['v8_target_arch=="ia32" or v8_target_arch=="mac" or OS=="mac"', {
+              'include_dirs+': [
+                '../../src/ia32',
+              ],
               'sources': [
                 '../../src/ia32/assembler-ia32-inl.h',
                 '../../src/ia32/assembler-ia32.cc',
                 '../../src/ia32/assembler-ia32.h',
                 '../../src/ia32/builtins-ia32.cc',
                 '../../src/ia32/code-stubs-ia32.cc',
                 '../../src/ia32/code-stubs-ia32.h',
                 '../../src/ia32/codegen-ia32.cc',
                 '../../src/ia32/codegen-ia32.h',
                 '../../src/ia32/cpu-ia32.cc',
@@ skipping 11 matching lines @@
                 '../../src/ia32/lithium-ia32.cc',
                 '../../src/ia32/lithium-ia32.h',
                 '../../src/ia32/macro-assembler-ia32.cc',
                 '../../src/ia32/macro-assembler-ia32.h',
                 '../../src/ia32/regexp-macro-assembler-ia32.cc',
                 '../../src/ia32/regexp-macro-assembler-ia32.h',
                 '../../src/ia32/stub-cache-ia32.cc',
               ],
             }],
             ['v8_target_arch=="x64" or v8_target_arch=="mac" or OS=="mac"', {
+              'include_dirs+': [
+                '../../src/x64',
+              ],
               'sources': [
                 '../../src/x64/assembler-x64-inl.h',
                 '../../src/x64/assembler-x64.cc',
                 '../../src/x64/assembler-x64.h',
                 '../../src/x64/builtins-x64.cc',
                 '../../src/x64/code-stubs-x64.cc',
                 '../../src/x64/code-stubs-x64.h',
                 '../../src/x64/codegen-x64.cc',
                 '../../src/x64/codegen-x64.h',
                 '../../src/x64/cpu-x64.cc',
@@ skipping 12 matching lines @@
                 '../../src/x64/lithium-x64.h',
                 '../../src/x64/macro-assembler-x64.cc',
                 '../../src/x64/macro-assembler-x64.h',
                 '../../src/x64/regexp-macro-assembler-x64.cc',
                 '../../src/x64/regexp-macro-assembler-x64.h',
                 '../../src/x64/stub-cache-x64.cc',
               ],
             }],
             ['OS=="linux"', {
                 'link_settings': {
+                  'libraries': [
+                    # Needed for clock_gettime() used by src/platform-linux.cc.
+                    '-lrt',
+                  ],
                   'conditions': [
                     ['v8_compress_startup_data=="bz2"', {
                       'libraries': [
                         '-lbz2',
                     ]}],
                   ],
                 },
                 'sources': [
                   '../../src/platform-linux.cc',
                   '../../src/platform-posix.cc'
@@ skipping 65 matching lines @@
               'defines': [
                 'BUILDING_V8_SHARED',
                 'V8_SHARED',
               ],
             }],
           ],
         },
         {
           'target_name': 'js2c',
           'type': 'none',
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host'],
-            }, {
-              'toolsets': ['target'],
-            }],
-          ],
+          'toolsets': ['host'],
           'variables': {
             'library_files': [
               '../../src/runtime.js',
               '../../src/v8natives.js',
               '../../src/array.js',
               '../../src/string.js',
               '../../src/uri.js',
               '../../src/math.js',
               '../../src/messages.js',
               '../../src/apinatives.js',
@@ skipping 45 matching lines @@
                 'EXPERIMENTAL',
                 '<(v8_compress_startup_data)',
                 '<@(experimental_library_files)'
               ],
             },
           ],
         },
         {
           'target_name': 'mksnapshot',
           'type': 'executable',
+          'toolsets': ['host'],
           'dependencies': [
             'v8_nosnapshot',
           ],
           'include_dirs+': [
             '../../src',
           ],
           'sources': [
             '../../src/mksnapshot.cc',
           ],
           'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host'],
-            }, {
-              'toolsets': ['target'],
+            # The ARM assembler assumes the host is 32 bits, so force building
+            # 32-bit host tools.
+            ['v8_target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
+              'cflags': ['-m32'],
+              'ldflags': ['-m32'],
             }],
             ['v8_compress_startup_data=="bz2"', {
               'libraries': [
                 '-lbz2',
               ]}],
           ]
         },
         {
           'target_name': 'v8_shell',
           'type': 'executable',
+          'toolsets': ['host'],
           'dependencies': [
             'v8'
           ],
           'sources': [
             '../../samples/shell.cc',
           ],
           'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host'],
-            }, {
-              'toolsets': ['target'],
-            }],
             ['OS=="win"', {
               # This could be gotten by not setting chromium_code, if that's OK.
               'defines': ['_CRT_SECURE_NO_WARNINGS'],
             }],
+            # The ARM assembler assumes the host is 32 bits, so force building
+            # 32-bit host tools.
+            ['v8_target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
+              'cflags': ['-m32'],
+              'ldflags': ['-m32'],
+            }],
             ['v8_compress_startup_data=="bz2"', {
               'libraries': [
                 '-lbz2',
               ]}],
           ],
         },
-        {
-          'target_name': 'preparser_lib',
-          'type': '<(library)',
-          'include_dirs+': [
-            '../../src',
-          ],
-          'sources': [
-            '../../src/allocation.cc',
-            '../../src/bignum.cc',
-            '../../src/cached-powers.cc',
-            '../../src/conversions.cc',
-            '../../src/hashmap.cc',
-            '../../src/preparse-data.cc',
-            '../../src/preparser.cc',
-            '../../src/preparser-api.cc',
-            '../../src/scanner-base.cc',
-            '../../src/strtod.cc',
-            '../../src/token.cc',
-            '../../src/unicode.cc',
-            '../../src/utils.cc',
-          ],
-        },
       ],
     }, { # use_system_v8 != 0
       'targets': [
         {
           'target_name': 'v8',
           'type': 'settings',
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host', 'target'],
-            }, {
-              'toolsets': ['target'],
-            }],
-
-          ],
+          'toolsets': ['host', 'target'],
           'link_settings': {
             'libraries': [
               '-lv8',
             ],
           },
         },
         {
           'target_name': 'v8_shell',
           'type': 'none',
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['host'],
-            }, {
-              'toolsets': ['target'],
-            }],
-          ],
+          'toolsets': ['host'],
           'dependencies': [
             'v8'
           ],
         },
       ],
     }],
   ],
 }