Commit 5adc390a authored by Mao Minkai's avatar Mao Minkai Committed by guzitao
Browse files

tools: fix basic sw64 support 

Sunway inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8Y8CY



--------------------------------

Modify generic headers and Makefiles for SW64 support.

Signed-off-by: default avatarMao Minkai <maominkai@wxiat.com>
Reviewed-by: default avatarHe Sheng <hesheng@wxiat.com>
Signed-off-by: default avatarGu Zitao <guzitao@wxiat.com>
parent 40fa4072

tools/build/Makefile.feature

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ FEATURE_TESTS_BASIC := \ 
        libtracefs                      \

        libcrypto                       \

        libunwind                       \

        libunwind-sw_64                 \

        pthread-attr-setaffinity-np     \

        pthread-barrier     		\

        reallocarray                    \

tools/build/feature/Makefile

+9 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

include ../../scripts/Makefile.include



ARCH ?= $(shell uname -m)

FILES=                                          \

         test-all.bin                           \

         test-backtrace.bin                     \
@@ -45,6 +46,7 @@ FILES= \ 
         test-libunwind-x86_64.bin              \

         test-libunwind-arm.bin                 \

         test-libunwind-aarch64.bin             \

         test-libunwind-sw_64.bin               \

         test-libunwind-debug-frame-arm.bin     \

         test-libunwind-debug-frame-aarch64.bin \

         test-pthread-attr-setaffinity-np.bin   \
@@ -86,7 +88,11 @@ all: $(FILES) 


__BUILD = $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS)

  BUILD = $(__BUILD) > $(@:.bin=.make.output) 2>&1

ifeq ($(ARCH),sw_64)

  BUILD_BFD = $(BUILD) -DPACKAGE='"perf"' -lbfd -ldl -liberty -lz

else

  BUILD_BFD = $(BUILD) -DPACKAGE='"perf"' -lbfd -ldl

endif

  BUILD_ALL = $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap



__BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS)
@@ -189,6 +195,9 @@ $(OUTPUT)test-libunwind-arm.bin: 
$(OUTPUT)test-libunwind-aarch64.bin:

	$(BUILD) -lelf -lunwind-aarch64



$(OUTPUT)test-libunwind-sw_64.bin:

	$(BUILD) -lelf -lunwind-sw_64



$(OUTPUT)test-libunwind-debug-frame-arm.bin:

	$(BUILD) -lelf -lunwind-arm

tools/include/uapi/asm/bitsperlong.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include "../../../arch/ia64/include/uapi/asm/bitsperlong.h"

#elif defined(__alpha__)

#include "../../../arch/alpha/include/uapi/asm/bitsperlong.h"

#elif defined(__sw_64__)

#include "../../../arch/sw_64/include/uapi/asm/bitsperlong.h"

#else

#include <asm-generic/bitsperlong.h>

#endif

tools/include/uapi/asm/errno.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include "../../../arch/mips/include/uapi/asm/errno.h"

#elif defined(__hppa__)

#include "../../../arch/parisc/include/uapi/asm/errno.h"

#elif defined(__sw_64__)

#include "../../../arch/sw_64/include/uapi/asm/errno.h"

#else

#include <asm-generic/errno.h>

#endif