about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-07-26 22:22:24 +0000
committerUlrich Drepper <drepper@redhat.com>2008-07-26 22:22:24 +0000
commit7b91359b2cb44b56478e7a5ef9070737fa266656 (patch)
treea54d1a28e0c6acbb980b3300ad562a5484868ee9 /elf
parent3f414923cf9937588d900b13ad8404be4dfbca67 (diff)
downloadglibc-7b91359b2cb44b56478e7a5ef9070737fa266656.tar.gz
glibc-7b91359b2cb44b56478e7a5ef9070737fa266656.tar.xz
glibc-7b91359b2cb44b56478e7a5ef9070737fa266656.zip
* Makeconfig: Define pie-ccflag and PIE-ccflag variables.
	* elf/Makefile: Use pie-ccflag variable.
	* nscd/Makefile: Likewise.
	* sysdeps/sparc/Makefile: Set $(pie-ccflag) to -fPIE.
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile2
-rw-r--r--elf/dl-object.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/elf/Makefile b/elf/Makefile
index e509153547..abb9572166 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -800,7 +800,7 @@ $(objpfx)tst-array5-static.out: $(objpfx)tst-array5-static
 	cmp $@ tst-array5-static.exp > /dev/null
 
 ifeq (yesyes,$(have-fpie)$(build-shared))
-CFLAGS-tst-pie1.c += -fpie
+CFLAGS-tst-pie1.c += $(pie-ccflag)
 
 $(objpfx)tst-pie1.out: $(objpfx)tst-pie1
 	$(elf-objpfx)$(rtld-installed-name) \
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 7780de6304..be4ea38f9f 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -1,5 +1,5 @@
 /* Storage management for the chain of loaded shared objects.
-   Copyright (C) 1995-2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-2002,2004,2006,2007,2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@ _dl_new_object (char *realname, const char *libname, int type,
 #endif
 
   new = (struct link_map *) calloc (sizeof (*new) + audit_space
-				    + sizeof (struct r_scope_elem)
+				    + sizeof (struct link_map *)
 				    + sizeof (*newname) + libname_len, 1);
   if (new == NULL)
     return NULL;