summaryrefslogtreecommitdiff
path: root/bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-09-18 07:05:42 +0000
committerCoprDistGit <infra@openeuler.org>2024-09-18 07:05:42 +0000
commit4ad1d692311b38472d44f5deb9c32634b334ed4d (patch)
tree3e004676c8e07b495fdeda7291033d0fde73d783 /bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
parente248808867f90830a43b5ca5d192bef9dd2edec2 (diff)
automatic import of rpm
Diffstat (limited to 'bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch')
-rw-r--r--bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch b/bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
new file mode 100644
index 0000000..ae68b6d
--- /dev/null
+++ b/bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
@@ -0,0 +1,83 @@
+diff -Nur rpm-4.14.2.old/installplatform rpm-4.14.2/installplatform
+--- rpm-4.14.2.old/installplatform 2017-08-10 16:08:07.113108701 +0800
++++ rpm-4.14.2/installplatform 2019-01-30 17:28:25.511000000 +0800
+@@ -186,6 +186,13 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
+ CANONARCH=loongarch64
+ CANONCOLOR=3
+ ;;
++ aarch64_ilp32)
++ ISANAME=aarch
++ ISABITS=32
++ CANONARCH=aarch64
++ CANONCOLOR=0
++ LIB=libilp32
++ ;;
+ noarch)
+ CANONARCH=noarch
+ CANONCOLOR=0
+diff --git a/rpmrc.in b/rpmrc.in
+index 2975a3a..6861b0a 100644
+--- a/rpmrc.in
++++ b/rpmrc.in
+@@ -101,7 +101,7 @@ optflags: sh4 -O2 -g -mieee
+ optflags: sh4a -O2 -g -mieee
+
+ optflags: aarch64 -O2 -g
+-
++optflags: aarch64_ilp32 -O2 -g -mabi=ilp32
+ optflags: riscv64 -O2 -g
+
+ optflags: loongarch64 -O2 -g
+@@ -154,7 +154,7 @@ archcolor: sh3 1
+ archcolor: sh4 1
+
+ archcolor: aarch64 2
+-
++archcolor: aarch64_ilp32 1
+ archcolor: riscv64 2
+
+
+@@ -253,7 +253,7 @@ arch_canon: sh4: sh4 17
+ arch_canon: sh4a: sh4a 17
+ arch_canon: xtensa: xtensa 18
+ arch_canon: aarch64: aarch64 19
+-
++arch_canon: aarch64_ilp32: aarch64 19
+ arch_canon: mipsr6: mipsr6 20
+ arch_canon: mipsr6el: mipsr6el 20
+ arch_canon: mips64r6: mips64r6 21
+@@ -391,13 +391,13 @@ buildarchtranslate: sh4: sh4
+ buildarchtranslate: sh4a: sh4
+
+ buildarchtranslate: aarch64: aarch64
+-
++buildarchtranslate: aarch64_ilp32: aarch64_ilp32
+ buildarchtranslate: riscv: riscv64
+ buildarchtranslate: riscv64: riscv64
+
+ buildarchtranslate: loongarch64: loongarch64
+
+-#############################################################
++#########################################/####################
+ # Architecture compatibility
+
+ arch_compat: alphaev67: alphaev6
+@@ -503,7 +503,8 @@ arch_compat: sh3: noarch
+ arch_compat: sh4: noarch
+ arch_compat: sh4a: sh4
+
+-arch_compat: aarch64: noarch
++arch_compat: aarch64_ilp32: aarch64 noarch
++arch_compat: aarch64: aarch64_ilp32 noarch
+
+ arch_compat: riscv: noarch
+ arch_compat: riscv64: noarch
+@@ -542,7 +543,7 @@ arch_compat: loongarch64: noarch
+ buildarch_compat: ia64: noarch
+
+ buildarch_compat: aarch64: noarch
+-
++buildarch_compat: aarch64_ilp32: noarch
+ buildarch_compat: riscv: noarch
+ buildarch_compat: riscv64: noarch
+