bbf7514c0e
Signed-off-by: herengui <herengui@kylinsec.com.cn> (cherry picked from commit 3e9aabe1d36c022487c490439602193596a37aa0)
76 lines
3.7 KiB
Diff
76 lines
3.7 KiB
Diff
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
|
|
|