!22 [sync] PR-21: 添加龙芯和申威架构支持
From: @openeuler-sync-bot Reviewed-by: @Charlie_li Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot
Gitee
commit
e0ecf6ce15
57
add-loongarch-support-not-upstream-makefile.patch
Normal file
57
add-loongarch-support-not-upstream-makefile.patch
Normal file
@ -0,0 +1,57 @@
|
||||
From 9df559fef66ab738a968367c12fcf5982c89a2f7 Mon Sep 17 00:00:00 2001
|
||||
From: herengui <herengui@kylinsec.com.cn>
|
||||
Date: Tue, 29 Aug 2023 09:25:34 +0800
|
||||
Subject: [PATCH 1/2] add loongarch support not upstream makefile
|
||||
|
||||
Signed-off-by: herengui <herengui@kylinsec.com.cn>
|
||||
---
|
||||
configure.ac | 3 +++
|
||||
sysdeps/linux-gnu/Makefile.am | 4 ++--
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 63fd950..205457e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -43,6 +43,7 @@ case "${host_cpu}" in
|
||||
arm*|sa110) HOST_CPU="arm" ;;
|
||||
aarch64_be) HOST_CPU="aarch64" ;;
|
||||
cris*) HOST_CPU="cris" ;;
|
||||
+ loongarch*) HOST_CPU="loongarch" ;;
|
||||
mips*) HOST_CPU="mips" ;;
|
||||
powerpc|powerpc64) HOST_CPU="ppc" ;;
|
||||
sun4u|sparc64) HOST_CPU="sparc" ;;
|
||||
@@ -216,6 +217,7 @@ if test x"$enable_libunwind" = xyes; then
|
||||
powerpc) UNWIND_ARCH="ppc32" ;;
|
||||
powerpc64) UNWIND_ARCH="ppc64" ;;
|
||||
mips*) UNWIND_ARCH="mips" ;;
|
||||
+ loongarch*) UNWIND_ARCH="loongarch" ;;
|
||||
*) UNWIND_ARCH="${host_cpu}" ;;
|
||||
esac
|
||||
|
||||
@@ -405,6 +407,7 @@ AC_CONFIG_FILES([
|
||||
sysdeps/linux-gnu/arm/Makefile
|
||||
sysdeps/linux-gnu/cris/Makefile
|
||||
sysdeps/linux-gnu/ia64/Makefile
|
||||
+ sysdeps/linux-gnu/loongarch/Makefile
|
||||
sysdeps/linux-gnu/m68k/Makefile
|
||||
sysdeps/linux-gnu/metag/Makefile
|
||||
sysdeps/linux-gnu/mips/Makefile
|
||||
diff --git a/sysdeps/linux-gnu/Makefile.am b/sysdeps/linux-gnu/Makefile.am
|
||||
index ec26162..7d17020 100644
|
||||
--- a/sysdeps/linux-gnu/Makefile.am
|
||||
+++ b/sysdeps/linux-gnu/Makefile.am
|
||||
@@ -17,8 +17,8 @@
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
||||
# 02110-1301 USA
|
||||
|
||||
-DIST_SUBDIRS = aarch64 alpha arm cris ia64 m68k metag mips ppc s390 \
|
||||
- sparc x86
|
||||
+DIST_SUBDIRS = aarch64 alpha arm cris ia64 loongarch m68k metag mips \
|
||||
+ ppc s390 sparc x86
|
||||
|
||||
SUBDIRS = \
|
||||
$(HOST_CPU)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
1866
add-loongarch-support-not-upstream-sysdeps.patch
Normal file
1866
add-loongarch-support-not-upstream-sysdeps.patch
Normal file
File diff suppressed because it is too large
Load Diff
75
add-sw_64-support-not-upstream-makefile.patch
Normal file
75
add-sw_64-support-not-upstream-makefile.patch
Normal file
@ -0,0 +1,75 @@
|
||||
From 3ee3dc3d0ecd8c11cb62317a6bf66c247b2f385d Mon Sep 17 00:00:00 2001
|
||||
From: herengui <herengui@kylinsec.com.cn>
|
||||
Date: Tue, 29 Aug 2023 09:30:56 +0800
|
||||
Subject: [PATCH 1/2] add sw_64 support not upstream makefile
|
||||
|
||||
Signed-off-by: herengui <herengui@kylinsec.com.cn>
|
||||
---
|
||||
configure | 3 ++-
|
||||
configure.ac | 1 +
|
||||
sysdeps/linux-gnu/Makefile.am | 2 +-
|
||||
sysdeps/linux-gnu/Makefile.in | 2 +-
|
||||
4 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index b9f1b5e..7054313 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -13143,7 +13143,7 @@ fi
|
||||
|
||||
|
||||
|
||||
-ac_config_files="$ac_config_files Makefile sysdeps/Makefile sysdeps/linux-gnu/Makefile sysdeps/linux-gnu/alpha/Makefile sysdeps/linux-gnu/arm/Makefile sysdeps/linux-gnu/cris/Makefile sysdeps/linux-gnu/ia64/Makefile sysdeps/linux-gnu/m68k/Makefile sysdeps/linux-gnu/metag/Makefile sysdeps/linux-gnu/mips/Makefile sysdeps/linux-gnu/ppc/Makefile sysdeps/linux-gnu/s390/Makefile sysdeps/linux-gnu/sparc/Makefile sysdeps/linux-gnu/x86/Makefile testsuite/Makefile testsuite/ltrace.main/Makefile testsuite/ltrace.minor/Makefile testsuite/ltrace.torture/Makefile"
|
||||
+ac_config_files="$ac_config_files Makefile sysdeps/Makefile sysdeps/linux-gnu/Makefile sysdeps/linux-gnu/alpha/Makefile sysdeps/linux-gnu/sw_64/Makefile sysdeps/linux-gnu/arm/Makefile sysdeps/linux-gnu/cris/Makefile sysdeps/linux-gnu/ia64/Makefile sysdeps/linux-gnu/m68k/Makefile sysdeps/linux-gnu/metag/Makefile sysdeps/linux-gnu/mips/Makefile sysdeps/linux-gnu/ppc/Makefile sysdeps/linux-gnu/s390/Makefile sysdeps/linux-gnu/sparc/Makefile sysdeps/linux-gnu/x86/Makefile testsuite/Makefile testsuite/ltrace.main/Makefile testsuite/ltrace.minor/Makefile testsuite/ltrace.torture/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@@ -14163,6 +14163,7 @@ do
|
||||
"sysdeps/Makefile") CONFIG_FILES="$CONFIG_FILES sysdeps/Makefile" ;;
|
||||
"sysdeps/linux-gnu/Makefile") CONFIG_FILES="$CONFIG_FILES sysdeps/linux-gnu/Makefile" ;;
|
||||
"sysdeps/linux-gnu/alpha/Makefile") CONFIG_FILES="$CONFIG_FILES sysdeps/linux-gnu/alpha/Makefile" ;;
|
||||
+ "sysdeps/linux-gnu/sw_64/Makefile") CONFIG_FILES="$CONFIG_FILES sysdeps/linux-gnu/sw_64/Makefile" ;;
|
||||
"sysdeps/linux-gnu/arm/Makefile") CONFIG_FILES="$CONFIG_FILES sysdeps/linux-gnu/arm/Makefile" ;;
|
||||
"sysdeps/linux-gnu/cris/Makefile") CONFIG_FILES="$CONFIG_FILES sysdeps/linux-gnu/cris/Makefile" ;;
|
||||
"sysdeps/linux-gnu/ia64/Makefile") CONFIG_FILES="$CONFIG_FILES sysdeps/linux-gnu/ia64/Makefile" ;;
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 205457e..bc58d81 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -404,6 +404,7 @@ AC_CONFIG_FILES([
|
||||
sysdeps/linux-gnu/Makefile
|
||||
sysdeps/linux-gnu/aarch64/Makefile
|
||||
sysdeps/linux-gnu/alpha/Makefile
|
||||
+ sysdeps/linux-gnu/sw_64/Makefile
|
||||
sysdeps/linux-gnu/arm/Makefile
|
||||
sysdeps/linux-gnu/cris/Makefile
|
||||
sysdeps/linux-gnu/ia64/Makefile
|
||||
diff --git a/sysdeps/linux-gnu/Makefile.am b/sysdeps/linux-gnu/Makefile.am
|
||||
index 7d17020..bff940e 100644
|
||||
--- a/sysdeps/linux-gnu/Makefile.am
|
||||
+++ b/sysdeps/linux-gnu/Makefile.am
|
||||
@@ -18,7 +18,7 @@
|
||||
# 02110-1301 USA
|
||||
|
||||
DIST_SUBDIRS = aarch64 alpha arm cris ia64 loongarch m68k metag mips \
|
||||
- ppc s390 sparc x86
|
||||
+ ppc s390 sparc x86 sw_64
|
||||
|
||||
SUBDIRS = \
|
||||
$(HOST_CPU)
|
||||
diff --git a/sysdeps/linux-gnu/Makefile.in b/sysdeps/linux-gnu/Makefile.in
|
||||
index 8a4f4d6..11c8ac5 100644
|
||||
--- a/sysdeps/linux-gnu/Makefile.in
|
||||
+++ b/sysdeps/linux-gnu/Makefile.in
|
||||
@@ -353,7 +353,7 @@ target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
-DIST_SUBDIRS = alpha arm cris ia64 m68k metag mips ppc s390 sparc x86
|
||||
+DIST_SUBDIRS = sw_64 alpha arm cris ia64 m68k metag mips ppc s390 sparc x86
|
||||
SUBDIRS = \
|
||||
$(HOST_CPU)
|
||||
|
||||
--
|
||||
2.41.0
|
||||
|
||||
1427
add-sw_64-support-not-upstream-sysdeps.patch
Normal file
1427
add-sw_64-support-not-upstream-sysdeps.patch
Normal file
File diff suppressed because it is too large
Load Diff
13
ltrace.spec
13
ltrace.spec
@ -1,6 +1,6 @@
|
||||
name: ltrace
|
||||
Version: 0.7.91
|
||||
Release: 31
|
||||
Release: 32
|
||||
Summary: Trace the Library and System Calls a Program Makes
|
||||
|
||||
License: GPLv2+
|
||||
@ -30,6 +30,10 @@ Patch9001: bugfix-0001-ltrace-byteswap-instruction-in-arm-be8-mode.patch
|
||||
Patch9002: bugfix-for-use-after-free-about-soname.patch
|
||||
Patch9003: fix-null-directive-argument.patch
|
||||
Patch9004: Initialize-nrhs-to-avoid-gcc-warning.patch
|
||||
Patch9005: add-loongarch-support-not-upstream-makefile.patch
|
||||
Patch9006: add-loongarch-support-not-upstream-sysdeps.patch
|
||||
Patch9007: add-sw_64-support-not-upstream-makefile.patch
|
||||
Patch9008: add-sw_64-support-not-upstream-sysdeps.patch
|
||||
|
||||
BuildRequires: elfutils-devel dejagnu libselinux-devel autoconf automake libtool
|
||||
|
||||
@ -55,6 +59,10 @@ Help document for the ltrace package.
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
%ifarch loongarch64 sw_64
|
||||
%_update_config_guess
|
||||
%_update_config_sub
|
||||
%endif
|
||||
autoreconf -i
|
||||
%configure --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
|
||||
%make_build
|
||||
@ -75,6 +83,9 @@ autoreconf -i
|
||||
%{_mandir}/man5/ltrace.conf.5*
|
||||
|
||||
%changelog
|
||||
* Tue Aug 29 2023 herengui <herengui@kylinsec.com.cn> - 0.7.91-32
|
||||
- add support for loongarch64 and sw_64
|
||||
|
||||
* Mon Jan 11 2021 lingsheng <lingsheng@huawei.com> - 0.7.91-31
|
||||
- Initialize 'nrhs' to avoid gcc warning
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user