Unverified Commit cd989709 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10967 Revert "kbuild: fix false positive warning/error about missing libelf" 

Merge Pull Request from: @ci-robot 
 
PR sync from: zhaoxuedong <zhaoxuedong@meituan.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UBDVPAOCOI4HQEPJDSPQ3OOWVBGMEXPU/ 
 
https://gitee.com/openeuler/kernel/issues/IAD5GG?from=project-issue 
 
Link:https://gitee.com/openeuler/kernel/pulls/10967

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 49ac1068 09e42214

Makefile

+5 −8
Original line number Diff line number Diff line
@@ -1100,6 +1100,11 @@ ifdef CONFIG_STACK_VALIDATION 
  ifeq ($(has_libelf),1)

    objtool_target := tools/objtool FORCE

  else

    ifdef CONFIG_UNWINDER_ORC

      $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    else

      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    endif

    SKIP_STACK_VALIDATION := 1

    export SKIP_STACK_VALIDATION

  endif
@@ -1249,14 +1254,6 @@ uapi-asm-generic: 


PHONY += prepare-objtool prepare-resolve_btfids

prepare-objtool: $(objtool_target)

ifeq ($(SKIP_STACK_VALIDATION),1)

ifdef CONFIG_UNWINDER_ORC

	@echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2

	@false

else

	@echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2

endif

endif



prepare-resolve_btfids: $(resolve_btfids_target)

ifeq ($(ERROR_RESOLVE_BTFIDS),1)