From df31d32b411022d130b078de177cfa40b7bf6cde Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sun, 22 Jan 2006 19:35:08 +0000 Subject: Enable _GNU_SOURCE build wide, trying to get consistent interfaces, else IMA is a useless attempt --- ldso/ldso/Makefile.in | 2 +- ldso/libdl/libdl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index 054aa7891..9a1fba01b 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -5,7 +5,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS) -D_GNU_SOURCE +CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS) # This stuff will not work with -fomit-frame-pointer CFLAGS-ldso += -fno-omit-frame-pointer diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 0da1882d7..37b1c3abd 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -3,7 +3,7 @@ * Program to load an ELF binary on a linux system, and run it * after resolving ELF shared library symbols * - * Copyright (C) 2000-2004 by Erik Andersen + * Copyright (C) 2000-2006 by Erik Andersen * Copyright (c) 1994-2000 Eric Youngdale, Peter MacDonald, * David Engel, Hongjiu Lu and Mitch D'Souza * @@ -30,7 +30,6 @@ */ -#define _GNU_SOURCE #include #include @@ -599,6 +598,7 @@ char *dlerror(void) /* * Dump information to stderrr about the current loaded modules */ +#ifdef __USE_GNU static char *type[] = { "Lib", "Exe", "Int", "Mod" }; int dlinfo(void) @@ -703,3 +703,4 @@ int dladdr(const void *__address, Dl_info * __info) return 1; } } +#endif -- cgit v1.2.3