summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorjakllsch <jakllsch@NetBSD.org>2018-02-11 18:58:44 +0000
committerjakllsch <jakllsch@NetBSD.org>2018-02-11 18:58:44 +0000
commitb4d7cd28cafa1a4227a1cc2197ca56fd1a221df3 (patch)
tree6065fc1225e60c19f872c9561cc8f9e10a455d3a /libexec
parentbe7e7b8f66281147a8ed5c1d3e8e26a0c2ecf1cb (diff)
Wrap PowerPC #pragma goop in #if __GNUC_PREREQ__(6,0).
Our older GCC warns/errors on it.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/rtld.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libexec/ld.elf_so/rtld.c b/libexec/ld.elf_so/rtld.c
index 2ddd31b8008..47b6bf6f552 100644
--- a/libexec/ld.elf_so/rtld.c
+++ b/libexec/ld.elf_so/rtld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.189 2018/02/07 06:17:45 mrg Exp $ */
+/* $NetBSD: rtld.c,v 1.190 2018/02/11 18:58:44 jakllsch Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.189 2018/02/07 06:17:45 mrg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.190 2018/02/11 18:58:44 jakllsch Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1109,10 +1109,14 @@ _rtld_objmain_sym(const char *name)
static __noinline void *
hackish_return_address(void)
{
+#if __GNUC_PREREQ__(6,0)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wframe-address"
+#endif
return __builtin_return_address(1);
+#if __GNUC_PREREQ__(6,0)
#pragma GCC diagnostic pop
+#endif
}
#endif