mirror of
https://github.com/joel16/android_kernel_sony_msm8994.git
synced 2024-11-26 21:51:03 +00:00
Revert "scripts: gcc-wrapper: Use wrapper to check compiler warnings"
gcc-wrapper simulates building with -Werror, but with a few hardcoded
file:line combinations that don't get promoted to errors.
We're already building with -Werror anyway without issue, so this script
is redundant and just adds a dependency on Python 2.
This reverts commit d214aec9
.
Change-Id: Id4a75ff16fb75e7d621c532a37ddcbe0efa01040
Signed-off-by: Greg Hackmann <ghackmann@google.com>
This commit is contained in:
parent
711e379d6b
commit
5b827a6bc6
6
Makefile
6
Makefile
@ -326,7 +326,7 @@ include $(srctree)/scripts/Kbuild.include
|
||||
|
||||
AS = $(CROSS_COMPILE)as
|
||||
LD = $(CROSS_COMPILE)ld
|
||||
REAL_CC = $(CROSS_COMPILE)gcc
|
||||
CC = $(CROSS_COMPILE)gcc
|
||||
CPP = $(CC) -E
|
||||
AR = $(CROSS_COMPILE)ar
|
||||
NM = $(CROSS_COMPILE)nm
|
||||
@ -340,10 +340,6 @@ DEPMOD = /sbin/depmod
|
||||
PERL = perl
|
||||
CHECK = sparse
|
||||
|
||||
# Use the wrapper for the compiler. This wrapper scans for new
|
||||
# warnings and causes the build to stop upon encountering them.
|
||||
CC = $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)
|
||||
|
||||
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
|
||||
-Wbitwise -Wno-return-void $(CF)
|
||||
CFLAGS_MODULE =
|
||||
|
@ -1,103 +0,0 @@
|
||||
#! /usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Copyright (c) 2011-2012, The Linux Foundation. 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 with the distribution.
|
||||
# * Neither the name of The Linux Foundation nor
|
||||
# the names of its contributors may be used to endorse or promote
|
||||
# products derived from this software without specific prior written
|
||||
# permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
# Invoke gcc, looking for warnings, and causing a failure if there are
|
||||
# non-whitelisted warnings.
|
||||
|
||||
import errno
|
||||
import re
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
|
||||
# Note that gcc uses unicode, which may depend on the locale. TODO:
|
||||
# force LANG to be set to en_US.UTF-8 to get consistent warnings.
|
||||
|
||||
allowed_warnings = set([
|
||||
"return_address.c:63",
|
||||
"kprobes.c:1493",
|
||||
"rcutree.c:1614",
|
||||
"af_unix.c:893",
|
||||
"nl80211.c:58",
|
||||
"jhash.h:137",
|
||||
"cmpxchg.h:201",
|
||||
"ping.c:87",
|
||||
])
|
||||
|
||||
# Capture the name of the object file, can find it.
|
||||
ofile = None
|
||||
|
||||
warning_re = re.compile(r'''(.*/|)([^/]+\.[a-z]+:\d+):(\d+:)? warning:''')
|
||||
def interpret_warning(line):
|
||||
"""Decode the message from gcc. The messages we care about have a filename, and a warning"""
|
||||
line = line.rstrip('\n')
|
||||
m = warning_re.match(line)
|
||||
if m and m.group(2) not in allowed_warnings:
|
||||
print "error, forbidden warning:", m.group(2)
|
||||
|
||||
# If there is a warning, remove any object if it exists.
|
||||
if ofile:
|
||||
try:
|
||||
os.remove(ofile)
|
||||
except OSError:
|
||||
pass
|
||||
sys.exit(1)
|
||||
|
||||
def run_gcc():
|
||||
args = sys.argv[1:]
|
||||
# Look for -o
|
||||
try:
|
||||
i = args.index('-o')
|
||||
global ofile
|
||||
ofile = args[i+1]
|
||||
except (ValueError, IndexError):
|
||||
pass
|
||||
|
||||
compiler = sys.argv[0]
|
||||
|
||||
try:
|
||||
proc = subprocess.Popen(args, stderr=subprocess.PIPE)
|
||||
for line in proc.stderr:
|
||||
print line,
|
||||
interpret_warning(line)
|
||||
|
||||
result = proc.wait()
|
||||
except OSError as e:
|
||||
result = e.errno
|
||||
if result == errno.ENOENT:
|
||||
print args[0] + ':',e.strerror
|
||||
print 'Is your PATH set correctly?'
|
||||
else:
|
||||
print ' '.join(args), str(e)
|
||||
|
||||
return result
|
||||
|
||||
if __name__ == '__main__':
|
||||
status = run_gcc()
|
||||
sys.exit(status)
|
Loading…
Reference in New Issue
Block a user