• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/uclibc/0.9.33.2/uclibc-0018-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch
Peter KorsgaardPeter Korsgaard committed 055f1c02d3506 Sep 2013
Raw file
Source viewDiff to previous
 
1
From 2f09c67232cebca62f3afa4fc296c83aa813427c Mon Sep 17 00:00:00 2001
2
From: Mike Frysinger <vapier@gentoo.org>
3
Date: Sun, 18 Nov 2012 04:41:06 -0500
4
Subject: [PATCH] ldso: include dlfcn.h for RTLD_NODELETE
5
​
6
Building with NPTL enabled and shared library support disabled we hit:
7
In file included from libpthread/nptl/sysdeps/generic/dl-tls.c:30:0:
8
./ldso/include/dl-elf.h: In function '__dl_parse_dynamic_info':
9
./ldso/include/dl-elf.h:173:20: error: 'RTLD_NODELETE' undeclared (first use in this function)
10
./ldso/include/dl-elf.h:173:20: note: each undeclared identifier is reported only once for each function it appears in
11
make: *** [libpthread/nptl/sysdeps/generic/dl-tls.os] Error 1
12
​
13
A previous commit (f26c5f6952ce9bf8edec9c1571c47addb1bcc442) touched
14
on a similar issue, but added the include to the incorrect location.
15
​
16
Reported-by: Christophe Lyon <christophe.lyon@st.com> [arm nommu]
17
Reported-by: Daniel Beecham <daniel@lunix.se> [static x86_64]
18
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
19
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
20
---
21
 ldso/include/dl-elf.h |    2 ++
22
 ldso/include/ldso.h   |    1 -
23
 2 files changed, 2 insertions(+), 1 deletion(-)
24
​
25
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
26
index 29d1a00..e1185f7 100644
27
--- a/ldso/include/dl-elf.h
28
+++ b/ldso/include/dl-elf.h
29
@@ -18,6 +18,8 @@ struct elf_resolve;
30
 struct r_scope_elem;
31
 
32
 #include <dl-defs.h>
33
+#include <dlfcn.h>
34
+
35
 #ifdef __LDSO_CACHE_SUPPORT__
36
 extern int _dl_map_cache(void);
37
 extern int _dl_unmap_cache(void);
38
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
39
index 6f3b728..e250e30 100644
40
--- a/ldso/include/ldso.h
41
+++ b/ldso/include/ldso.h
42
@@ -42,7 +42,6 @@
43
 #ifndef __ARCH_HAS_NO_SHARED__
44
 #include <dl-syscall.h>
45
 #include <dl-string.h>
46
-#include <dlfcn.h>
47
 /* Now the ldso specific headers */
48
 #include <dl-elf.h>
49
 #ifdef __UCLIBC_HAS_TLS__
50
-- 
51
1.7.10.4
52
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.