Pārlūkot izejas kodu

musl: use shared libgcc for non-static builds

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Waldemar Brodkorb 8 gadi atpakaļ
vecāks
revīzija
1ff7a8e41d
3 mainītis faili ar 1 papildinājumiem un 14 dzēšanām
  1. 0 7
      mk/vars.mk
  2. 1 3
      package/libgcc/Makefile
  3. 0 4
      toolchain/gcc/Makefile

+ 0 - 7
mk/vars.mk

@@ -171,13 +171,6 @@ ifeq ($(ADK_TARGET_BINFMT_FLAT_SHARED),y)
 TARGET_LDFLAGS+=	-mid-shared-library
 endif
 
-ifeq ($(ADK_TARGET_LIB_MUSL),y)
-# use -static-libgcc by default only for musl
-TARGET_CFLAGS+=		-static-libgcc
-TARGET_CXXFLAGS+=	-static-libgcc
-TARGET_LDFLAGS+=	-static-libgcc
-endif
-
 # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf
 ifneq ($(ADK_TARGET_USE_LD_RELRO),)
 TARGET_LDFLAGS+=	-Wl,-z,relro

+ 1 - 3
package/libgcc/Makefile

@@ -9,9 +9,7 @@ PKG_DESCR:=		gcc library
 PKG_SECTION:=		base/libs
 PKG_OPTS:=		noremove
 
-PKG_DFLT_LIBGCC:=	y if !(ADK_TOOLCHAIN_ONLY)
-PKG_LIBC_DEPENDS:=	uclibc-ng glibc
-
+PKG_DFLT_LIBGCC:=	y if !ADK_TOOLCHAIN_ONLY
 
 NO_DISTFILES:=		1
 

+ 0 - 4
toolchain/gcc/Makefile

@@ -77,12 +77,8 @@ ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_
 GCC_FINAL_CONFOPTS+=	--disable-shared
 else
 # uClibc/glibc uses libgcc_s.so.1 for pthread_cancel with dlopen
-ifeq (ADK_TARGET_LIB_MUSL),y)
-GCC_FINAL_CONFOPTS+=	--enable-shared='libstdc++'
-else
 GCC_FINAL_CONFOPTS+=	--enable-shared='libstdc++,libgcc'
 endif
-endif
 
 ifeq ($(ADK_TOOLCHAIN_WITH_SSP),y)
 GCC_FINAL_CONFOPTS+=	--enable-libssp