Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 043af786 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Bharath
Browse files

scripts: Remove gcc-wrapper.py 



This adds an unnecessary dependency on Python when regular -Werror will do fine.

Issue: FP3-A11#330
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarkhusika <khusikadhamar@gmail.com>
Change-Id: I81f0e52e7270923f7e3d30a79ec9e9205d47ae0b
parent 41090fbb

AndroidKernel.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -70,9 +70,9 @@ KERNEL_GCC_NOANDROID_CHK := $(shell (echo "int main() {return 0;}" | $(KERNEL_CR 
real_cc :=

real_cc :=

ifeq ($(KERNEL_LLVM_SUPPORT),true)

ifeq ($(KERNEL_LLVM_SUPPORT),true)

  ifeq ($(KERNEL_ARCH), arm64)

  ifeq ($(KERNEL_ARCH), arm64)

    real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu-

    real_cc := CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu-

  else

  else

    real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=arm-linux-gnueabihf

    real_cc := CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=arm-linux-gnueabihf

  endif

  endif

else

else

ifeq ($(strip $(KERNEL_GCC_NOANDROID_CHK)),0)

ifeq ($(strip $(KERNEL_GCC_NOANDROID_CHK)),0)

Makefile

+1 −5
Original line number Original line Diff line number Diff line
@@ -344,7 +344,7 @@ include scripts/Kbuild.include 
# Make variables (CC, etc...)

# Make variables (CC, etc...)

AS		= $(CROSS_COMPILE)as

AS		= $(CROSS_COMPILE)as

LD		= $(CROSS_COMPILE)ld

LD		= $(CROSS_COMPILE)ld

REAL_CC		= $(CROSS_COMPILE)gcc

CC		= $(CROSS_COMPILE)gcc

LDGOLD		= $(CROSS_COMPILE)ld.gold

LDGOLD		= $(CROSS_COMPILE)ld.gold

CPP		= $(CC) -E

CPP		= $(CC) -E

AR		= $(CROSS_COMPILE)ar

AR		= $(CROSS_COMPILE)ar
@@ -360,10 +360,6 @@ PERL = perl 
PYTHON		= python

PYTHON		= python

CHECK		= sparse

CHECK		= sparse





# Use the wrapper for the compiler.  This wrapper scans for new

# warnings and causes the build to stop upon encountering them

CC		= $(PYTHON) $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void $(CF)

		  -Wbitwise -Wno-return-void $(CF)

NOSTDINC_FLAGS  =

NOSTDINC_FLAGS  =

scripts/gcc-wrapper.py

deleted100755 → 0
+0 −95
Original line number Original line Diff line number Diff line 
#! /usr/bin/env python2

# -*- coding: utf-8 -*-



# Copyright (c) 2011-2017, 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([

 ])



# 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 >> sys.stderr, "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 >> sys.stderr, line,

            interpret_warning(line)



        result = proc.wait()

    except OSError as e:

        result = e.errno

        if result == errno.ENOENT:

            print >> sys.stderr, args[0] + ':',e.strerror

            print >> sys.stderr, 'Is your PATH set correctly?'

        else:

            print >> sys.stderr, ' '.join(args), str(e)



    return result



if __name__ == '__main__':

    status = run_gcc()

    sys.exit(status)