diff options
| author | Sergio Durigan Junior <sergiodj@redhat.com> | 2018-10-30 17:37:03 -0400 |
|---|---|---|
| committer | Sergio Durigan Junior <sergiodj@redhat.com> | 2018-10-31 17:42:43 -0400 |
| commit | 656efb5e2691b2bd29573d9985d20206c47b6927 (patch) | |
| tree | b0a7bdadbdb3957f20bff599d18d09abdbbfb079 /gdb/common | |
| parent | 92dcebf3fa5ccc1cae8fcb93eaf08ffea52957e2 (diff) | |
| download | binutils-gdb-656efb5e2691b2bd29573d9985d20206c47b6927.tar.gz | |
Fix PR gdb/23835: Don't redefine _FORTIFY_SOURCE if it's already defined
Gentoo has a local GCC patch which always defines _FORTIFY_SOURCE=2.
This causes a build problem when building GDB there, because
"common/common-defs.h" also defines _FORTIFY_SOURCE=2:
CXX gdb.o
In file included from ../../gdb/defs.h:28:0,
from ../../gdb/gdb.c:19:
../../gdb/common/common-defs.h:71:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
#define _FORTIFY_SOURCE 2
<built-in>: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors
make[2]: *** [Makefile:1619: gdb.o] Error 1
Even though it is questionable whether Gentoo's approach is the
correct one:
https://jira.mongodb.org/browse/SERVER-29982
https://bugs.gentoo.org/621036
it is still possible for GDB to be a bit more robust here and make
sure it just defines _FORTIFY_SOURCE if it hasn't been defined
already. This patch does that.
Tested by rebuilding and making sure the macro was defined.
gdb/ChangeLog:
2018-10-31 Sergio Durigan Junior <sergiodj@redhat.com>
PR gdb/23835
* common/common-defs.h: Don't redefine _FORTIFY_SOURCE if it's
already defined.
Diffstat (limited to 'gdb/common')
| -rw-r--r-- | gdb/common/common-defs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index 58445b16110..86f7c1ab9ae 100644 --- a/gdb/common/common-defs.h +++ b/gdb/common/common-defs.h @@ -65,9 +65,10 @@ enable it here in order to try to catch these problems earlier; plus this seems like a reasonable safety measure. The check for optimization is required because _FORTIFY_SOURCE only works when - optimization is enabled. */ + optimization is enabled. If _FORTIFY_SOURCE is already defined, + then we don't do anything. */ -#if defined __OPTIMIZE__ && __OPTIMIZE__ > 0 +#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 #define _FORTIFY_SOURCE 2 #endif |