OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
12217 Commits
49 Branches
0 Tags
34 MiB
Tree: 43116bcc4f
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '43116bcc4f'
${ noResults }
package-nopast/base/musl/pkg/gcc/0025-use-pure-64-bit-config...

137 lines
6.1 KiB
Raw Normal View History

musl: Updated (1.1.16 -> 1.2.1)
4 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../musl/pkg/gcc/0025-use-pure-64-bit-configuration-where-appropriate.patch
  5. # Copyright (C) 2020 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  17. From f73cf8d2f8f4eee71fc2ba850672e69f509a4486 Mon Sep 17 00:00:00 2001
  18. From: Ariadne Conill <ariadne@dereferenced.org>
  19. Date: Fri, 21 Aug 2020 07:04:40 +0000
  20. Subject: [PATCH 25/30] use pure 64-bit configuration where appropriate
  22. ---
  23. gcc/config/aarch64/t-aarch64-linux | 2 +-
  24. gcc/config/i386/t-linux64 | 4 ++--
  25. gcc/config/rs6000/t-linux | 6 ++++--
  26. gcc/config/rs6000/t-linux64 | 4 ++--
  27. gcc/config/rs6000/t-linux64bele | 4 ++--
  28. gcc/config/rs6000/t-linux64lebe | 4 ++--
  29. gcc/config/s390/t-linux64 | 4 ++--
  30. 7 files changed, 15 insertions(+), 13 deletions(-)
  32. diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
  33. index 83e59e33b85..6ec56fdf6a8 100644
  34. --- a/gcc/config/aarch64/t-aarch64-linux
  35. +++ b/gcc/config/aarch64/t-aarch64-linux
  36. @@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm
  37. LIB1ASMFUNCS = _aarch64_sync_cache_range
  39. AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
  40. -MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
  41. +MULTILIB_OSDIRNAMES = mabi.lp64=../lib
  42. MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
  44. MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
  45. diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
  46. index 1171e218578..256f8c079ba 100644
  47. --- a/gcc/config/i386/t-linux64
  48. +++ b/gcc/config/i386/t-linux64
  49. @@ -33,6 +33,6 @@
  50. comma=,
  51. MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
  52. MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
  53. -MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
  54. -MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
  55. +MULTILIB_OSDIRNAMES = m64=../lib
  56. +MULTILIB_OSDIRNAMES+= m32=../lib32
  57. MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
  58. diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
  59. index aeb7440c492..ab14c455d8d 100644
  60. --- a/gcc/config/rs6000/t-linux
  61. +++ b/gcc/config/rs6000/t-linux
  62. @@ -2,7 +2,8 @@
  63. # or soft-float.
  64. ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
  65. ifneq (,$(findstring powerpc64,$(target)))
  66. -MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
  67. +MULTILIB_OSDIRNAMES := m64=../lib
  68. +MULTILIB_OSDIRNAMES += m32=../lib32
  69. else
  70. MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
  71. endif
  72. @@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target)))
  73. MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
  74. endif
  75. ifneq (,$(findstring powerpc64le,$(target)))
  76. -MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
  77. +MULTILIB_OSDIRNAMES := m64=../lib
  78. +MULTILIB_OSDIRNAMES += m32=../lib32
  79. endif
  80. endif
  82. diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
  83. index 264a7e27524..d1e460811cc 100644
  84. --- a/gcc/config/rs6000/t-linux64
  85. +++ b/gcc/config/rs6000/t-linux64
  86. @@ -28,8 +28,8 @@
  87. MULTILIB_OPTIONS := m64/m32
  88. MULTILIB_DIRNAMES := 64 32
  89. MULTILIB_EXTRA_OPTS :=
  90. -MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
  91. -MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
  92. +MULTILIB_OSDIRNAMES := m64=../lib
  93. +MULTILIB_OSDIRNAMES += m32=../lib32
  95. rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
  96. $(COMPILE) $<
  97. diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele
  98. index 97c1ee6fb4d..08d72639cb6 100644
  99. --- a/gcc/config/rs6000/t-linux64bele
  100. +++ b/gcc/config/rs6000/t-linux64bele
  101. @@ -2,6 +2,6 @@
  103. MULTILIB_OPTIONS += mlittle
  104. MULTILIB_DIRNAMES += le
  105. -MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
  106. -MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
  107. +MULTILIB_OSDIRNAMES = m64=../lib
  108. +MULTILIB_OSDIRNAMES+= m32=../lib32
  109. MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
  110. diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe
  111. index 2e63bdb9fc9..c6e1c5db65d 100644
  112. --- a/gcc/config/rs6000/t-linux64lebe
  113. +++ b/gcc/config/rs6000/t-linux64lebe
  114. @@ -2,6 +2,6 @@
  116. MULTILIB_OPTIONS += mbig
  117. MULTILIB_DIRNAMES += be
  118. -MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
  119. -MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
  120. +MULTILIB_OSDIRNAMES := m64=../lib
  121. +MULTILIB_OSDIRNAMES += m32=../lib32
  122. MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
  123. diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
  124. index cc6ab367072..7f498ee1cdc 100644
  125. --- a/gcc/config/s390/t-linux64
  126. +++ b/gcc/config/s390/t-linux64
  127. @@ -7,5 +7,5 @@
  129. MULTILIB_OPTIONS = m64/m31
  130. MULTILIB_DIRNAMES = 64 32
  131. -MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
  132. -MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
  133. +MULTILIB_OSDIRNAMES = m64=../lib
  134. +MULTILIB_OSDIRNAMES+= m32=../lib32
  135. --
  136. 2.27.0