mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 03:32:13 +02:00
gcc: Upgrade to GCC 14.1 release
This is major release upgrade. major changes are listed in [1] and it has a list of bugs [2] fixed as well This release may differ in significant ways from prior gcc releases where it may require port the code to gcc 14, there is a porting guide [3] available. [1] https://gcc.gnu.org/gcc-14/changes.html [2] https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=14.0 [3] https://gcc.gnu.org/gcc-14/porting_to.html (From OE-Core rev: fc48aa30e91ffe94f1012fe108fb1db5233a0bc0) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -190,7 +190,7 @@ RECIPE_MAINTAINER:pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <r
|
||||
RECIPE_MAINTAINER:pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-gcc-source-13.2.0 = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-gcc-source-14.1.0 = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>"
|
||||
RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
||||
RECIPE_MAINTAINER:pn-gdb = "Khem Raj <raj.khem@gmail.com>"
|
||||
|
||||
@@ -16,7 +16,7 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
|
||||
# Default libc config
|
||||
PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
|
||||
|
||||
GCCVERSION ?= "13.%"
|
||||
GCCVERSION ?= "14.%"
|
||||
SDKGCCVERSION ?= "${GCCVERSION}"
|
||||
BINUVERSION ?= "2.42%"
|
||||
GDBVERSION ?= "14.%"
|
||||
|
||||
@@ -2,11 +2,11 @@ require gcc-common.inc
|
||||
|
||||
# Third digit in PV should be incremented after a minor release
|
||||
|
||||
PV = "13.2.0"
|
||||
PV = "14.1.0"
|
||||
|
||||
# BINV should be incremented to a revision after a minor gcc release
|
||||
|
||||
BINV = "13.2.0"
|
||||
BINV = "14.1.0"
|
||||
|
||||
FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
|
||||
|
||||
@@ -28,16 +28,19 @@ LIC_FILES_CHKSUM = "\
|
||||
#SOURCEDIR = "gcc-${RELEASE}"
|
||||
#BASEURI ?= "https://repo.or.cz/official-gcc.git/snapshot/${RELEASE}.tar.gz;downloadfilename=gcc-${PV}-${RELEASE}.tar.gz"
|
||||
#SOURCEDIR ?= "official-gcc-${@'${RELEASE}'[0:7]}"
|
||||
#SRC_URI[sha256sum] = "41bf7be5dc029112a9df625266e7de030ffc36ff3638f270b180ae8c91fe6449"
|
||||
|
||||
# from snapshot
|
||||
#RELEASE ?= "13-20230520"
|
||||
#SOURCEDIR ?= "gcc-${RELEASE}"
|
||||
#RELEASE ?= "14-20240504"
|
||||
#BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz"
|
||||
#SOURCEDIR ?= "gcc-${RELEASE}"
|
||||
#SRC_URI[sha256sum] = "34ac232bbf31e0cd5752fd344c2cf55719aaaad2ca0096593e01c97a3d5e274e"
|
||||
|
||||
# official release
|
||||
RELEASE ?= "${PV}"
|
||||
BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz"
|
||||
SOURCEDIR ?= "gcc-${PV}"
|
||||
SRC_URI[sha256sum] = "e283c654987afe3de9d8080bc0bd79534b5ca0d681a73a11ff2b5d3767426840"
|
||||
|
||||
SRC_URI = "${BASEURI} \
|
||||
file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
|
||||
@@ -65,11 +68,7 @@ SRC_URI = "${BASEURI} \
|
||||
file://0023-Fix-install-path-of-linux64.h.patch \
|
||||
file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \
|
||||
file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \
|
||||
file://CVE-2023-4039.patch \
|
||||
file://0026-aarch64-Fix-loose-ldpstp-check-PR111411.patch \
|
||||
file://0027-Fix-gcc-vect-module-testcases.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da"
|
||||
|
||||
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}"
|
||||
B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
|
||||
@@ -116,4 +115,3 @@ EXTRA_OECONF_PATHS = "\
|
||||
"
|
||||
|
||||
CVE_STATUS[CVE-2021-37322] = "cpe-incorrect: Is a binutils 2.26 issue, not gcc"
|
||||
CVE_STATUS[CVE-2023-4039] = "fixed-version: Fixed via CVE-2023-4039.patch included here. Set the status explictly to deal with all recipes that share the gcc-source"
|
||||
@@ -1,4 +1,4 @@
|
||||
From 553564bdcabdcc5d4cc4de73c7eb94c505ef51f5 Mon Sep 17 00:00:00 2001
|
||||
From 76ef337260aadeb475fd380ff9aca31ea1731345 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 Mar 2013 08:37:11 +0400
|
||||
Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET
|
||||
@@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [embedded specific]
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 117a7ef23f2..535265253fd 100755
|
||||
index 02b435c1163..85a82fad302 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -10195,7 +10195,7 @@ fi
|
||||
@@ -10387,7 +10387,7 @@ fi
|
||||
# for target_alias and gcc doesn't manage it consistently.
|
||||
target_configargs="--cache-file=./config.cache ${target_configargs}"
|
||||
|
||||
@@ -25,10 +25,10 @@ index 117a7ef23f2..535265253fd 100755
|
||||
*" newlib "*)
|
||||
case " $target_configargs " in
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b3e9bbd2aa5..5ac8d6490f6 100644
|
||||
index 1a19c07a27b..bc8e1b8c4ef 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3351,7 +3351,7 @@ fi
|
||||
@@ -3509,7 +3509,7 @@ fi
|
||||
# for target_alias and gcc doesn't manage it consistently.
|
||||
target_configargs="--cache-file=./config.cache ${target_configargs}"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 52676b5934ba127c3af39fc484c8236c8fa60b96 Mon Sep 17 00:00:00 2001
|
||||
From 05be69910c99d739ce9246a3bb9426fa6d9f19d4 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 8 Mar 2021 16:04:20 -0800
|
||||
Subject: [PATCH] gcc: poison-system-directories
|
||||
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
7 files changed, 86 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/common.opt b/gcc/common.opt
|
||||
index 862c474d3c8..64c4277c991 100644
|
||||
index ad348844775..df3992b420d 100644
|
||||
--- a/gcc/common.opt
|
||||
+++ b/gcc/common.opt
|
||||
@@ -711,6 +711,10 @@ Wreturn-local-addr
|
||||
@@ -715,6 +715,10 @@ Wreturn-local-addr
|
||||
Common Var(warn_return_local_addr) Init(1) Warning
|
||||
Warn about returning a pointer/reference to a local or temporary variable.
|
||||
|
||||
@@ -40,10 +40,10 @@ index 862c474d3c8..64c4277c991 100644
|
||||
Common Var(warn_shadow) Warning
|
||||
Warn when one variable shadows another. Same as -Wshadow=global.
|
||||
diff --git a/gcc/config.in b/gcc/config.in
|
||||
index 4cad077bfbe..80e832fdb84 100644
|
||||
index f3de4ba6776..3ce3113510b 100644
|
||||
--- a/gcc/config.in
|
||||
+++ b/gcc/config.in
|
||||
@@ -236,6 +236,16 @@
|
||||
@@ -249,6 +249,16 @@
|
||||
#endif
|
||||
|
||||
|
||||
@@ -61,18 +61,18 @@ index 4cad077bfbe..80e832fdb84 100644
|
||||
optimizer and back end) to be checked for dynamic type safety at runtime.
|
||||
This is quite expensive. */
|
||||
diff --git a/gcc/configure b/gcc/configure
|
||||
index c7b26d1927d..3508be7b439 100755
|
||||
index 266ab8f84b2..3c346acbce0 100755
|
||||
--- a/gcc/configure
|
||||
+++ b/gcc/configure
|
||||
@@ -1026,6 +1026,7 @@ enable_maintainer_mode
|
||||
@@ -1050,6 +1050,7 @@ enable_maintainer_mode
|
||||
enable_link_mutex
|
||||
enable_link_serialization
|
||||
enable_version_specific_runtime_libs
|
||||
+enable_poison_system_directories
|
||||
enable_plugin
|
||||
enable_host_shared
|
||||
enable_libquadmath_support
|
||||
@@ -1788,6 +1789,8 @@ Optional Features:
|
||||
enable_host_pie
|
||||
@@ -1823,6 +1824,8 @@ Optional Features:
|
||||
--enable-version-specific-runtime-libs
|
||||
specify that runtime libraries should be installed
|
||||
in a compiler-specific directory
|
||||
@@ -80,8 +80,8 @@ index c7b26d1927d..3508be7b439 100755
|
||||
+ warn for use of native system header directories
|
||||
--enable-plugin enable plugin support
|
||||
--enable-host-shared build host code as shared libraries
|
||||
--disable-libquadmath-support
|
||||
@@ -31753,6 +31756,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
|
||||
--enable-host-pie build host code as PIE
|
||||
@@ -34020,6 +34023,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
|
||||
fi
|
||||
|
||||
|
||||
@@ -105,10 +105,10 @@ index c7b26d1927d..3508be7b439 100755
|
||||
|
||||
|
||||
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||
index 09082e8ccae..6cd01a8966b 100644
|
||||
index a5aec1bc967..4d8123085b8 100644
|
||||
--- a/gcc/configure.ac
|
||||
+++ b/gcc/configure.ac
|
||||
@@ -7292,6 +7292,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
|
||||
@@ -7518,6 +7518,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
|
||||
[specify that runtime libraries should be
|
||||
installed in a compiler-specific directory])])
|
||||
|
||||
@@ -132,10 +132,10 @@ index 09082e8ccae..6cd01a8966b 100644
|
||||
AC_SUBST(subdirs)
|
||||
AC_SUBST(srcdir)
|
||||
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
|
||||
index de40f62e219..d6f203c8b71 100644
|
||||
index 1006510fc6a..389155f8ed5 100644
|
||||
--- a/gcc/doc/invoke.texi
|
||||
+++ b/gcc/doc/invoke.texi
|
||||
@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
|
||||
@@ -391,6 +391,7 @@ Objective-C and Objective-C++ Dialects}.
|
||||
-Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded
|
||||
-Wparentheses -Wno-pedantic-ms-format
|
||||
-Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast
|
||||
@@ -143,7 +143,7 @@ index de40f62e219..d6f203c8b71 100644
|
||||
-Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls
|
||||
-Wrestrict -Wno-return-local-addr -Wreturn-type
|
||||
-Wno-scalar-storage-order -Wsequence-point
|
||||
@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment. But, for
|
||||
@@ -8860,6 +8861,14 @@ made up of data only and thus requires no special treatment. But, for
|
||||
most targets, it is made up of code and thus requires the stack to be
|
||||
made executable in order for the program to work properly.
|
||||
|
||||
@@ -159,19 +159,19 @@ index de40f62e219..d6f203c8b71 100644
|
||||
@opindex Wno-float-equal
|
||||
@item -Wfloat-equal
|
||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||
index 16bb07f2cdc..5feae021545 100644
|
||||
index 728332b8153..343e4915097 100644
|
||||
--- a/gcc/gcc.cc
|
||||
+++ b/gcc/gcc.cc
|
||||
@@ -1146,6 +1146,8 @@ proper position among the other output files. */
|
||||
@@ -1159,6 +1159,8 @@ proper position among the other output files. */
|
||||
"%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
|
||||
"%X %{o*} %{e*} %{N} %{n} %{r}\
|
||||
%{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
|
||||
+ %{Wno-poison-system-directories:--no-poison-system-directories} \
|
||||
+ %{Werror=poison-system-directories:--error-poison-system-directories} \
|
||||
%{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
|
||||
%{static|no-pie|static-pie:} %@{L*} %(link_libgcc) " \
|
||||
VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
|
||||
%{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
|
||||
@@ -1241,8 +1243,11 @@ static const char *cpp_unique_options =
|
||||
@@ -1260,8 +1262,11 @@ static const char *cpp_unique_options =
|
||||
static const char *cpp_options =
|
||||
"%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
|
||||
%{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
|
||||
@@ -186,7 +186,7 @@ index 16bb07f2cdc..5feae021545 100644
|
||||
/* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al.
|
||||
|
||||
diff --git a/gcc/incpath.cc b/gcc/incpath.cc
|
||||
index 4d44321183f..46c0d543205 100644
|
||||
index 64cdd2f4a1b..e572d98ab17 100644
|
||||
--- a/gcc/incpath.cc
|
||||
+++ b/gcc/incpath.cc
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From febfac59d0e8a864370d0b4018b4e497ceec156d Mon Sep 17 00:00:00 2001
|
||||
From 25bc008191c9b518f30e3ed87e204e25bdafb854 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 Mar 2013 09:10:06 +0400
|
||||
Subject: [PATCH] 64-bit multilib hack
|
||||
@@ -28,19 +28,17 @@ Upstream-Status: Inappropriate [OE-Specific]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
Signed-off-by: Zang Ruochen <zangruochen@loongson.cn>
|
||||
---
|
||||
gcc/config/aarch64/t-aarch64-linux | 8 ++++----
|
||||
gcc/config/arc/t-multilib-linux | 4 ++--
|
||||
gcc/config/i386/t-linux64 | 6 ++----
|
||||
gcc/config/mips/t-linux64 | 28 ++--------------------------
|
||||
gcc/config/riscv/t-linux | 4 ++--
|
||||
gcc/config/riscv/t-linux | 6 +++---
|
||||
gcc/config/rs6000/t-linux64 | 5 ++---
|
||||
gcc/config/loongarch/t-linux | 34 ++++++++++++++++++----------------
|
||||
7 files changed, 32 insertions(+), 57 deletions(-)
|
||||
6 files changed, 15 insertions(+), 42 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
|
||||
index 57bf4100fcd..aaef5da8059 100644
|
||||
index 3f7b786ecbb..a6c1c92fc7f 100644
|
||||
--- a/gcc/config/aarch64/t-aarch64-linux
|
||||
+++ b/gcc/config/aarch64/t-aarch64-linux
|
||||
@@ -21,8 +21,8 @@
|
||||
@@ -57,7 +55,7 @@ index 57bf4100fcd..aaef5da8059 100644
|
||||
-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
|
||||
+#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
|
||||
diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux
|
||||
index a839e4ea67c..f92664573a9 100644
|
||||
index 07bc77ba34a..f7e2e3919cf 100644
|
||||
--- a/gcc/config/arc/t-multilib-linux
|
||||
+++ b/gcc/config/arc/t-multilib-linux
|
||||
@@ -16,9 +16,9 @@
|
||||
@@ -73,7 +71,7 @@ index a839e4ea67c..f92664573a9 100644
|
||||
# Aliases:
|
||||
MULTILIB_MATCHES += mcpu?arc700=mA7
|
||||
diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
|
||||
index 138956b0962..d6e0cdc4342 100644
|
||||
index f9edc289e57..047d8e4aff9 100644
|
||||
--- a/gcc/config/i386/t-linux64
|
||||
+++ b/gcc/config/i386/t-linux64
|
||||
@@ -32,7 +32,5 @@
|
||||
@@ -87,7 +85,7 @@ index 138956b0962..d6e0cdc4342 100644
|
||||
+MULTILIB_DIRNAMES = . .
|
||||
+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
|
||||
diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
|
||||
index 176091cabb6..8258ef40559 100644
|
||||
index e4e2f5eaedb..c503974de37 100644
|
||||
--- a/gcc/config/mips/t-linux64
|
||||
+++ b/gcc/config/mips/t-linux64
|
||||
@@ -17,29 +17,5 @@
|
||||
@@ -123,17 +121,20 @@ index 176091cabb6..8258ef40559 100644
|
||||
+MULTILIB_DIRNAMES = . . .
|
||||
+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
|
||||
diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
|
||||
index 216d2776a18..e3c520f4bf6 100644
|
||||
index a6f64f88d25..0e21db58f7d 100644
|
||||
--- a/gcc/config/riscv/t-linux
|
||||
+++ b/gcc/config/riscv/t-linux
|
||||
@@ -1,3 +1,3 @@
|
||||
@@ -1,5 +1,5 @@
|
||||
# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
|
||||
-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
|
||||
-MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
|
||||
+#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
|
||||
+#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
|
||||
|
||||
-MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu)
|
||||
+#MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu)
|
||||
diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
|
||||
index 01a94242308..1429eceaebf 100644
|
||||
index 248b5891e36..379689561a7 100644
|
||||
--- a/gcc/config/rs6000/t-linux64
|
||||
+++ b/gcc/config/rs6000/t-linux64
|
||||
@@ -26,10 +26,9 @@
|
||||
@@ -149,53 +150,3 @@ index 01a94242308..1429eceaebf 100644
|
||||
|
||||
rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc
|
||||
$(COMPILE) $<
|
||||
diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
|
||||
index e40da1792..0c7ec9f8a 100644
|
||||
--- a/gcc/config/loongarch/t-linux
|
||||
+++ b/gcc/config/loongarch/t-linux
|
||||
@@ -18,7 +18,9 @@
|
||||
|
||||
# Multilib
|
||||
MULTILIB_OPTIONS = mabi=lp64d/mabi=lp64f/mabi=lp64s
|
||||
-MULTILIB_DIRNAMES = base/lp64d base/lp64f base/lp64s
|
||||
+#MULTILIB_DIRNAMES = base/lp64d base/lp64f base/lp64s
|
||||
+MULTILIB_DIRNAMES = . . .
|
||||
+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
|
||||
|
||||
# The GCC driver always gets all abi-related options on the command line.
|
||||
# (see loongarch-driver.c:driver_get_normalized_m_opts)
|
||||
@@ -36,18 +38,18 @@ else
|
||||
endif
|
||||
|
||||
# Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
|
||||
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
|
||||
-
|
||||
- MULTILIB_OSDIRNAMES = \
|
||||
- mabi.lp64d=../lib64$\
|
||||
- $(call if_multiarch,:loongarch64-linux-gnu)
|
||||
-
|
||||
- MULTILIB_OSDIRNAMES += \
|
||||
- mabi.lp64f=../lib64/f32$\
|
||||
- $(call if_multiarch,:loongarch64-linux-gnuf32)
|
||||
-
|
||||
- MULTILIB_OSDIRNAMES += \
|
||||
- mabi.lp64s=../lib64/sf$\
|
||||
- $(call if_multiarch,:loongarch64-linux-gnusf)
|
||||
-
|
||||
-endif
|
||||
+#ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
|
||||
+#
|
||||
+# MULTILIB_OSDIRNAMES = \
|
||||
+# mabi.lp64d=../lib64$\
|
||||
+# $(call if_multiarch,:loongarch64-linux-gnu)
|
||||
+#
|
||||
+# MULTILIB_OSDIRNAMES += \
|
||||
+# mabi.lp64f=../lib64/f32$\
|
||||
+# $(call if_multiarch,:loongarch64-linux-gnuf32)
|
||||
+#
|
||||
+# MULTILIB_OSDIRNAMES += \
|
||||
+# mabi.lp64s=../lib64/sf$\
|
||||
+# $(call if_multiarch,:loongarch64-linux-gnusf)
|
||||
+#
|
||||
+#endif
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6fbf920ccde6efc2d0caafde996d9e5738a1ba37 Mon Sep 17 00:00:00 2001
|
||||
From 5bef09b829ab8042acc045474cf10f4c4fb15dd5 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Thu, 28 Oct 2021 11:33:40 +0100
|
||||
Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these
|
||||
@@ -23,10 +23,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 06a9398e172..4b0069b257c 100644
|
||||
index db4fa6c6260..dee862be8a5 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -178,6 +178,7 @@ BUILD_EXPORTS = \
|
||||
@@ -179,6 +179,7 @@ BUILD_EXPORTS = \
|
||||
# built for the build system to override those in BASE_FLAGS_TO_PASS.
|
||||
EXTRA_BUILD_FLAGS = \
|
||||
CFLAGS="$(CFLAGS_FOR_BUILD)" \
|
||||
@@ -34,7 +34,7 @@ index 06a9398e172..4b0069b257c 100644
|
||||
LDFLAGS="$(LDFLAGS_FOR_BUILD)"
|
||||
|
||||
# This is the list of directories to built for the host system.
|
||||
@@ -210,6 +211,7 @@ HOST_EXPORTS = \
|
||||
@@ -211,6 +212,7 @@ HOST_EXPORTS = \
|
||||
CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \
|
||||
CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \
|
||||
CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \
|
||||
@@ -43,10 +43,10 @@ index 06a9398e172..4b0069b257c 100644
|
||||
DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \
|
||||
LD="$(LD)"; export LD; \
|
||||
diff --git a/Makefile.tpl b/Makefile.tpl
|
||||
index dfbd74b68f8..419b332953b 100644
|
||||
index 1d5813cd569..ff0fae53b0c 100644
|
||||
--- a/Makefile.tpl
|
||||
+++ b/Makefile.tpl
|
||||
@@ -181,6 +181,7 @@ BUILD_EXPORTS = \
|
||||
@@ -182,6 +182,7 @@ BUILD_EXPORTS = \
|
||||
# built for the build system to override those in BASE_FLAGS_TO_PASS.
|
||||
EXTRA_BUILD_FLAGS = \
|
||||
CFLAGS="$(CFLAGS_FOR_BUILD)" \
|
||||
@@ -54,7 +54,7 @@ index dfbd74b68f8..419b332953b 100644
|
||||
LDFLAGS="$(LDFLAGS_FOR_BUILD)"
|
||||
|
||||
# This is the list of directories to built for the host system.
|
||||
@@ -213,6 +214,7 @@ HOST_EXPORTS = \
|
||||
@@ -214,6 +215,7 @@ HOST_EXPORTS = \
|
||||
CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \
|
||||
CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \
|
||||
CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2cedf13819c0cc929660072d8a972f5e422f9701 Mon Sep 17 00:00:00 2001
|
||||
From fd3f513fa7e4f63a2b28b31ed5a4ddf8f5c543c0 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 Mar 2013 09:17:25 +0400
|
||||
Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}
|
||||
@@ -26,10 +26,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
4 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
|
||||
index 775aaa1b3c4..04f28984b34 100644
|
||||
index a74761b7ab3..956437df95b 100644
|
||||
--- a/gcc/Makefile.in
|
||||
+++ b/gcc/Makefile.in
|
||||
@@ -561,7 +561,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
|
||||
@@ -590,7 +590,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
|
||||
TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
|
||||
|
||||
xmake_file=@xmake_file@
|
||||
@@ -39,10 +39,10 @@ index 775aaa1b3c4..04f28984b34 100644
|
||||
TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
|
||||
TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
|
||||
diff --git a/gcc/configure b/gcc/configure
|
||||
index 3508be7b439..cf773a8b854 100755
|
||||
index 3c346acbce0..3870d6e9b6d 100755
|
||||
--- a/gcc/configure
|
||||
+++ b/gcc/configure
|
||||
@@ -13507,8 +13507,8 @@ for f in $tm_file; do
|
||||
@@ -15155,8 +15155,8 @@ for f in $tm_file; do
|
||||
tm_include_list="${tm_include_list} $f"
|
||||
;;
|
||||
defaults.h )
|
||||
@@ -54,10 +54,10 @@ index 3508be7b439..cf773a8b854 100755
|
||||
* )
|
||||
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
|
||||
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||
index 6cd01a8966b..22591478b72 100644
|
||||
index 4d8123085b8..15670de1706 100644
|
||||
--- a/gcc/configure.ac
|
||||
+++ b/gcc/configure.ac
|
||||
@@ -2357,8 +2357,8 @@ for f in $tm_file; do
|
||||
@@ -2383,8 +2383,8 @@ for f in $tm_file; do
|
||||
tm_include_list="${tm_include_list} $f"
|
||||
;;
|
||||
defaults.h )
|
||||
@@ -69,7 +69,7 @@ index 6cd01a8966b..22591478b72 100644
|
||||
* )
|
||||
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
|
||||
diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
|
||||
index 054ede89647..3b2c2b9df37 100644
|
||||
index 1b015b70b38..145af56745e 100644
|
||||
--- a/gcc/mkconfig.sh
|
||||
+++ b/gcc/mkconfig.sh
|
||||
@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f0b4d02a3a3dca1d67fd7add15ed63c2cd572bb9 Mon Sep 17 00:00:00 2001
|
||||
From 970960876045c99011658836f385c6f4d6d78fa6 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 Mar 2013 09:22:00 +0400
|
||||
Subject: [PATCH] cpp: honor sysroot.
|
||||
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
|
||||
index c591d155cc1..61927869fe1 100644
|
||||
index 7a7f5ff0ab5..fb3d88cdb11 100644
|
||||
--- a/gcc/cp/lang-specs.h
|
||||
+++ b/gcc/cp/lang-specs.h
|
||||
@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see
|
||||
@@ -39,11 +39,11 @@ index c591d155cc1..61927869fe1 100644
|
||||
" %{fmodule-only:%{!S:-o %g.s%V}}"
|
||||
" %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}"
|
||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||
index 5feae021545..8af0c814c33 100644
|
||||
index 343e4915097..e3e9374d1cc 100644
|
||||
--- a/gcc/gcc.cc
|
||||
+++ b/gcc/gcc.cc
|
||||
@@ -1468,7 +1468,7 @@ static const struct compiler default_compilers[] =
|
||||
%W{o*:--output-pch %*}}%V}}}}}}}", 0, 0, 0},
|
||||
@@ -1487,7 +1487,7 @@ static const struct compiler default_compilers[] =
|
||||
%W{o*:--output-pch %w%*}}%{!S:%V}}}}}}}}", 0, 0, 0},
|
||||
{".i", "@cpp-output", 0, 0, 0},
|
||||
{"@cpp-output",
|
||||
- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From aacfd6e14dd583b1fdc65691def61c5e1bc89708 Mon Sep 17 00:00:00 2001
|
||||
From bce0b7e2e130a069a93c839b856aa19b64d5ca54 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 Mar 2013 09:24:50 +0400
|
||||
Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
|
||||
@@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
18 files changed, 53 insertions(+), 58 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
|
||||
index 4277f03da2a..e4c92c03291 100644
|
||||
index 8e51c8202cc..732e4f4a477 100644
|
||||
--- a/gcc/config/aarch64/aarch64-linux.h
|
||||
+++ b/gcc/config/aarch64/aarch64-linux.h
|
||||
@@ -21,10 +21,10 @@
|
||||
@@ -53,7 +53,7 @@ index 4277f03da2a..e4c92c03291 100644
|
||||
#undef ASAN_CC1_SPEC
|
||||
#define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
|
||||
diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
|
||||
index 03f783f2ad1..4fa02668aa7 100644
|
||||
index 40ccf0bd9b4..ab5c59655fc 100644
|
||||
--- a/gcc/config/alpha/linux-elf.h
|
||||
+++ b/gcc/config/alpha/linux-elf.h
|
||||
@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see
|
||||
@@ -68,7 +68,7 @@ index 03f783f2ad1..4fa02668aa7 100644
|
||||
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
|
||||
#elif DEFAULT_LIBC == LIBC_GLIBC
|
||||
diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
|
||||
index a119875599d..dce7f59eeea 100644
|
||||
index eef791f6a02..335cb4c3607 100644
|
||||
--- a/gcc/config/arm/linux-eabi.h
|
||||
+++ b/gcc/config/arm/linux-eabi.h
|
||||
@@ -62,8 +62,8 @@
|
||||
@@ -92,7 +92,7 @@ index a119875599d..dce7f59eeea 100644
|
||||
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
|
||||
use the GNU/Linux version, not the generic BPABI version. */
|
||||
diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
|
||||
index 7b7b7cbbe14..98ef2267117 100644
|
||||
index ccae8abf6f6..ea421d03891 100644
|
||||
--- a/gcc/config/arm/linux-elf.h
|
||||
+++ b/gcc/config/arm/linux-elf.h
|
||||
@@ -60,7 +60,7 @@
|
||||
@@ -105,7 +105,7 @@ index 7b7b7cbbe14..98ef2267117 100644
|
||||
#define LINUX_TARGET_LINK_SPEC "%{h*} \
|
||||
%{static:-Bstatic} \
|
||||
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
|
||||
index bbb7cc7115e..7d9272040ee 100644
|
||||
index 20a96d56e65..7a7a4f873e4 100644
|
||||
--- a/gcc/config/i386/linux.h
|
||||
+++ b/gcc/config/i386/linux.h
|
||||
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see
|
||||
@@ -119,7 +119,7 @@ index bbb7cc7115e..7d9272040ee 100644
|
||||
-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
|
||||
+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1"
|
||||
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
|
||||
index 2bd9f48e271..dbbe7ca5440 100644
|
||||
index 3dd23eef5e5..960cd7c0450 100644
|
||||
--- a/gcc/config/i386/linux64.h
|
||||
+++ b/gcc/config/i386/linux64.h
|
||||
@@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
@@ -143,7 +143,7 @@ index 2bd9f48e271..dbbe7ca5440 100644
|
||||
-#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
|
||||
+#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1"
|
||||
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
|
||||
index e3aca79cccc..6491c6b84f5 100644
|
||||
index a7248ac90d0..e36f32bf59e 100644
|
||||
--- a/gcc/config/linux.h
|
||||
+++ b/gcc/config/linux.h
|
||||
@@ -86,10 +86,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
@@ -162,25 +162,29 @@ index e3aca79cccc..6491c6b84f5 100644
|
||||
#define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
|
||||
#define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
|
||||
diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h
|
||||
index aecaa02a199..62f88f7f9a2 100644
|
||||
index e5d84e180e3..98cb49c189f 100644
|
||||
--- a/gcc/config/loongarch/gnu-user.h
|
||||
+++ b/gcc/config/loongarch/gnu-user.h
|
||||
@@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. If not see
|
||||
@@ -31,7 +31,7 @@ along with GCC; see the file COPYING3. If not see
|
||||
|
||||
#undef GLIBC_DYNAMIC_LINKER
|
||||
#define GLIBC_DYNAMIC_LINKER \
|
||||
- "/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1"
|
||||
+ SYSTEMLIBS_DIR "ld-linux-loongarch-" ABI_SPEC ".so.1"
|
||||
|
||||
#define MUSL_ABI_SPEC \
|
||||
"%{mabi=lp64d:}" \
|
||||
@@ -40,7 +40,7 @@ along with GCC; see the file COPYING3. If not see
|
||||
|
||||
#undef MUSL_DYNAMIC_LINKER
|
||||
#define MUSL_DYNAMIC_LINKER \
|
||||
- "/lib" ABI_GRLEN_SPEC "/ld-musl-loongarch-" ABI_SPEC ".so.1"
|
||||
+ SYSTEMLIBS_DIR "ld-musl-loongarch-" ABI_SPEC ".so.1"
|
||||
- "/lib/ld-musl-loongarch" ABI_GRLEN_SPEC MUSL_ABI_SPEC ".so.1"
|
||||
+ SYSTEMLIBS_DIR "ld-musl-loongarch" ABI_GRLEN_SPEC MUSL_ABI_SPEC ".so.1"
|
||||
|
||||
#undef GNU_USER_TARGET_LINK_SPEC
|
||||
#define GNU_USER_TARGET_LINK_SPEC \
|
||||
diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h
|
||||
index e2e2c421c52..6f26480e3b5 100644
|
||||
index 5ed8ee518be..5553e7cac21 100644
|
||||
--- a/gcc/config/microblaze/linux.h
|
||||
+++ b/gcc/config/microblaze/linux.h
|
||||
@@ -28,7 +28,7 @@
|
||||
@@ -202,7 +206,7 @@ index e2e2c421c52..6f26480e3b5 100644
|
||||
#undef SUBTARGET_EXTRA_SPECS
|
||||
#define SUBTARGET_EXTRA_SPECS \
|
||||
diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
|
||||
index 5add34ea134..34692b433b8 100644
|
||||
index 8d098dd2f44..1c5ebbd26d5 100644
|
||||
--- a/gcc/config/mips/linux.h
|
||||
+++ b/gcc/config/mips/linux.h
|
||||
@@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. If not see
|
||||
@@ -245,7 +249,7 @@ index 5add34ea134..34692b433b8 100644
|
||||
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
|
||||
#define GNU_USER_DYNAMIC_LINKERN32 \
|
||||
diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h
|
||||
index 2ce097ebbce..1d45d7b4962 100644
|
||||
index 06c442e85f4..b21a3c076c9 100644
|
||||
--- a/gcc/config/nios2/linux.h
|
||||
+++ b/gcc/config/nios2/linux.h
|
||||
@@ -29,10 +29,10 @@
|
||||
@@ -262,7 +266,7 @@ index 2ce097ebbce..1d45d7b4962 100644
|
||||
#undef LINK_SPEC
|
||||
#define LINK_SPEC LINK_SPEC_ENDIAN \
|
||||
diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
|
||||
index 3e625e0f867..dc3afc97e27 100644
|
||||
index 15851f653bc..d8aaab9631f 100644
|
||||
--- a/gcc/config/riscv/linux.h
|
||||
+++ b/gcc/config/riscv/linux.h
|
||||
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see
|
||||
@@ -284,10 +288,10 @@ index 3e625e0f867..dc3afc97e27 100644
|
||||
#define ICACHE_FLUSH_FUNC "__riscv_flush_icache"
|
||||
|
||||
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
|
||||
index 9e457033d11..2ddab7c99c1 100644
|
||||
index 655d1054d76..a11ae7643b7 100644
|
||||
--- a/gcc/config/rs6000/linux64.h
|
||||
+++ b/gcc/config/rs6000/linux64.h
|
||||
@@ -339,24 +339,19 @@ extern int dot_symbols;
|
||||
@@ -340,24 +340,19 @@ extern int dot_symbols;
|
||||
#undef LINK_OS_DEFAULT_SPEC
|
||||
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
|
||||
|
||||
@@ -318,7 +322,7 @@ index 9e457033d11..2ddab7c99c1 100644
|
||||
#undef DEFAULT_ASM_ENDIAN
|
||||
#if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
|
||||
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
||||
index ae932fc22f0..26db003cb3a 100644
|
||||
index bcafa9d0cf4..8fda952e69c 100644
|
||||
--- a/gcc/config/rs6000/sysv4.h
|
||||
+++ b/gcc/config/rs6000/sysv4.h
|
||||
@@ -771,10 +771,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
@@ -335,7 +339,7 @@ index ae932fc22f0..26db003cb3a 100644
|
||||
#ifndef GNU_USER_DYNAMIC_LINKER
|
||||
#define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
|
||||
diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
|
||||
index 02aa1edaff8..fab268d61f4 100644
|
||||
index 83ea2f669a0..bc7cffbad3f 100644
|
||||
--- a/gcc/config/s390/linux.h
|
||||
+++ b/gcc/config/s390/linux.h
|
||||
@@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. If not see
|
||||
@@ -357,7 +361,7 @@ index 02aa1edaff8..fab268d61f4 100644
|
||||
#undef LINK_SPEC
|
||||
#define LINK_SPEC \
|
||||
diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
|
||||
index 29f5902b98b..83d1e53e6e2 100644
|
||||
index 34cbbed633f..14000d3394c 100644
|
||||
--- a/gcc/config/sh/linux.h
|
||||
+++ b/gcc/config/sh/linux.h
|
||||
@@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. If not see
|
||||
@@ -374,7 +378,7 @@ index 29f5902b98b..83d1e53e6e2 100644
|
||||
#undef SUBTARGET_LINK_EMUL_SUFFIX
|
||||
#define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
|
||||
diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
|
||||
index 0e33b3cac2c..84f29adbb35 100644
|
||||
index 9646fa9c41e..396fb047fac 100644
|
||||
--- a/gcc/config/sparc/linux.h
|
||||
+++ b/gcc/config/sparc/linux.h
|
||||
@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||
@@ -387,7 +391,7 @@ index 0e33b3cac2c..84f29adbb35 100644
|
||||
#undef LINK_SPEC
|
||||
#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
|
||||
diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
|
||||
index f1cc0a19e49..94bc2032803 100644
|
||||
index 1e2e4aef2ad..25fcc37eca2 100644
|
||||
--- a/gcc/config/sparc/linux64.h
|
||||
+++ b/gcc/config/sparc/linux64.h
|
||||
@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7608e93ab97e8c33e3b14323d0cabc651926e403 Mon Sep 17 00:00:00 2001
|
||||
From 869295f6f1095b6334c1ea34f8d11a676c67e256 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 Mar 2013 09:29:11 +0400
|
||||
Subject: [PATCH] libtool
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4b0efc18e0d91967a3db11d9ef0595a5a76ad67a Mon Sep 17 00:00:00 2001
|
||||
From 19279e08417124b4567fafdf9300b779ce1a1e1c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 Mar 2013 09:30:32 +0400
|
||||
Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI.
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
|
||||
index dce7f59eeea..27402c629c6 100644
|
||||
index 335cb4c3607..1d5235075cb 100644
|
||||
--- a/gcc/config/arm/linux-eabi.h
|
||||
+++ b/gcc/config/arm/linux-eabi.h
|
||||
@@ -88,10 +88,14 @@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b015460586e2ea8a35a11d1a607728707bdf6509 Mon Sep 17 00:00:00 2001
|
||||
From 7e5706e74643d8bf78b117620849e546a31295c5 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 29 Mar 2013 09:33:04 +0400
|
||||
Subject: [PATCH] Use the multilib config files from ${B} instead of using the
|
||||
@@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration]
|
||||
2 files changed, 36 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/gcc/configure b/gcc/configure
|
||||
index cf773a8b854..448a1ec093e 100755
|
||||
index 3870d6e9b6d..07a0b8571d2 100755
|
||||
--- a/gcc/configure
|
||||
+++ b/gcc/configure
|
||||
@@ -13487,10 +13487,20 @@ done
|
||||
@@ -15135,10 +15135,20 @@ done
|
||||
tmake_file_=
|
||||
for f in ${tmake_file}
|
||||
do
|
||||
@@ -46,7 +46,7 @@ index cf773a8b854..448a1ec093e 100755
|
||||
done
|
||||
tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
|
||||
|
||||
@@ -13501,6 +13511,10 @@ tm_file_list="options.h"
|
||||
@@ -15149,6 +15159,10 @@ tm_file_list="options.h"
|
||||
tm_include_list="options.h insn-constants.h"
|
||||
for f in $tm_file; do
|
||||
case $f in
|
||||
@@ -58,10 +58,10 @@ index cf773a8b854..448a1ec093e 100755
|
||||
f=`echo $f | sed 's/^..//'`
|
||||
tm_file_list="${tm_file_list} $f"
|
||||
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||
index 22591478b72..b6e7f5149a7 100644
|
||||
index 15670de1706..fd96dd7ba49 100644
|
||||
--- a/gcc/configure.ac
|
||||
+++ b/gcc/configure.ac
|
||||
@@ -2337,10 +2337,20 @@ done
|
||||
@@ -2363,10 +2363,20 @@ done
|
||||
tmake_file_=
|
||||
for f in ${tmake_file}
|
||||
do
|
||||
@@ -86,7 +86,7 @@ index 22591478b72..b6e7f5149a7 100644
|
||||
done
|
||||
tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
|
||||
|
||||
@@ -2351,6 +2361,10 @@ tm_file_list="options.h"
|
||||
@@ -2377,6 +2387,10 @@ tm_file_list="options.h"
|
||||
tm_include_list="options.h insn-constants.h"
|
||||
for f in $tm_file; do
|
||||
case $f in
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b7ce05b2d969b311c6061bda32c3117c76bf7e0c Mon Sep 17 00:00:00 2001
|
||||
From 0671715ae6d411b5d2d4c53fee42a6e9fe2562c2 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 31 Jan 2023 22:03:38 -0800
|
||||
Subject: [PATCH] aarch64: Fix include paths when S != B
|
||||
@@ -24,32 +24,44 @@ Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
gcc/config/aarch64/aarch64.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
gcc/config/aarch64/aarch64.h | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||||
index 73b09e20508..10ea3672f20 100644
|
||||
index 45e901cda64..591062d4b39 100644
|
||||
--- a/gcc/config/aarch64/aarch64.h
|
||||
+++ b/gcc/config/aarch64/aarch64.h
|
||||
@@ -161,8 +161,8 @@
|
||||
enum class aarch64_feature : unsigned char {
|
||||
@@ -170,9 +170,9 @@ enum class aarch64_feature : unsigned char {
|
||||
#define DEF_AARCH64_ISA_MODE(IDENT) IDENT,
|
||||
#define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) IDENT,
|
||||
#define AARCH64_ARCH(A, B, IDENT, D, E) IDENT,
|
||||
-#include "aarch64-isa-modes.def"
|
||||
-#include "aarch64-option-extensions.def"
|
||||
-#include "aarch64-arches.def"
|
||||
+#include "config/aarch64/aarch64-isa-modes.def"
|
||||
+#include "config/aarch64/aarch64-option-extensions.def"
|
||||
+#include "config/aarch64/aarch64-arches.def"
|
||||
};
|
||||
|
||||
/* Define unique flags for each of the above. */
|
||||
@@ -171,8 +171,8 @@ enum class aarch64_feature : unsigned char {
|
||||
= aarch64_feature_flags (1) << int (aarch64_feature::IDENT);
|
||||
@@ -182,16 +182,16 @@ enum class aarch64_feature : unsigned char {
|
||||
#define DEF_AARCH64_ISA_MODE(IDENT) HANDLE (IDENT)
|
||||
#define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) HANDLE (IDENT)
|
||||
#define AARCH64_ARCH(A, B, IDENT, D, E) HANDLE (IDENT)
|
||||
-#include "aarch64-isa-modes.def"
|
||||
-#include "aarch64-option-extensions.def"
|
||||
-#include "aarch64-arches.def"
|
||||
+#include "config/aarch64/aarch64-isa-modes.def"
|
||||
+#include "config/aarch64/aarch64-option-extensions.def"
|
||||
+#include "config/aarch64/aarch64-arches.def"
|
||||
#undef HANDLE
|
||||
|
||||
#endif
|
||||
constexpr auto AARCH64_FL_SM_STATE = AARCH64_FL_SM_ON | AARCH64_FL_SM_OFF;
|
||||
|
||||
constexpr unsigned int AARCH64_NUM_ISA_MODES = (0
|
||||
#define DEF_AARCH64_ISA_MODE(IDENT) + 1
|
||||
-#include "aarch64-isa-modes.def"
|
||||
+#include "config/aarch64/aarch64-isa-modes.def"
|
||||
);
|
||||
|
||||
/* The mask of all ISA modes. */
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 39ab6fe76f2788b2c989d29c9016f1fe53cb736e Mon Sep 17 00:00:00 2001
|
||||
From a40108180f552788bb321a853ed4d5f034866a48 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 20 Feb 2015 09:39:38 +0000
|
||||
Subject: [PATCH] Avoid using libdir from .la which usually points to a host
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 531b9df680c4380797e8e7705a8e7f8ed17ebe68 Mon Sep 17 00:00:00 2001
|
||||
From 6ad8db533c7d53a85e6280da1ad88ed4077258fb Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 20 Feb 2015 10:25:11 +0000
|
||||
Subject: [PATCH] Ensure target gcc headers can be included
|
||||
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
4 files changed, 22 insertions(+)
|
||||
|
||||
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
|
||||
index 04f28984b34..8ef996c0f4d 100644
|
||||
index 956437df95b..6a009c696e9 100644
|
||||
--- a/gcc/Makefile.in
|
||||
+++ b/gcc/Makefile.in
|
||||
@@ -640,6 +640,7 @@ libexecdir = @libexecdir@
|
||||
@@ -671,6 +671,7 @@ libexecdir = @libexecdir@
|
||||
|
||||
# Directory in which the compiler finds libraries etc.
|
||||
libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
|
||||
@@ -36,7 +36,7 @@ index 04f28984b34..8ef996c0f4d 100644
|
||||
# Directory in which the compiler finds executables
|
||||
libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
|
||||
# Directory in which all plugin resources are installed
|
||||
@@ -3059,6 +3060,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
|
||||
@@ -3199,6 +3200,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
|
||||
|
||||
PREPROCESSOR_DEFINES = \
|
||||
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
|
||||
@@ -45,7 +45,7 @@ index 04f28984b34..8ef996c0f4d 100644
|
||||
-DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
|
||||
-DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
|
||||
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
|
||||
index 6491c6b84f5..57496ff1f2f 100644
|
||||
index e36f32bf59e..c6aada42eb7 100644
|
||||
--- a/gcc/config/linux.h
|
||||
+++ b/gcc/config/linux.h
|
||||
@@ -157,6 +157,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
@@ -71,7 +71,7 @@ index 6491c6b84f5..57496ff1f2f 100644
|
||||
{ GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
|
||||
{ 0, 0, 0, 0, 0, 0 } \
|
||||
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
||||
index 26db003cb3a..3a443abcf6b 100644
|
||||
index 8fda952e69c..247acec9d8e 100644
|
||||
--- a/gcc/config/rs6000/sysv4.h
|
||||
+++ b/gcc/config/rs6000/sysv4.h
|
||||
@@ -986,6 +986,13 @@ ncrtn.o%s"
|
||||
@@ -97,7 +97,7 @@ index 26db003cb3a..3a443abcf6b 100644
|
||||
{ GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
|
||||
{ 0, 0, 0, 0, 0, 0 } \
|
||||
diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc
|
||||
index 141bb4d25f6..734590a7059 100644
|
||||
index f82b4badad7..98bd66f95c6 100644
|
||||
--- a/gcc/cppdefault.cc
|
||||
+++ b/gcc/cppdefault.cc
|
||||
@@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 793201cebfeb129f6f263e64310b30a0ffa48895 Mon Sep 17 00:00:00 2001
|
||||
From e0d53bf9d59438a1dce0774163fa8c41cf32f306 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 3 Mar 2015 08:21:19 +0000
|
||||
Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5de63874335c1c673dd132f6aca00dc13f1eac51 Mon Sep 17 00:00:00 2001
|
||||
From c2ea8aaa7b00c519c9c269c23ff840138ae491ac Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Sun, 5 Jul 2015 20:25:18 -0700
|
||||
Subject: [PATCH] libcc1: fix libcc1's install path and rpath
|
||||
@@ -20,7 +20,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
|
||||
index 921a33fe236..938e6f964cd 100644
|
||||
index b592bc8645f..97e2b615fb7 100644
|
||||
--- a/libcc1/Makefile.am
|
||||
+++ b/libcc1/Makefile.am
|
||||
@@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bbc75b93bff66891fa7ffb3af5c6ad53df1fff68 Mon Sep 17 00:00:00 2001
|
||||
From 82da570396a6835e7208c8bb508220524b3a07c7 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 7 Dec 2015 23:39:54 +0000
|
||||
Subject: [PATCH] handle sysroot support for nativesdk-gcc
|
||||
@@ -46,10 +46,10 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
|
||||
8 files changed, 95 insertions(+), 73 deletions(-)
|
||||
|
||||
diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc
|
||||
index c68a2a27469..77e9b5eceaa 100644
|
||||
index be3058dca63..0be85374760 100644
|
||||
--- a/gcc/c-family/c-opts.cc
|
||||
+++ b/gcc/c-family/c-opts.cc
|
||||
@@ -1458,8 +1458,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain)
|
||||
@@ -1542,8 +1542,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain)
|
||||
size_t prefix_len, suffix_len;
|
||||
|
||||
suffix_len = strlen (suffix);
|
||||
@@ -61,7 +61,7 @@ index c68a2a27469..77e9b5eceaa 100644
|
||||
path = (char *) xmalloc (prefix_len + suffix_len + 1);
|
||||
memcpy (path, prefix, prefix_len);
|
||||
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
|
||||
index 57496ff1f2f..c921cf6ef63 100644
|
||||
index c6aada42eb7..79ff13184d3 100644
|
||||
--- a/gcc/config/linux.h
|
||||
+++ b/gcc/config/linux.h
|
||||
@@ -121,53 +121,53 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
@@ -139,7 +139,7 @@ index 57496ff1f2f..c921cf6ef63 100644
|
||||
}
|
||||
#endif
|
||||
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
||||
index 3a443abcf6b..ef83a5a432e 100644
|
||||
index 247acec9d8e..5526bf050b8 100644
|
||||
--- a/gcc/config/rs6000/sysv4.h
|
||||
+++ b/gcc/config/rs6000/sysv4.h
|
||||
@@ -950,53 +950,53 @@ ncrtn.o%s"
|
||||
@@ -217,7 +217,7 @@ index 3a443abcf6b..ef83a5a432e 100644
|
||||
}
|
||||
#endif
|
||||
diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc
|
||||
index 734590a7059..b4a8fc29e4a 100644
|
||||
index 98bd66f95c6..742a4e56d5b 100644
|
||||
--- a/gcc/cppdefault.cc
|
||||
+++ b/gcc/cppdefault.cc
|
||||
@@ -35,6 +35,30 @@
|
||||
@@ -347,7 +347,7 @@ index 734590a7059..b4a8fc29e4a 100644
|
||||
/* This value is set by cpp_relocated at runtime */
|
||||
const char *gcc_exec_prefix;
|
||||
diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
|
||||
index e26b424e99c..c9abb090dcd 100644
|
||||
index e9b9264caff..168144b84b8 100644
|
||||
--- a/gcc/cppdefault.h
|
||||
+++ b/gcc/cppdefault.h
|
||||
@@ -33,7 +33,8 @@
|
||||
@@ -382,10 +382,10 @@ index e26b424e99c..c9abb090dcd 100644
|
||||
subdirectory of the actual installation. */
|
||||
extern const char *gcc_exec_prefix;
|
||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||
index 8af0c814c33..605fe3b8c0d 100644
|
||||
index e3e9374d1cc..b080609341b 100644
|
||||
--- a/gcc/gcc.cc
|
||||
+++ b/gcc/gcc.cc
|
||||
@@ -255,6 +255,8 @@ FILE *report_times_to_file = NULL;
|
||||
@@ -259,6 +259,8 @@ FILE *report_times_to_file = NULL;
|
||||
#endif
|
||||
static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT;
|
||||
|
||||
@@ -394,7 +394,7 @@ index 8af0c814c33..605fe3b8c0d 100644
|
||||
/* Nonzero means pass the updated target_system_root to the compiler. */
|
||||
|
||||
static int target_system_root_changed;
|
||||
@@ -578,6 +580,7 @@ or with constant text in a single argument.
|
||||
@@ -591,6 +593,7 @@ or with constant text in a single argument.
|
||||
%G process LIBGCC_SPEC as a spec.
|
||||
%R Output the concatenation of target_system_root and
|
||||
target_sysroot_suffix.
|
||||
@@ -402,7 +402,7 @@ index 8af0c814c33..605fe3b8c0d 100644
|
||||
%S process STARTFILE_SPEC as a spec. A capital S is actually used here.
|
||||
%E process ENDFILE_SPEC as a spec. A capital E is actually used here.
|
||||
%C process CPP_SPEC as a spec.
|
||||
@@ -1619,10 +1622,10 @@ static const char *gcc_libexec_prefix;
|
||||
@@ -1638,10 +1641,10 @@ static const char *gcc_libexec_prefix;
|
||||
gcc_exec_prefix is set because, in that case, we know where the
|
||||
compiler has been installed, and use paths relative to that
|
||||
location instead. */
|
||||
@@ -417,7 +417,7 @@ index 8af0c814c33..605fe3b8c0d 100644
|
||||
|
||||
/* For native compilers, these are well-known paths containing
|
||||
components that may be provided by the system. For cross
|
||||
@@ -1630,9 +1633,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
|
||||
@@ -1649,9 +1652,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
|
||||
static const char *md_exec_prefix = MD_EXEC_PREFIX;
|
||||
static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
|
||||
static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
|
||||
@@ -429,7 +429,7 @@ index 8af0c814c33..605fe3b8c0d 100644
|
||||
= STANDARD_STARTFILE_PREFIX_2;
|
||||
|
||||
/* A relative path to be used in finding the location of tools
|
||||
@@ -6652,6 +6655,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
|
||||
@@ -6796,6 +6799,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -442,7 +442,7 @@ index 8af0c814c33..605fe3b8c0d 100644
|
||||
value = do_spec_1 (startfile_spec, 0, NULL);
|
||||
if (value != 0)
|
||||
diff --git a/gcc/incpath.cc b/gcc/incpath.cc
|
||||
index 46c0d543205..d088dae7b04 100644
|
||||
index e572d98ab17..2cb2b586e4a 100644
|
||||
--- a/gcc/incpath.cc
|
||||
+++ b/gcc/incpath.cc
|
||||
@@ -135,7 +135,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
|
||||
@@ -489,7 +489,7 @@ index 46c0d543205..d088dae7b04 100644
|
||||
str = update_path (ostr, p->component);
|
||||
free (ostr);
|
||||
diff --git a/gcc/prefix.cc b/gcc/prefix.cc
|
||||
index c2a37bde5ea..33944701ced 100644
|
||||
index 6a98e856855..c403b2da7a3 100644
|
||||
--- a/gcc/prefix.cc
|
||||
+++ b/gcc/prefix.cc
|
||||
@@ -73,7 +73,9 @@ License along with GCC; see the file COPYING3. If not see
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7e095089452b6e895ec40981752e9f902f0ad889 Mon Sep 17 00:00:00 2001
|
||||
From cafcdfea0526dda5377a999dd9b1b8c805eafe0a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 7 Dec 2015 23:41:45 +0000
|
||||
Subject: [PATCH] Search target sysroot gcc version specific dirs with
|
||||
@@ -52,10 +52,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 28 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||
index 605fe3b8c0d..c3a1dab38c4 100644
|
||||
index b080609341b..1a1ca05064e 100644
|
||||
--- a/gcc/gcc.cc
|
||||
+++ b/gcc/gcc.cc
|
||||
@@ -2809,7 +2809,7 @@ for_each_path (const struct path_prefix *paths,
|
||||
@@ -2823,7 +2823,7 @@ for_each_path (const struct path_prefix *paths,
|
||||
if (path == NULL)
|
||||
{
|
||||
len = paths->max_len + extra_space + 1;
|
||||
@@ -64,7 +64,7 @@ index 605fe3b8c0d..c3a1dab38c4 100644
|
||||
path = XNEWVEC (char, len);
|
||||
}
|
||||
|
||||
@@ -2821,6 +2821,33 @@ for_each_path (const struct path_prefix *paths,
|
||||
@@ -2835,6 +2835,33 @@ for_each_path (const struct path_prefix *paths,
|
||||
/* Look first in MACHINE/VERSION subdirectory. */
|
||||
if (!skip_multi_dir)
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bf92b290556b7050df0a001cc7ae43cf79990456 Mon Sep 17 00:00:00 2001
|
||||
From f2ad66276fd197cc088d7316662b1d792357ef6c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 27 Jun 2017 18:10:54 -0700
|
||||
Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets
|
||||
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
3 files changed, 27 insertions(+)
|
||||
|
||||
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
|
||||
index c921cf6ef63..32e1bc1ae2d 100644
|
||||
index 79ff13184d3..19f552e8c7d 100644
|
||||
--- a/gcc/config/linux.h
|
||||
+++ b/gcc/config/linux.h
|
||||
@@ -195,6 +195,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
@@ -41,10 +41,10 @@ index c921cf6ef63..32e1bc1ae2d 100644
|
||||
|
||||
#if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
|
||||
diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
|
||||
index 5d21befe8e4..1248a68e4ca 100644
|
||||
index 5f6cede558a..900993b6da4 100644
|
||||
--- a/gcc/config/rs6000/linux.h
|
||||
+++ b/gcc/config/rs6000/linux.h
|
||||
@@ -99,6 +99,16 @@
|
||||
@@ -102,6 +102,16 @@
|
||||
" -m elf32ppclinux")
|
||||
#endif
|
||||
|
||||
@@ -62,10 +62,10 @@ index 5d21befe8e4..1248a68e4ca 100644
|
||||
#define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \
|
||||
%{!static-pie: \
|
||||
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
|
||||
index 2ddab7c99c1..9641580fc83 100644
|
||||
index a11ae7643b7..2abde270813 100644
|
||||
--- a/gcc/config/rs6000/linux64.h
|
||||
+++ b/gcc/config/rs6000/linux64.h
|
||||
@@ -372,6 +372,16 @@ extern int dot_symbols;
|
||||
@@ -373,6 +373,16 @@ extern int dot_symbols;
|
||||
" -m elf64ppc")
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 587ac4a59ea56da18a9989c31a75124e974cb37c Mon Sep 17 00:00:00 2001
|
||||
From 65baa3804819fbcd540be48f4c4611be5cba43c4 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 6 Jun 2018 12:10:22 -0700
|
||||
Subject: [PATCH] Re-introduce spe commandline options
|
||||
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
|
||||
index bde6d3ff664..5af9640825c 100644
|
||||
index 83197681b66..04bea50b894 100644
|
||||
--- a/gcc/config/rs6000/rs6000.opt
|
||||
+++ b/gcc/config/rs6000/rs6000.opt
|
||||
@@ -344,6 +344,19 @@ mdebug=
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8c4c59521720f8c1b1e38e38896b47fcb1bf00ac Mon Sep 17 00:00:00 2001
|
||||
From 18b0057e4e2c5cf6fc6541670418f43f0381db3e Mon Sep 17 00:00:00 2001
|
||||
From: Szabolcs Nagy <nsz@port70.net>
|
||||
Date: Sat, 24 Oct 2015 20:09:53 +0000
|
||||
Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of
|
||||
@@ -39,10 +39,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
|
||||
index 0d817fc3f3b..8d34d19d3f9 100644
|
||||
index 8bb8f21e686..bcf976aa1b9 100644
|
||||
--- a/gcc/config/i386/i386-expand.cc
|
||||
+++ b/gcc/config/i386/i386-expand.cc
|
||||
@@ -12691,10 +12691,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
|
||||
@@ -13087,10 +13087,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
|
||||
{
|
||||
case IX86_BUILTIN_CPU_INIT:
|
||||
{
|
||||
@@ -56,7 +56,7 @@ index 0d817fc3f3b..8d34d19d3f9 100644
|
||||
return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
|
||||
}
|
||||
diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
|
||||
index 50b6d8248a2..724ced402a1 100644
|
||||
index 0bd6dffe17e..ef4acb175a4 100644
|
||||
--- a/libgcc/config/i386/cpuinfo.c
|
||||
+++ b/libgcc/config/i386/cpuinfo.c
|
||||
@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f15b19d8e058c983c49c4566c1879fdaf5b1ab54 Mon Sep 17 00:00:00 2001
|
||||
From a9bb04b7cf02b2f2d16f68733488f9e48fc7e7a9 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Tue, 10 Mar 2020 08:26:53 -0700
|
||||
Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining
|
||||
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
2 files changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc
|
||||
index 7763f40e9ab..4f0c1eb1508 100644
|
||||
index c0ecbe8558b..9f8ab7146c0 100644
|
||||
--- a/gcc/gengtype.cc
|
||||
+++ b/gcc/gengtype.cc
|
||||
@@ -1005,7 +1005,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt,
|
||||
@@ -38,7 +38,7 @@ index 7763f40e9ab..4f0c1eb1508 100644
|
||||
|
||||
/* Reverse a linked list of 'struct pair's in place. */
|
||||
pair_p
|
||||
@@ -5223,7 +5223,7 @@ main (int argc, char **argv)
|
||||
@@ -5232,7 +5232,7 @@ main (int argc, char **argv)
|
||||
/* These types are set up with #define or else outside of where
|
||||
we can see them. We should initialize them before calling
|
||||
read_input_list. */
|
||||
@@ -48,7 +48,7 @@ index 7763f40e9ab..4f0c1eb1508 100644
|
||||
POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos));
|
||||
POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos));
|
||||
diff --git a/gcc/genmodes.cc b/gcc/genmodes.cc
|
||||
index 715787b8f48..302adff28d5 100644
|
||||
index eb3f9e2f0c1..5425635cb22 100644
|
||||
--- a/gcc/genmodes.cc
|
||||
+++ b/gcc/genmodes.cc
|
||||
@@ -441,7 +441,7 @@ complete_all_modes (void)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 939a899b862f7a25e52b74d1587fc75fc65779c0 Mon Sep 17 00:00:00 2001
|
||||
From db4380eac3cd9baa2f31bcd2fb936ed51f27b415 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 13 May 2020 15:10:38 -0700
|
||||
Subject: [PATCH] libatomic: Do not enforce march on aarch64
|
||||
@@ -17,25 +17,25 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
|
||||
index c6c8d81c56a..d959a5d040e 100644
|
||||
index 980677f3533..26188917946 100644
|
||||
--- a/libatomic/Makefile.am
|
||||
+++ b/libatomic/Makefile.am
|
||||
@@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS)))
|
||||
@@ -130,7 +130,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS)))
|
||||
## On a target-specific basis, include alternates to be selected by IFUNC.
|
||||
if HAVE_IFUNC
|
||||
if ARCH_AARCH64_LINUX
|
||||
-IFUNC_OPTIONS = -march=armv8-a+lse
|
||||
libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS)))
|
||||
libatomic_la_SOURCES += atomic_16.S
|
||||
|
||||
endif
|
||||
diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
|
||||
index a0fa3dfc8cc..e70d389874a 100644
|
||||
index d9d529bc502..47dacef9e01 100644
|
||||
--- a/libatomic/Makefile.in
|
||||
+++ b/libatomic/Makefile.in
|
||||
@@ -447,7 +447,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files)))
|
||||
@@ -452,7 +452,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files)))
|
||||
libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \
|
||||
_$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_3) \
|
||||
$(am__append_4) $(am__append_5)
|
||||
_$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \
|
||||
$(am__append_3) $(am__append_4)
|
||||
-@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse
|
||||
@ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64
|
||||
@ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 696d696381dd99ec2bddb1170f96f98da36eb418 Mon Sep 17 00:00:00 2001
|
||||
From 92a77026cc64f5eab4cb6b35e4a7c59e6ab8aa20 Mon Sep 17 00:00:00 2001
|
||||
From: Andrei Gherzan <andrei.gherzan@huawei.com>
|
||||
Date: Wed, 22 Dec 2021 12:49:25 +0100
|
||||
Subject: [PATCH] Fix install path of linux64.h
|
||||
@@ -17,11 +17,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
|
||||
index 8ef996c0f4d..21daf380e34 100644
|
||||
index 6a009c696e9..da54dd42adf 100644
|
||||
--- a/gcc/Makefile.in
|
||||
+++ b/gcc/Makefile.in
|
||||
@@ -3731,6 +3731,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
|
||||
"$(srcdir)"/config/* | "$(srcdir)"/common/config/* \
|
||||
@@ -3900,6 +3900,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
|
||||
| "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \
|
||||
| "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \
|
||||
base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \
|
||||
+ */linux64.h ) \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9487b1d6136ea09cce4792d59d0170c712575550 Mon Sep 17 00:00:00 2001
|
||||
From c6fc577e9e89dc16d3e971aa165602746232de4c Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Sat, 20 Aug 2022 09:04:14 -0700
|
||||
Subject: [PATCH] Avoid hardcoded build paths into ppc libgcc
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From f12acc6a383546d48da3bdfb2f25ca2adb7976d7 Mon Sep 17 00:00:00 2001
|
||||
From 8845248c81c0695ccc65311017deef824fa538fa Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Sun, 13 Aug 2023 10:24:05 +0100
|
||||
Date: Thu, 17 Aug 2023 09:01:40 -0700
|
||||
Subject: [PATCH] gcc testsuite tweaks for mips/OE
|
||||
|
||||
Disable loongson-mmi runtine, qemu doesn't appear to fully support them even if some
|
||||
@@ -26,10 +26,12 @@ Also, for gcc.target tests, add checks on wheter loongson or msa code can
|
||||
be run before trying that, allowing downgrading of tests there to work too.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
[Parts of the patch may be able to be split off and acceptable to upstream with
|
||||
discussion. Need to investigate why qemu-user passes the 'bad' instructions']
|
||||
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
gcc/testsuite/gcc.target/mips/mips.exp | 16 +++++++++
|
||||
gcc/testsuite/lib/gcc-dg.exp | 11 +++++++
|
||||
@@ -37,10 +39,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
3 files changed, 41 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp
|
||||
index 15d574202d3..2cef9709774 100644
|
||||
index e028bc93b40..b54a40d6509 100644
|
||||
--- a/gcc/testsuite/gcc.target/mips/mips.exp
|
||||
+++ b/gcc/testsuite/gcc.target/mips/mips.exp
|
||||
@@ -709,7 +709,23 @@ proc mips_first_unsupported_option { upstatus } {
|
||||
@@ -711,7 +711,23 @@ proc mips_first_unsupported_option { upstatus } {
|
||||
global mips_option_tests
|
||||
upvar $upstatus status
|
||||
|
||||
@@ -65,10 +67,10 @@ index 15d574202d3..2cef9709774 100644
|
||||
regsub -all "\n" $code "\\n\\\n" asm
|
||||
# Use check_runtime from target-supports.exp, which caches
|
||||
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
|
||||
index 9d79b9402e9..e0e5cbb1af8 100644
|
||||
index 228c21d1207..d3b88e0419e 100644
|
||||
--- a/gcc/testsuite/lib/gcc-dg.exp
|
||||
+++ b/gcc/testsuite/lib/gcc-dg.exp
|
||||
@@ -240,9 +240,20 @@ proc schedule-cleanups { opts } {
|
||||
@@ -232,9 +232,20 @@ proc schedule-cleanups { opts } {
|
||||
|
||||
proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } {
|
||||
# Set up the compiler flags, based on what we're going to do.
|
||||
@@ -77,23 +79,23 @@ index 9d79b9402e9..e0e5cbb1af8 100644
|
||||
set options [list]
|
||||
|
||||
+ if [info exists do-what-limit] then {
|
||||
+ # Demote run tests to $do-what-limit if set
|
||||
+ switch $do_what {
|
||||
+ # Demote run tests to $do-what-limit if set
|
||||
+ switch $do_what {
|
||||
+ run {
|
||||
+ set do_what ${do-what-limit}
|
||||
+ set dg-do-what ${do-what-limit}
|
||||
+ }
|
||||
+ }
|
||||
+ set do_what ${do-what-limit}
|
||||
+ set dg-do-what ${do-what-limit}
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
switch $do_what {
|
||||
"preprocess" {
|
||||
set compile_type "preprocess"
|
||||
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
|
||||
index 40f71e9ed8b..10e267fa16d 100644
|
||||
index 45435586de2..04942540d8b 100644
|
||||
--- a/gcc/testsuite/lib/target-supports.exp
|
||||
+++ b/gcc/testsuite/lib/target-supports.exp
|
||||
@@ -2155,14 +2155,7 @@ proc check_mips_loongson_mmi_hw_available { } {
|
||||
@@ -2483,14 +2483,7 @@ proc check_mips_loongson_mmi_hw_available { } {
|
||||
if { !([istarget mips*-*-*]) } {
|
||||
expr 0
|
||||
} else {
|
||||
@@ -109,7 +111,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
}
|
||||
}]
|
||||
}
|
||||
@@ -2176,29 +2169,7 @@ proc check_mips_msa_hw_available { } {
|
||||
@@ -2504,29 +2497,7 @@ proc check_mips_msa_hw_available { } {
|
||||
if { !([istarget mips*-*-*]) } {
|
||||
expr 0
|
||||
} else {
|
||||
@@ -140,7 +142,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
}
|
||||
}]
|
||||
}
|
||||
@@ -9187,6 +9158,7 @@ proc is-effective-target-keyword { arg } {
|
||||
@@ -9897,6 +9868,7 @@ proc is-effective-target-keyword { arg } {
|
||||
|
||||
proc et-dg-runtest { runtest testcases flags default-extra-flags } {
|
||||
global dg-do-what-default
|
||||
@@ -148,7 +150,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
global EFFECTIVE_TARGETS
|
||||
global et_index
|
||||
|
||||
@@ -9194,6 +9166,7 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } {
|
||||
@@ -9904,6 +9876,7 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } {
|
||||
foreach target $EFFECTIVE_TARGETS {
|
||||
set target_flags $flags
|
||||
set dg-do-what-default compile
|
||||
@@ -156,7 +158,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
set et_index [lsearch -exact $EFFECTIVE_TARGETS $target]
|
||||
if { [info procs add_options_for_${target}] != [list] } {
|
||||
set target_flags [add_options_for_${target} "$flags"]
|
||||
@@ -9201,8 +9174,10 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } {
|
||||
@@ -9911,8 +9884,10 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } {
|
||||
if { [info procs check_effective_target_${target}_runtime]
|
||||
!= [list] && [check_effective_target_${target}_runtime] } {
|
||||
set dg-do-what-default run
|
||||
@@ -167,7 +169,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
}
|
||||
} else {
|
||||
set et_index 0
|
||||
@@ -10789,6 +10764,7 @@ proc check_effective_target_sigsetjmp {} {
|
||||
@@ -11606,6 +11581,7 @@ proc check_effective_target_sigsetjmp {} {
|
||||
proc check_vect_support_and_set_flags { } {
|
||||
global DEFAULT_VECTCFLAGS
|
||||
global dg-do-what-default
|
||||
@@ -175,7 +177,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
global EFFECTIVE_TARGETS
|
||||
|
||||
if [istarget powerpc-*paired*] {
|
||||
@@ -10797,6 +10773,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
@@ -11614,6 +11590,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
set dg-do-what-default run
|
||||
} else {
|
||||
set dg-do-what-default compile
|
||||
@@ -183,15 +185,15 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
}
|
||||
} elseif [istarget powerpc*-*-*] {
|
||||
# Skip targets not supporting -maltivec.
|
||||
@@ -10821,6 +10798,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
lappend DEFAULT_VECTCFLAGS "-mcpu=970"
|
||||
@@ -11644,6 +11621,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
set DEFAULT_VECTCFLAGS [linsert $DEFAULT_VECTCFLAGS 0 "-mcpu=970"]
|
||||
}
|
||||
set dg-do-what-default compile
|
||||
+ set do-what-limit link
|
||||
}
|
||||
} elseif { [istarget i?86-*-*] || [istarget x86_64-*-*] } {
|
||||
lappend DEFAULT_VECTCFLAGS "-msse2"
|
||||
@@ -10828,6 +10806,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
@@ -11651,6 +11629,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
set dg-do-what-default run
|
||||
} else {
|
||||
set dg-do-what-default compile
|
||||
@@ -199,7 +201,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
}
|
||||
} elseif { [istarget mips*-*-*]
|
||||
&& [check_effective_target_nomips16] } {
|
||||
@@ -10847,6 +10826,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
@@ -11670,6 +11649,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
set dg-do-what-default run
|
||||
} else {
|
||||
set dg-do-what-default compile
|
||||
@@ -207,7 +209,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
}
|
||||
} elseif [istarget alpha*-*-*] {
|
||||
# Alpha's vectorization capabilities are extremely limited.
|
||||
@@ -10860,6 +10840,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
@@ -11683,6 +11663,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
set dg-do-what-default run
|
||||
} else {
|
||||
set dg-do-what-default compile
|
||||
@@ -215,7 +217,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
}
|
||||
} elseif [istarget ia64-*-*] {
|
||||
set dg-do-what-default run
|
||||
@@ -10873,6 +10854,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
@@ -11696,6 +11677,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
set dg-do-what-default run
|
||||
} else {
|
||||
set dg-do-what-default compile
|
||||
@@ -223,7 +225,7 @@ index 40f71e9ed8b..10e267fa16d 100644
|
||||
}
|
||||
} elseif [istarget aarch64*-*-*] {
|
||||
set dg-do-what-default run
|
||||
@@ -10897,6 +10879,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
@@ -11720,6 +11702,7 @@ proc check_vect_support_and_set_flags { } {
|
||||
} else {
|
||||
lappend DEFAULT_VECTCFLAGS "-march=z14" "-mzarch"
|
||||
set dg-do-what-default compile
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
From adb60dc78e0da4877747f32347cee339364775be Mon Sep 17 00:00:00 2001
|
||||
From: Richard Sandiford <richard.sandiford@arm.com>
|
||||
Date: Fri, 15 Sep 2023 09:19:14 +0100
|
||||
Subject: [PATCH] aarch64: Fix loose ldpstp check [PR111411]
|
||||
|
||||
aarch64_operands_ok_for_ldpstp contained the code:
|
||||
|
||||
/* One of the memory accesses must be a mempair operand.
|
||||
If it is not the first one, they need to be swapped by the
|
||||
peephole. */
|
||||
if (!aarch64_mem_pair_operand (mem_1, GET_MODE (mem_1))
|
||||
&& !aarch64_mem_pair_operand (mem_2, GET_MODE (mem_2)))
|
||||
return false;
|
||||
|
||||
But the requirement isn't just that one of the accesses must be a
|
||||
valid mempair operand. It's that the lower access must be, since
|
||||
that's the access that will be used for the instruction operand.
|
||||
|
||||
gcc/
|
||||
PR target/111411
|
||||
* config/aarch64/aarch64.cc (aarch64_operands_ok_for_ldpstp): Require
|
||||
the lower memory access to a mem-pair operand.
|
||||
|
||||
gcc/testsuite/
|
||||
PR target/111411
|
||||
* gcc.dg/rtl/aarch64/pr111411.c: New test.
|
||||
|
||||
Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=2d38f45bcca62ca0c7afef4b579f82c5c2a01610]
|
||||
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
||||
---
|
||||
gcc/config/aarch64/aarch64.cc | 8 ++-
|
||||
gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c | 57 +++++++++++++++++++++
|
||||
2 files changed, 60 insertions(+), 5 deletions(-)
|
||||
create mode 100644 gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c
|
||||
|
||||
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
|
||||
index 6118a3354ac..9b1f791ca8b 100644
|
||||
--- a/gcc/config/aarch64/aarch64.cc
|
||||
+++ b/gcc/config/aarch64/aarch64.cc
|
||||
@@ -26154,11 +26154,9 @@ aarch64_operands_ok_for_ldpstp (rtx *operands, bool load,
|
||||
gcc_assert (known_eq (GET_MODE_SIZE (GET_MODE (mem_1)),
|
||||
GET_MODE_SIZE (GET_MODE (mem_2))));
|
||||
|
||||
- /* One of the memory accesses must be a mempair operand.
|
||||
- If it is not the first one, they need to be swapped by the
|
||||
- peephole. */
|
||||
- if (!aarch64_mem_pair_operand (mem_1, GET_MODE (mem_1))
|
||||
- && !aarch64_mem_pair_operand (mem_2, GET_MODE (mem_2)))
|
||||
+ /* The lower memory access must be a mem-pair operand. */
|
||||
+ rtx lower_mem = reversed ? mem_2 : mem_1;
|
||||
+ if (!aarch64_mem_pair_operand (lower_mem, GET_MODE (lower_mem)))
|
||||
return false;
|
||||
|
||||
if (REG_P (reg_1) && FP_REGNUM_P (REGNO (reg_1)))
|
||||
diff --git a/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c b/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c
|
||||
new file mode 100644
|
||||
index 00000000000..ad07e9c6c89
|
||||
--- /dev/null
|
||||
+++ b/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c
|
||||
@@ -0,0 +1,57 @@
|
||||
+/* { dg-do compile { target aarch64*-*-* } } */
|
||||
+/* { dg-require-effective-target lp64 } */
|
||||
+/* { dg-options "-O -fdisable-rtl-postreload -fpeephole2 -fno-schedule-fusion" } */
|
||||
+
|
||||
+extern int data[];
|
||||
+
|
||||
+void __RTL (startwith ("ira")) foo (void *ptr)
|
||||
+{
|
||||
+ (function "foo"
|
||||
+ (param "ptr"
|
||||
+ (DECL_RTL (reg/v:DI <0> [ ptr ]))
|
||||
+ (DECL_RTL_INCOMING (reg/v:DI x0 [ ptr ]))
|
||||
+ ) ;; param "ptr"
|
||||
+ (insn-chain
|
||||
+ (block 2
|
||||
+ (edge-from entry (flags "FALLTHRU"))
|
||||
+ (cnote 3 [bb 2] NOTE_INSN_BASIC_BLOCK)
|
||||
+ (insn 4 (set (reg:DI <0>) (reg:DI x0)))
|
||||
+ (insn 5 (set (reg:DI <1>)
|
||||
+ (plus:DI (reg:DI <0>) (const_int 768))))
|
||||
+ (insn 6 (set (mem:SI (plus:DI (reg:DI <0>)
|
||||
+ (const_int 508)) [1 &data+508 S4 A4])
|
||||
+ (const_int 0)))
|
||||
+ (insn 7 (set (mem:SI (plus:DI (reg:DI <1>)
|
||||
+ (const_int -256)) [1 &data+512 S4 A4])
|
||||
+ (const_int 0)))
|
||||
+ (edge-to exit (flags "FALLTHRU"))
|
||||
+ ) ;; block 2
|
||||
+ ) ;; insn-chain
|
||||
+ ) ;; function
|
||||
+}
|
||||
+
|
||||
+void __RTL (startwith ("ira")) bar (void *ptr)
|
||||
+{
|
||||
+ (function "bar"
|
||||
+ (param "ptr"
|
||||
+ (DECL_RTL (reg/v:DI <0> [ ptr ]))
|
||||
+ (DECL_RTL_INCOMING (reg/v:DI x0 [ ptr ]))
|
||||
+ ) ;; param "ptr"
|
||||
+ (insn-chain
|
||||
+ (block 2
|
||||
+ (edge-from entry (flags "FALLTHRU"))
|
||||
+ (cnote 3 [bb 2] NOTE_INSN_BASIC_BLOCK)
|
||||
+ (insn 4 (set (reg:DI <0>) (reg:DI x0)))
|
||||
+ (insn 5 (set (reg:DI <1>)
|
||||
+ (plus:DI (reg:DI <0>) (const_int 768))))
|
||||
+ (insn 6 (set (mem:SI (plus:DI (reg:DI <1>)
|
||||
+ (const_int -256)) [1 &data+512 S4 A4])
|
||||
+ (const_int 0)))
|
||||
+ (insn 7 (set (mem:SI (plus:DI (reg:DI <0>)
|
||||
+ (const_int 508)) [1 &data+508 S4 A4])
|
||||
+ (const_int 0)))
|
||||
+ (edge-to exit (flags "FALLTHRU"))
|
||||
+ ) ;; block 2
|
||||
+ ) ;; insn-chain
|
||||
+ ) ;; function
|
||||
+}
|
||||
@@ -1,26 +0,0 @@
|
||||
Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=948dbc5ee45f9ffd5f41fd6782704081cc7c8c27]
|
||||
|
||||
Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
|
||||
|
||||
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c
|
||||
index ed63ff59cc0..009c849b7e7 100644
|
||||
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c
|
||||
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c
|
||||
@@ -1,3 +1,5 @@
|
||||
+/* Since this uses dg-additional-sources, need to specify `dg-do run` instead of the default. */
|
||||
+/* { dg-do run } */
|
||||
/* { dg-require-effective-target vect_simd_clones } */
|
||||
/* { dg-additional-options "-fopenmp-simd" } */
|
||||
/* { dg-additional-options "-mavx" { target avx_runtime } } */
|
||||
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c
|
||||
index c44471e35bc..4699a3f3c80 100644
|
||||
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c
|
||||
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c
|
||||
@@ -1,3 +1,5 @@
|
||||
+/* Since this uses dg-additional-sources, need to specify `dg-do run` instead of the default. */
|
||||
+/* { dg-do run } */
|
||||
/* { dg-require-effective-target vect_simd_clones } */
|
||||
/* { dg-additional-options "-fopenmp-simd" } */
|
||||
/* { dg-additional-options "-mavx" { target avx_runtime } } */
|
||||
--
|
||||
2.43.0
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user