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

Commit 34f3a91b authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: OSL: Fix a regression that old GCC requires a workaround for strchr() 

ACPICA commit be836c36454a624a4fb1d17234080ef8c07993fc

There is a GCC false-warning issue on specific GCC versions that
"strchr" will be preprocessed and extracted to contain
!__buildin_constant_p() checker and it surely is a constant logical
value "1" for strchr() arguments. Then -Wlogical-op errorneously reports a
warning.

The regression is triggered after the standard headers are re-ordered in
the EFI porting task. This patch fixes this regression by moving the
workaround to a new position after including all other standard headers.

Link: https://github.com/acpica/acpica/commit/be836c36


Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9fa1cebd

include/acpi/platform/acenvex.h

+4 −1
Original line number Diff line number Diff line
@@ -69,7 +69,10 @@ 


#endif



#if defined(_MSC_VER)

#if defined(__GNUC__) && !defined(__INTEL_COMPILER)

#include "acgccex.h"



#elif defined(_MSC_VER)

#include "acmsvcex.h"



#endif

include/acpi/platform/acgcc.h

+0 −11
Original line number Diff line number Diff line
@@ -70,17 +70,6 @@ 
 */

#define ACPI_UNUSED_VAR __attribute__ ((unused))



/*

 * Some versions of gcc implement strchr() with a buggy macro. So,

 * undef it here. Prevents error messages of this form (usually from the

 * file getopt.c):

 *

 * error: logical '&&' with non-zero constant will always evaluate as true

 */

#ifdef strchr

#undef strchr

#endif



/* GCC supports __VA_ARGS__ in macros */



#define COMPILER_VA_MACRO               1

include/acpi/platform/acgccex.h

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Name: acgccex.h - Extra GCC specific defines, etc.

 *

 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2016, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions, and the following disclaimer,

 *    without modification.

 * 2. Redistributions in binary form must reproduce at minimum a disclaimer

 *    substantially similar to the "NO WARRANTY" disclaimer below

 *    ("Disclaimer") and any redistribution must be conditioned upon

 *    including a substantially similar Disclaimer requirement for further

 *    binary redistribution.

 * 3. Neither the names of the above-listed copyright holders nor the names

 *    of any contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * Alternatively, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") version 2 as published by the Free

 * Software Foundation.

 *

 * NO WARRANTY

 * 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 MERCHANTIBILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.

 */



#ifndef __ACGCCEX_H__

#define __ACGCCEX_H__



/*

 * Some versions of gcc implement strchr() with a buggy macro. So,

 * undef it here. Prevents error messages of this form (usually from the

 * file getopt.c):

 *

 * error: logical '&&' with non-zero constant will always evaluate as true

 */

#ifdef strchr

#undef strchr

#endif



#endif				/* __ACGCCEX_H__ */