Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 782b98ea authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge changes I3ca9ed36,Ibd7eec5c 

* changes:
  Revert "Default to hiding libgcc symbols in each object."
  Revert "Don't apply --exclude-libs for the host."
parents 87e0e8a7 b77aedbf

core/binary.mk

+0 −13
Original line number Diff line number Diff line
@@ -412,19 +412,6 @@ ifeq ($(my_allow_undefined_symbols),) 
endif

endif



# Target modules shouldn't re-export libgcc.a because we don't want other

# binaries importing them when they should be getting their own copy of the

# builtins.

#

# Unfortunately --exclude-libs always overrides all other attempts to make a

# symbol visible, and libc needs to make sure some of these symbols are

# available for binary compatibility, so libc needs a way to disable this.

ifndef LOCAL_IS_HOST_MODULE

  ifneq ($(strip $(LOCAL_NO_EXCLUDE_LIBS)),true)

    my_ldflags += -Wl,--exclude-libs,libgcc.a

  endif

endif



ifeq (true,$(LOCAL_GROUP_STATIC_LIBRARIES))

$(LOCAL_BUILT_MODULE): PRIVATE_GROUP_STATIC_LIBRARIES := true

else

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ LOCAL_SANITIZE_RECOVER:= 
LOCAL_DBUS_PROXY_PREFIX:=

LOCAL_INIT_RC:=

LOCAL_MODULE_HOST_OS:=

LOCAL_NO_EXCLUDE_LIBS:=



# arch specific variables

LOCAL_SRC_FILES_$(TARGET_ARCH):=