提交: cef9840613e4f8fcf777df0ac10dfcdd7cefb8f5 - uclibc-ng (git)

Commit MetaInfo

• 修订版: cef9840613e4f8fcf777df0ac10dfcdd7cefb8f5 (tree)
• 时间: 2018-03-02 03:52:19
• 作者: Waldemar Brodkorb <wbx@ucli...>
• Commiter: Waldemar Brodkorb

Log Message

fix issue with LDSO_GNU_HASH_SUPPORT

Under Fedora 27 there is a problem with the existing ld check.
Binutils ld segfaults. Add a glibc compat macro to complete
the build on Fedora.

Signed-off-by: Sven Anders <[e-mail]>

更改概述

• modified: Rules.mak
• modified: include/features.h

差异

--- a/Rules.mak
+++ b/Rules.mak
@@ -195,8 +195,9 @@ check_as=$(shell \
 	if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \
 	then echo "-Wa,$(1)"; fi)
 check_ld=$(shell \
-	if $(CC) $(LDFLAG-fuse-ld) $(CFLAG_-Wl--no-warn-mismatch) -Wl,$(1) $(CFLAG_-nostdlib) -o /dev/null -Wl,-b,binary /dev/null > /dev/null 2>&1; \
-	then echo "$(1)"; fi)
+	tf="/tmp/clducl$$$$.c"; echo "int _start(){return 0;}int main(){return 0;}" >$$tf; \
+	if $(CC) $(LDFLAG-fuse-ld) $(CFLAG_-Wl--no-warn-mismatch) -Wl,$(1) $(CFLAG_-nostdlib) -o /dev/null $$tf > /dev/null 2>&1; \
+	then echo "$(1)"; fi; rm -f $$tf )
 
 # Use variable indirection here so that we can have variable
 # names with fun chars in them like equal signs

--- a/include/features.h
+++ b/include/features.h
@@ -139,6 +139,9 @@
 # define __GNUC_PREREQ(maj, min) 0
 #endif
 
+/* Whether to use feature set F.  */
+#define __GLIBC_USE(F)  __GLIBC_USE_ ## F
+
 /* _DEFAULT_SOURCE is equivalent to defining _BSD_SOURCE and _SVID_SOURCE
  * and vice versa. */
 #ifdef _DEFAULT_SOURCE