diff options
author | Zac Walker <zacwalker@microsoft.com> | 2024-03-01 02:41:50 +0100 |
---|---|---|
committer | Christophe Lyon <christophe.lyon@linaro.org> | 2024-05-07 16:02:33 +0000 |
commit | 1f05dfc131c7996a85dd82b3300f7b5f93d4b1bd (patch) | |
tree | f5f93daf2356c97d5bd5cabb64561dd5e74bc103 | |
parent | 21fbaa1a2d274a36454332a6e10a496024bbc560 (diff) | |
download | gcc-1f05dfc131c7996a85dd82b3300f7b5f93d4b1bd.zip gcc-1f05dfc131c7996a85dd82b3300f7b5f93d4b1bd.tar.gz gcc-1f05dfc131c7996a85dd82b3300f7b5f93d4b1bd.tar.bz2 |
Reuse MinGW from i386 for AArch64
This patch creates a new config/mingw directory to share MinGW
related definitions, and moves there the corresponding existing files
from config/i386.
gcc/ChangeLog:
* config.gcc: Adjust targets after moving MinGW related files
from i386 to mingw folder.
* config/i386/cygming.opt: Move to...
* config/mingw/cygming.opt: ...here.
* config/i386/cygming.opt.urls: Move to...
* config/mingw/cygming.opt.urls: ...here.
* config/i386/cygwin-d.cc: Move to...
* config/mingw/cygwin-d.cc: ...here.
* config/i386/mingw-stdint.h: Move to...
* config/mingw/mingw-stdint.h: ...here.
* config/i386/mingw.opt: Move to...
* config/mingw/mingw.opt: ...here.
* config/i386/mingw.opt.urls: Move to...
* config/mingw/mingw.opt.urls: ...here.
* config/i386/mingw32.h: Move to...
* config/mingw/mingw32.h: ...here.
* config/i386/msformat-c.cc: Move to...
* config/mingw/msformat-c.cc: ...here.
* config/i386/t-cygming: Move to...
* config/mingw/t-cygming: ...here and updated.
* config/i386/winnt-cxx.cc: Move to...
* config/mingw/winnt-cxx.cc: ...here.
* config/i386/winnt-d.cc: Move to...
* config/mingw/winnt-d.cc: ...here.
* config/i386/winnt-stubs.cc: Move to...
* config/mingw/winnt-stubs.cc: ...here.
* config/i386/winnt.cc: Move to...
* config/mingw/winnt.cc: ...here.
-rw-r--r-- | gcc/config.gcc | 22 | ||||
-rw-r--r-- | gcc/config/mingw/cygming.opt (renamed from gcc/config/i386/cygming.opt) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/cygming.opt.urls (renamed from gcc/config/i386/cygming.opt.urls) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/cygwin-d.cc (renamed from gcc/config/i386/cygwin-d.cc) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/mingw-stdint.h (renamed from gcc/config/i386/mingw-stdint.h) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/mingw.opt (renamed from gcc/config/i386/mingw.opt) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/mingw.opt.urls (renamed from gcc/config/i386/mingw.opt.urls) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/mingw32.h (renamed from gcc/config/i386/mingw32.h) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/msformat-c.cc (renamed from gcc/config/i386/msformat-c.cc) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/t-cygming (renamed from gcc/config/i386/t-cygming) | 23 | ||||
-rw-r--r-- | gcc/config/mingw/winnt-cxx.cc (renamed from gcc/config/i386/winnt-cxx.cc) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/winnt-d.cc (renamed from gcc/config/i386/winnt-d.cc) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/winnt-stubs.cc (renamed from gcc/config/i386/winnt-stubs.cc) | 0 | ||||
-rw-r--r-- | gcc/config/mingw/winnt.cc (renamed from gcc/config/i386/winnt.cc) | 0 |
14 files changed, 24 insertions, 21 deletions
diff --git a/gcc/config.gcc b/gcc/config.gcc index 1dcba6b..f95417c 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2167,9 +2167,9 @@ i[4567]86-wrs-vxworks*|x86_64-wrs-vxworks7*) i[34567]86-*-cygwin*) tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h i386/cygwin.h i386/cygwin-stdint.h" xm_file=i386/xm-cygwin.h - tmake_file="${tmake_file} i386/t-cygming t-slibgcc" - target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc" - extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt" + tmake_file="${tmake_file} mingw/t-cygming t-slibgcc" + target_gtfiles="$target_gtfiles \$(srcdir)/config/mingw/winnt.cc" + extra_options="${extra_options} mingw/cygming.opt i386/cygwin.opt" extra_objs="${extra_objs} winnt.o winnt-stubs.o" c_target_objs="${c_target_objs} msformat-c.o" cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o" @@ -2185,9 +2185,9 @@ x86_64-*-cygwin*) need_64bit_isa=yes tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h i386/cygwin.h i386/cygwin-w64.h i386/cygwin-stdint.h" xm_file=i386/xm-cygwin.h - tmake_file="${tmake_file} i386/t-cygming t-slibgcc" - target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc" - extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt" + tmake_file="${tmake_file} mingw/t-cygming t-slibgcc" + target_gtfiles="$target_gtfiles \$(srcdir)/config/mingw/winnt.cc" + extra_options="${extra_options} mingw/cygming.opt i386/cygwin.opt" extra_objs="${extra_objs} winnt.o winnt-stubs.o" c_target_objs="${c_target_objs} msformat-c.o" cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o" @@ -2223,7 +2223,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) if test x$enable_threads = xmcf ; then tm_file="${tm_file} i386/mingw-mcfgthread.h" fi - tm_file="${tm_file} i386/mingw32.h" + tm_file="${tm_file} mingw/mingw32.h" # This makes the logic if mingw's or the w64 feature set has to be used case ${target} in *-w64-*) @@ -2252,8 +2252,8 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) *) ;; esac - tm_file="${tm_file} i386/mingw-stdint.h" - tmake_file="${tmake_file} t-winnt i386/t-cygming t-slibgcc" + tm_file="${tm_file} mingw/mingw-stdint.h" + tmake_file="${tmake_file} t-winnt mingw/t-cygming t-slibgcc" case ${target} in x86_64-w64-*) tmake_file="${tmake_file} i386/t-mingw-w64" @@ -2263,8 +2263,8 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) ;; esac native_system_header_dir=/mingw/include - target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc" - extra_options="${extra_options} i386/cygming.opt i386/mingw.opt" + target_gtfiles="$target_gtfiles \$(srcdir)/config/mingw/winnt.cc" + extra_options="${extra_options} mingw/cygming.opt mingw/mingw.opt" case ${target} in *-w64-*) extra_options="${extra_options} i386/mingw-w64.opt" diff --git a/gcc/config/i386/cygming.opt b/gcc/config/mingw/cygming.opt index b7b0bc5f6..b7b0bc5f6 100644 --- a/gcc/config/i386/cygming.opt +++ b/gcc/config/mingw/cygming.opt diff --git a/gcc/config/i386/cygming.opt.urls b/gcc/config/mingw/cygming.opt.urls index 87799be..87799be 100644 --- a/gcc/config/i386/cygming.opt.urls +++ b/gcc/config/mingw/cygming.opt.urls diff --git a/gcc/config/i386/cygwin-d.cc b/gcc/config/mingw/cygwin-d.cc index ca341ae..ca341ae 100644 --- a/gcc/config/i386/cygwin-d.cc +++ b/gcc/config/mingw/cygwin-d.cc diff --git a/gcc/config/i386/mingw-stdint.h b/gcc/config/mingw/mingw-stdint.h index c0feade..c0feade 100644 --- a/gcc/config/i386/mingw-stdint.h +++ b/gcc/config/mingw/mingw-stdint.h diff --git a/gcc/config/i386/mingw.opt b/gcc/config/mingw/mingw.opt index ae92059..ae92059 100644 --- a/gcc/config/i386/mingw.opt +++ b/gcc/config/mingw/mingw.opt diff --git a/gcc/config/i386/mingw.opt.urls b/gcc/config/mingw/mingw.opt.urls index 2cbbaad..2cbbaad 100644 --- a/gcc/config/i386/mingw.opt.urls +++ b/gcc/config/mingw/mingw.opt.urls diff --git a/gcc/config/i386/mingw32.h b/gcc/config/mingw/mingw32.h index 58304fc..58304fc 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/mingw/mingw32.h diff --git a/gcc/config/i386/msformat-c.cc b/gcc/config/mingw/msformat-c.cc index 0767d04..0767d04 100644 --- a/gcc/config/i386/msformat-c.cc +++ b/gcc/config/mingw/msformat-c.cc diff --git a/gcc/config/i386/t-cygming b/gcc/config/mingw/t-cygming index af01f69..f5de941 100644 --- a/gcc/config/i386/t-cygming +++ b/gcc/config/mingw/t-cygming @@ -20,37 +20,40 @@ # doing the build, it may not be installed yet. LIMITS_H_TEST = true -winnt.o: $(srcdir)/config/i386/winnt.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ +winnt.o: $(srcdir)/config/mingw/winnt.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \ $(TM_P_H) $(HASH_TABLE_H) $(GGC_H) $(LTO_STREAMER_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/i386/winnt.cc + $(srcdir)/config/mingw/winnt.cc -winnt-cxx.o: $(srcdir)/config/i386/winnt-cxx.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ +winnt-cxx.o: $(srcdir)/config/mingw/winnt-cxx.cc $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h \ $(TM_H) $(TREE_H) flags.h \ $(TM_P_H) $(HASHTAB_H) $(GGC_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/i386/winnt-cxx.cc + $(srcdir)/config/mingw/winnt-cxx.cc -winnt-stubs.o: $(srcdir)/config/i386/winnt-stubs.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ +winnt-stubs.o: $(srcdir)/config/mingw/winnt-stubs.cc $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h \ $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \ $(TM_P_H) $(HASHTAB_H) $(GGC_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/i386/winnt-stubs.cc + $(srcdir)/config/mingw/winnt-stubs.cc -cygwin-d.o: $(srcdir)/config/i386/cygwin-d.cc +cygwin-d.o: $(srcdir)/config/mingw/cygwin-d.cc $(COMPILE) $< $(POSTCOMPILE) -winnt-d.o: $(srcdir)/config/i386/winnt-d.cc +winnt-d.o: $(srcdir)/config/mingw/winnt-d.cc $(COMPILE) $< $(POSTCOMPILE) -msformat-c.o: $(srcdir)/config/i386/msformat-c.cc $(CONFIG_H) $(SYSTEM_H) coretypes.h \ +msformat-c.o: $(srcdir)/config/mingw/msformat-c.cc $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h \ $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \ $(TM_P_H) $(HASHTAB_H) $(GGC_H) $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/i386/msformat-c.cc + $(srcdir)/config/mingw/msformat-c.cc STMP_FIXINC=stmp-fixinc diff --git a/gcc/config/i386/winnt-cxx.cc b/gcc/config/mingw/winnt-cxx.cc index f4d7a50..f4d7a50 100644 --- a/gcc/config/i386/winnt-cxx.cc +++ b/gcc/config/mingw/winnt-cxx.cc diff --git a/gcc/config/i386/winnt-d.cc b/gcc/config/mingw/winnt-d.cc index e4981a1..e4981a1 100644 --- a/gcc/config/i386/winnt-d.cc +++ b/gcc/config/mingw/winnt-d.cc diff --git a/gcc/config/i386/winnt-stubs.cc b/gcc/config/mingw/winnt-stubs.cc index dd6aa6f..dd6aa6f 100644 --- a/gcc/config/i386/winnt-stubs.cc +++ b/gcc/config/mingw/winnt-stubs.cc diff --git a/gcc/config/i386/winnt.cc b/gcc/config/mingw/winnt.cc index 9b31589..9b31589 100644 --- a/gcc/config/i386/winnt.cc +++ b/gcc/config/mingw/winnt.cc |