| Message ID | 20231011095953.3184215-1-yangyujie@loongson.cn |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] LoongArch: Adjust makefile dependency for loongarch headers. | expand |
Pushed to r14-4584. 在 2023/10/11 下午5:59, Yang Yujie 写道: > gcc/ChangeLog: > > * config.gcc: Add loongarch-driver.h to tm_files. > * config/loongarch/loongarch.h: Do not include loongarch-driver.h. > * config/loongarch/t-loongarch: Append loongarch-multilib.h to $(GTM_H) > instead of $(TM_H) for building generator programs. > --- > gcc/config.gcc | 4 ++-- > gcc/config/loongarch/loongarch.h | 3 --- > gcc/config/loongarch/t-loongarch | 3 ++- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/gcc/config.gcc b/gcc/config.gcc > index ee46d96bf62..60f63b6c7d4 100644 > --- a/gcc/config.gcc > +++ b/gcc/config.gcc > @@ -2524,7 +2524,7 @@ riscv*-*-freebsd*) > > loongarch*-*-linux*) > tm_file="elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file}" > - tm_file="${tm_file} loongarch/gnu-user.h loongarch/linux.h" > + tm_file="${tm_file} loongarch/gnu-user.h loongarch/linux.h loongarch/loongarch-driver.h" > extra_options="${extra_options} linux-android.opt" > tmake_file="${tmake_file} loongarch/t-multilib loongarch/t-linux" > gnu_ld=yes > @@ -2537,7 +2537,7 @@ loongarch*-*-linux*) > > loongarch*-*-elf*) > tm_file="elfos.h newlib-stdint.h ${tm_file}" > - tm_file="${tm_file} loongarch/elf.h loongarch/linux.h" > + tm_file="${tm_file} loongarch/elf.h loongarch/linux.h loongarch/loongarch-driver.h" > tmake_file="${tmake_file} loongarch/t-multilib loongarch/t-linux" > gnu_ld=yes > gas=yes > diff --git a/gcc/config/loongarch/loongarch.h b/gcc/config/loongarch/loongarch.h > index d357e32e414..19a18fb5f1b 100644 > --- a/gcc/config/loongarch/loongarch.h > +++ b/gcc/config/loongarch/loongarch.h > @@ -49,9 +49,6 @@ along with GCC; see the file COPYING3. If not see > > #define TARGET_LIBGCC_SDATA_SECTION ".sdata" > > -/* Driver native functions for SPEC processing in the GCC driver. */ > -#include "loongarch-driver.h" > - > /* This definition replaces the formerly used 'm' constraint with a > different constraint letter in order to avoid changing semantics of > the 'm' constraint when accepting new address formats in > diff --git a/gcc/config/loongarch/t-loongarch b/gcc/config/loongarch/t-loongarch > index 9b06fa84bcc..667a6bb3b50 100644 > --- a/gcc/config/loongarch/t-loongarch > +++ b/gcc/config/loongarch/t-loongarch > @@ -16,7 +16,8 @@ > # along with GCC; see the file COPYING3. If not see > # <http://www.gnu.org/licenses/>. > > -TM_H += loongarch-multilib.h $(srcdir)/config/loongarch/loongarch-driver.h > + > +GTM_H += loongarch-multilib.h > OPTIONS_H_EXTRA += $(srcdir)/config/loongarch/loongarch-def.h \ > $(srcdir)/config/loongarch/loongarch-tune.h >
diff --git a/gcc/config.gcc b/gcc/config.gcc index ee46d96bf62..60f63b6c7d4 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2524,7 +2524,7 @@ riscv*-*-freebsd*) loongarch*-*-linux*) tm_file="elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file}" - tm_file="${tm_file} loongarch/gnu-user.h loongarch/linux.h" + tm_file="${tm_file} loongarch/gnu-user.h loongarch/linux.h loongarch/loongarch-driver.h" extra_options="${extra_options} linux-android.opt" tmake_file="${tmake_file} loongarch/t-multilib loongarch/t-linux" gnu_ld=yes @@ -2537,7 +2537,7 @@ loongarch*-*-linux*) loongarch*-*-elf*) tm_file="elfos.h newlib-stdint.h ${tm_file}" - tm_file="${tm_file} loongarch/elf.h loongarch/linux.h" + tm_file="${tm_file} loongarch/elf.h loongarch/linux.h loongarch/loongarch-driver.h" tmake_file="${tmake_file} loongarch/t-multilib loongarch/t-linux" gnu_ld=yes gas=yes diff --git a/gcc/config/loongarch/loongarch.h b/gcc/config/loongarch/loongarch.h index d357e32e414..19a18fb5f1b 100644 --- a/gcc/config/loongarch/loongarch.h +++ b/gcc/config/loongarch/loongarch.h @@ -49,9 +49,6 @@ along with GCC; see the file COPYING3. If not see #define TARGET_LIBGCC_SDATA_SECTION ".sdata" -/* Driver native functions for SPEC processing in the GCC driver. */ -#include "loongarch-driver.h" - /* This definition replaces the formerly used 'm' constraint with a different constraint letter in order to avoid changing semantics of the 'm' constraint when accepting new address formats in diff --git a/gcc/config/loongarch/t-loongarch b/gcc/config/loongarch/t-loongarch index 9b06fa84bcc..667a6bb3b50 100644 --- a/gcc/config/loongarch/t-loongarch +++ b/gcc/config/loongarch/t-loongarch @@ -16,7 +16,8 @@ # along with GCC; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. -TM_H += loongarch-multilib.h $(srcdir)/config/loongarch/loongarch-driver.h + +GTM_H += loongarch-multilib.h OPTIONS_H_EXTRA += $(srcdir)/config/loongarch/loongarch-def.h \ $(srcdir)/config/loongarch/loongarch-tune.h