168 lines
5.8 KiB
Diff
168 lines
5.8 KiB
Diff
From 6b065d6ba088c81945f50e711384d5bb1faa36e9 Mon Sep 17 00:00:00 2001
|
|
From: Achim Gratz <Achim.Gratz@Stromeko.DE>
|
|
Date: Sun, 25 Apr 2021 11:33:55 +0200
|
|
Subject: [PATCH 101/102] Cygwin: enable libgccjit not just for MingW
|
|
|
|
---
|
|
configure | 17 +++++++++++++++--
|
|
configure.ac | 3 ++-
|
|
gcc/jit/Make-lang.in | 27 +++++++++++++++++++++------
|
|
3 files changed, 38 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index ebc44416b6c..c42d683b223 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -776,6 +776,7 @@ infodir
|
|
docdir
|
|
oldincludedir
|
|
includedir
|
|
+runstatedir
|
|
localstatedir
|
|
sharedstatedir
|
|
sysconfdir
|
|
@@ -951,6 +952,7 @@ datadir='${datarootdir}'
|
|
sysconfdir='${prefix}/etc'
|
|
sharedstatedir='${prefix}/com'
|
|
localstatedir='${prefix}/var'
|
|
+runstatedir='${localstatedir}/run'
|
|
includedir='${prefix}/include'
|
|
oldincludedir='/usr/include'
|
|
docdir='${datarootdir}/doc/${PACKAGE}'
|
|
@@ -1203,6 +1205,15 @@ do
|
|
| -silent | --silent | --silen | --sile | --sil)
|
|
silent=yes ;;
|
|
|
|
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
|
|
+ | --runstate | --runstat | --runsta | --runst | --runs \
|
|
+ | --run | --ru | --r)
|
|
+ ac_prev=runstatedir ;;
|
|
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
|
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
|
+ | --run=* | --ru=* | --r=*)
|
|
+ runstatedir=$ac_optarg ;;
|
|
+
|
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
|
ac_prev=sbindir ;;
|
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
|
@@ -1340,7 +1351,7 @@ fi
|
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
- libdir localedir mandir
|
|
+ libdir localedir mandir runstatedir
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
# Remove trailing slashes.
|
|
@@ -1500,6 +1511,7 @@ Fine tuning of the installation directories:
|
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
|
--includedir=DIR C header files [PREFIX/include]
|
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
@@ -10145,6 +10157,7 @@ $as_echo "$as_me: WARNING: some C libraries are required to build $language: $mi
|
|
# is position independent code (PIC).
|
|
case $target in
|
|
*mingw*) ;;
|
|
+ *cygwin*) ;;
|
|
*)
|
|
case ${add_this_lang}:${language}:${host_shared} in
|
|
yes:jit:no)
|
|
@@ -10169,7 +10182,7 @@ $as_echo "$as_me: WARNING: --enable-host-shared required to build $language" >&2
|
|
# Silently disable.
|
|
add_this_lang=unsupported
|
|
;;
|
|
- esac
|
|
+ esac
|
|
;;
|
|
esac
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 730db3c1402..fbc8111341a 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2459,6 +2459,7 @@ if test -d ${srcdir}/gcc; then
|
|
# is position independent code (PIC).
|
|
case $target in
|
|
*mingw*) ;;
|
|
+ *cygwin*) ;;
|
|
*)
|
|
case ${add_this_lang}:${language}:${host_shared} in
|
|
yes:jit:no)
|
|
@@ -2482,7 +2483,7 @@ directories, to avoid imposing the performance cost of
|
|
# Silently disable.
|
|
add_this_lang=unsupported
|
|
;;
|
|
- esac
|
|
+ esac
|
|
;;
|
|
esac
|
|
|
|
diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in
|
|
index 59afe264a85..52c24c35741 100644
|
|
--- a/gcc/jit/Make-lang.in
|
|
+++ b/gcc/jit/Make-lang.in
|
|
@@ -44,10 +44,24 @@
|
|
LIBGCCJIT_MINOR_NUM = 0
|
|
LIBGCCJIT_RELEASE_NUM = 1
|
|
|
|
-ifneq (,$(findstring mingw,$(target)))
|
|
-LIBGCCJIT_FILENAME = libgccjit-$(LIBGCCJIT_VERSION_NUM).dll
|
|
+SHARED_PFX=lib
|
|
+ifneq (,$(filter %cygwin,$(target)))
|
|
+SHARED_PFX=cyg
|
|
+endif
|
|
+
|
|
+ifneq (,$(filter %-mingw% %-cygwin,$(target)))
|
|
+LIBGCCJIT_FILENAME = $(SHARED_PFX)gccjit-$(LIBGCCJIT_VERSION_NUM).dll
|
|
LIBGCCJIT_IMPORT_LIB = libgccjit.dll.a
|
|
|
|
+# Conditionalize the use of the LD_VERSION_SCRIPT_OPTION and
|
|
+# LD_SONAME_OPTION depending if configure found them, using $(if)
|
|
+# We have to define a COMMA here, otherwise the commas in the "true"
|
|
+# result are treated as separators by the $(if).
|
|
+COMMA := ,
|
|
+LIBGCCJIT_VERSION_SCRIPT_OPTION = \
|
|
+ $(if $(LD_VERSION_SCRIPT_OPTION),\
|
|
+ -Wl$(COMMA)$(LD_VERSION_SCRIPT_OPTION)$(COMMA)$(srcdir)/jit/libgccjit.map)
|
|
+
|
|
jit: $(LIBGCCJIT_FILENAME) \
|
|
$(FULL_DRIVER_NAME)
|
|
|
|
@@ -149,9 +163,10 @@ endif
|
|
# Use strict warnings for this front end.
|
|
jit-warn = $(STRICT_WARN)
|
|
|
|
-ifneq (,$(findstring mingw,$(target)))
|
|
+ifneq (,$(filter %-mingw% %-cygwin,$(target)))
|
|
# Create import library
|
|
-LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB)
|
|
+LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB) \
|
|
+ $(LIBGCCJIT_VERSION_SCRIPT_OPTION)
|
|
else
|
|
ifneq (,$(findstring darwin,$(host)))
|
|
LIBGCCJIT_VERS = $(LIBGCCJIT_CURRENT).$(LIBGCCJIT_REVISION).$(LIBGCCJIT_AGE)
|
|
@@ -191,7 +206,7 @@ $(LIBGCCJIT_FILENAME): $(jit_OBJS) \
|
|
@$(call LINK_PROGRESS,$(INDEX.jit),end)
|
|
|
|
# Create symlinks when not building for Windows
|
|
-ifeq (,$(findstring mingw,$(target)))
|
|
+ifeq (,$(filter %-mingw% %-cygwin,$(target)))
|
|
|
|
ifeq (,$(findstring darwin,$(host)))
|
|
# but only one level for Darwin, version info is embedded.
|
|
@@ -377,7 +392,7 @@ jit.install-headers: installdirs
|
|
$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
|
|
$(DESTDIR)$(includedir)/libgccjit++.h
|
|
|
|
-ifneq (,$(findstring mingw,$(target)))
|
|
+ifneq (,$(filter %-mingw% %-cygwin,$(target)))
|
|
jit.install-common: installdirs jit.install-headers
|
|
# Install import library
|
|
$(INSTALL_PROGRAM) $(LIBGCCJIT_IMPORT_LIB) \
|
|
--
|
|
2.45.1
|
|
|