Revert r124240.

libjpeg.gyp

 # Copyright (c) 2012 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': {
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
     'conditions': [
       [ 'chromeos == 1 or (os_posix == 1 and \
         OS != "mac" and OS != "linux" and OS != "android")', {
@@ skipping 175 matching lines @@
             # <http://www.tortall.net/projects/yasm/ticket/236>.
             [ 'OS=="win"', {
               'variables': {
                 'yasm_path': '../yasm/binaries/win/yasm<(EXECUTABLE_SUFFIX)',
                 'yasm_format': '-fwin32',
                 'yasm_flags': [
                   '-DWIN32',
                   '-DMSVC',
                   '-Iwin/'
                 ],
-                'yasm_output_filter': [],
               },
             }],
             [ 'OS=="mac"', {
               'dependencies': [
                 '../yasm/yasm.gyp:yasm#host',
               ],
               'variables': {
                 'yasm_path': '<(PRODUCT_DIR)/yasm',
                 'yasm_format': '-fmacho',
                 'yasm_flags': [
                   '-DMACHO',
                   '-Imac/'
                 ],
-                # On Mac, jsimdext.inc contains a "SECTION SEG_CONST". This file
-                # is included by all .asm file, and most files contain another
-                # "SECTION SEG_CONST". SEG_CONST is ".rodata align=16" on mac,
-                # which leads to
-                # "warning: section flags ignored on section redeclaration"
-                # warnings on all .asm files. This script filters out this
-                # warning.
-                'yasm_output_filter': ['./yasm-filter.sh'],
               },
             }],
             [ 'OS=="linux"', {
               'conditions': [
                 [ 'use_system_yasm==0', {
                   'dependencies': [
                     '../yasm/yasm.gyp:yasm#host',
                   ],
                 }],
               ],
               'variables': {
                 'conditions': [
                   [ 'use_system_yasm==1', {
                     'yasm_path': '<!(which yasm)',
                   }, {
                     'yasm_path': '<(PRODUCT_DIR)/yasm',
                   }],
                   [ 'target_arch=="ia32"', {
                     'yasm_format': '-felf',
                     'yasm_flag': '-D__X86__',
                     'yasm_flags': [
                       '-D__x86__',
                       '-DELF',
                       '-Ilinux/'
                     ],
-                    'yasm_output_filter': [],
                   }, {
                     'yasm_format': '-felf64',
                     'yasm_flag': '-D__x86_64__',
                     'yasm_flags': [
                       '-D__x86_64__',
                       '-DELF',
                       '-Ilinux/'
                     ],
-                    'yasm_output_filter': [],
                   }],
                 ],
               },
             }],
           ],
           'rules': [
             {
               'rule_name': 'assemble',
               'extension': 'asm',
               'conditions': [
                 [ 'target_arch!="arm"', {
                   'inputs': [ '<(yasm_path)', ],
                   'outputs': [
                     '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)',
                   ],
                   'action': [
-                    '<@(yasm_output_filter)',
                     '<(yasm_path)',
                     '<(yasm_format)',
                     '<@(yasm_flags)',
                     '-DRGBX_FILLER_0XFF',
                     '-DSTRICT_MEMORY_ACCESS',
                     '-Isimd/',
                     '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)',
                     '<(RULE_INPUT_PATH)',
                   ],
                   'process_outputs_as_sources': 1,
@@ skipping 23 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: