summaryrefslogtreecommitdiffstats
path: root/0020-cygwin-uses-cyg-lib-prefix-v3.patch
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2020-04-01 16:59:44 -0400
committerYaakov Selkowitz <yselkowi@redhat.com>2020-04-01 16:59:44 -0400
commit58aad36b016765d2b651b9167f0a4caa6142d5f9 (patch)
treebe3a18fceb890dbe20d8257a3a3b6cc072dad890 /0020-cygwin-uses-cyg-lib-prefix-v3.patch
parent462d1befeec9662defcdb8380a79895bdbf1186a (diff)
downloadcygwin-gcc-58aad36b016765d2b651b9167f0a4caa6142d5f9.tar.gz
cygwin-gcc-58aad36b016765d2b651b9167f0a4caa6142d5f9.tar.xz
cygwin-gcc-58aad36b016765d2b651b9167f0a4caa6142d5f9.zip
cygwin-gcc 9.3.0
Diffstat (limited to '0020-cygwin-uses-cyg-lib-prefix-v3.patch')
-rw-r--r--0020-cygwin-uses-cyg-lib-prefix-v3.patch199
1 files changed, 0 insertions, 199 deletions
diff --git a/0020-cygwin-uses-cyg-lib-prefix-v3.patch b/0020-cygwin-uses-cyg-lib-prefix-v3.patch
deleted file mode 100644
index a1a1598..0000000
--- a/0020-cygwin-uses-cyg-lib-prefix-v3.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
-index 7a57019..6feeaf9 100644
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
-@@ -131,6 +131,7 @@ arext = .a
- soext = .so
- shext =
- hyphen = -
-+soprefix = lib
-
- # program_transform_name and objdir are set by configure.ac.
- program_transform_name =
-@@ -373,7 +374,7 @@ EH_MECHANISM=
-
- # Default shared object option. Note that we rely on the fact that the "soname"
- # option will always be present and last in this flag, so that we can have
--# $(SO_OPTS)libgnat-x.xx
-+# $(SO_OPTS)$(soprefix)gnat-x.xx
-
- SO_OPTS = -Wl,-soname,
-
-@@ -1847,6 +1848,9 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),)
- GMEM_LIB = gmemlib
- EXTRA_GNATTOOLS = ../../gnatdll$(exeext)
- EXTRA_GNATMAKE_OBJS = mdll.o mdll-utl.o mdll-fil.o
-+ ifeq ($(strip $(filter-out cygwin%,$(target_os))),)
-+ soprefix = cyg
-+ endif
- soext = .dll
- LIBRARY_VERSION := $(LIB_VERSION)
- endif
-@@ -2686,16 +2690,16 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR) install-gcc-specs
- # Also install the .dSYM directories if they exist (these directories
- # contain the debug information for the shared libraries on darwin)
- for file in gnat gnarl; do \
-- if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
-- $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ if [ -f $(RTSDIR)/$(soprefix)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
-+ $(INSTALL) $(RTSDIR)/$(soprefix)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
- fi; \
-- if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
-- $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(soext); \
-+ if [ -f $(RTSDIR)/$(soprefix)$${file}$(soext) ]; then \
-+ $(LN_S) $(soprefix)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$(soprefix)$${file}$(soext); \
- fi; \
-- if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
-- $(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
-+ if [ -d $(RTSDIR)/$(soprefix)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
-+ $(CP) -r $(RTSDIR)/$(soprefix)$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
- $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
- fi; \
- done
-@@ -2828,25 +2832,25 @@ gnatlib-shared-default:
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
-- $(RM) $(RTSDIR)/libgna*$(soext)
-+ $(RM) $(RTSDIR)/$(soprefix)gna*$(soext)
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
- $(PICFLAG_FOR_TARGET) \
-- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -o $(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(SO_OPTS)$(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(MISCLIB) -lm
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
- $(PICFLAG_FOR_TARGET) \
-- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -o $(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(GNATRTL_TASKING_OBJS) \
-- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(SO_OPTS)$(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(THREADSLIB)
-- cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- libgnat$(soext)
-- cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- libgnarl$(soext)
-+ cd $(RTSDIR); $(LN_S) $(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(soprefix)gnat$(soext)
-+ cd $(RTSDIR); $(LN_S) $(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(soprefix)gnarl$(soext)
-
- # Create static libgnat and libgnarl compiled with -fPIC
- $(RM) $(RTSDIR)/libgnat_pic$(arext) $(RTSDIR)/libgnarl_pic$(arext)
-@@ -2866,7 +2870,7 @@ gnatlib-shared-dual:
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib-shared-default
-- $(MV) $(RTSDIR)/libgna*$(soext) .
-+ $(MV) $(RTSDIR)/$(soprefix)gna*$(soext) .
- $(MV) $(RTSDIR)/libgnat_pic$(arext) .
- $(MV) $(RTSDIR)/libgnarl_pic$(arext) .
- $(RM) ../stamp-gnatlib2-$(RTSDIR)
-@@ -2877,7 +2881,7 @@ gnatlib-shared-dual:
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
-- $(MV) libgna*$(soext) $(RTSDIR)
-+ $(MV) $(soprefix)gna*$(soext) $(RTSDIR)
- $(MV) libgnat_pic$(arext) $(RTSDIR)
- $(MV) libgnarl_pic$(arext) $(RTSDIR)
-
-@@ -2890,7 +2894,7 @@ gnatlib-shared-dual-win32:
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib-shared-win32
-- $(MV) $(RTSDIR)/libgna*$(soext) .
-+ $(MV) $(RTSDIR)/$(soprefix)gna*$(soext) .
- $(RM) ../stamp-gnatlib2-$(RTSDIR)
- $(MAKE) $(FLAGS_TO_PASS) \
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
-@@ -2899,7 +2903,7 @@ gnatlib-shared-dual-win32:
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
-- $(MV) libgna*$(soext) $(RTSDIR)
-+ $(MV) $(soprefix)gna*$(soext) $(RTSDIR)
-
- # ??? we need to add the option to support auto-import of arrays/records to
- # the GNATLIBFLAGS when this will be supported by GNAT. At this point we will
-@@ -2913,22 +2917,24 @@ gnatlib-shared-win32:
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
-- $(RM) $(RTSDIR)/libgna*$(soext)
-+ $(RM) $(RTSDIR)/$(soprefix)gna*$(soext)
- $(CP) $(RTSDIR)/libgnat$(arext) $(RTSDIR)/libgnat_pic$(arext)
- $(CP) $(RTSDIR)/libgnarl$(arext) $(RTSDIR)/libgnarl_pic$(arext)
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc \
- $(PICFLAG_FOR_TARGET) \
-- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -o $(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
-+ -Wl,-out-implib,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)$(arext) \
-+ $(SO_OPTS)$(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc \
- $(PICFLAG_FOR_TARGET) \
-- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -o $(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(GNATRTL_TASKING_OBJS) \
-- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
-+ $(SO_OPTS)$(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -Wl,-out-implib,libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext)$(arext) \
-+ $(THREADSLIB) -Wl,$(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext)
-
- gnatlib-shared-darwin:
- $(MAKE) $(FLAGS_TO_PASS) \
-@@ -2938,29 +2944,29 @@ gnatlib-shared-darwin:
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
-- $(RM) $(RTSDIR)/libgnat$(soext) $(RTSDIR)/libgnarl$(soext)
-+ $(RM) $(RTSDIR)/$(soprefix)gnat$(soext) $(RTSDIR)/$(soprefix)gnarl$(soext)
- $(CP) $(RTSDIR)/libgnat$(arext) $(RTSDIR)/libgnat_pic$(arext)
- $(CP) $(RTSDIR)/libgnarl$(arext) $(RTSDIR)/libgnarl_pic$(arext)
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -dynamiclib $(PICFLAG_FOR_TARGET) \
-- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -o $(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
- $(SO_OPTS) \
-- -Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -Wl,-install_name,@rpath/$(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(MISCLIB)
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -dynamiclib $(PICFLAG_FOR_TARGET) \
-- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -o $(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(GNATRTL_TASKING_OBJS) \
- $(SO_OPTS) \
-- -Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
-- cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- libgnat$(soext)
-- cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- libgnarl$(soext)
-- cd $(RTSDIR); dsymutil libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
-- cd $(RTSDIR); dsymutil libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext)
-+ -Wl,-install_name,@rpath/$(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(THREADSLIB) -Wl,$(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext)
-+ cd $(RTSDIR); $(LN_S) $(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(soprefix)gnat$(soext)
-+ cd $(RTSDIR); $(LN_S) $(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(soprefix)gnarl$(soext)
-+ cd $(RTSDIR); dsymutil $(soprefix)gnat$(hyphen)$(LIBRARY_VERSION)$(soext)
-+ cd $(RTSDIR); dsymutil $(soprefix)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext)
-
- gnatlib-shared:
- $(MAKE) $(FLAGS_TO_PASS) \