From 359a301e1f9fe55eb7c03d8d6c079e10e2355bc9 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Wed, 23 Dec 2015 10:12:18 -0600
Subject: [PATCH] Upstream now carries vcruntime140.dll

---
 wine-relocate-base.patch | 86 ----------------------------------------
 wine.spec                |  2 -
 2 files changed, 88 deletions(-)
 delete mode 100644 wine-relocate-base.patch

diff --git a/wine-relocate-base.patch b/wine-relocate-base.patch
deleted file mode 100644
index f744f9a..0000000
--- a/wine-relocate-base.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 509a781e793cc6d15d74e1ffc5fc8d4a3c31026a Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Wed, 21 Oct 2015 10:26:40 -0500
-Subject: [PATCH] winegcc: Check for linker relocation support before relying
- on prelink
-
-Prelink was used to rewrite binares and set their text segment, but
-modern linkers support setting the value at link time. Prelink is
-being retired by upstream.
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
----
- configure.ac            | 11 ++++++++---
- tools/winegcc/winegcc.c | 12 ++++++++++--
- 2 files changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5ab2d69..a30b552 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -988,10 +988,15 @@ wine-installed: main.o
-                            *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;;
-                            esac
-                           ])
--          AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
--          if test "x$PRELINK" = xfalse
-+          WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
-+                          [HAVE_TTEXT_SEGMENT="yes"])
-+          if test "x$HAVE_TTEXT_SEGMENT" != "xyes"
-           then
--              WINE_WARNING([prelink not found, base address of core dlls won't be set correctly.])
-+              AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
-+              if test "x$PRELINK" = xfalse
-+              then
-+                  WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.])
-+              fi
-           fi
-           ;;
-       esac
-diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
-index 3b2794e..fa62c34 100644
---- a/tools/winegcc/winegcc.c
-+++ b/tools/winegcc/winegcc.c
-@@ -778,6 +778,7 @@ static void build(struct options* opts)
-     const char *output_name, *spec_file, *lang;
-     int generate_app_loader = 1;
-     int fake_module = 0;
-+    int text_segment = 0;
-     unsigned int j;
- 
-     /* NOTE: for the files array we'll use the following convention:
-@@ -1112,6 +1113,11 @@ static void build(struct options* opts)
-     for ( j = 0 ; j < opts->linker_args->size ; j++ ) 
-         strarray_add(link_args, opts->linker_args->base[j]);
- 
-+    /* check linker support for setting text base address */
-+    if (opts->image_base &&
-+        !try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)))
-+        text_segment = 1;
-+
-     switch (opts->target_platform)
-     {
-     case PLATFORM_APPLE:
-@@ -1134,6 +1140,8 @@ static void build(struct options* opts)
-         }
-         break;
-     default:
-+        if (text_segment)
-+            strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base));
-         break;
-     }
- 
-@@ -1167,8 +1175,8 @@ static void build(struct options* opts)
-     spawn(opts->prefix, link_args, 0);
-     strarray_free (link_args);
- 
--    /* set the base address */
--    if (opts->image_base && !opts->target)
-+    /* set the base address with prelink if linker support is not present */
-+    if (opts->image_base && !opts->target && !text_segment)
-     {
-         const char *prelink = PRELINK;
-         if (prelink[0] && strcmp(prelink,"false"))
--- 
-2.4.3
-
diff --git a/wine.spec b/wine.spec
index 6956b5f..e7a126e 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1582,9 +1582,7 @@ fi
 %{_libdir}/wine/vcomp100.dll.so
 %{_libdir}/wine/vcomp110.dll.so
 %{_libdir}/wine/vcomp120.dll.so
-%if 0%{?compholio}
 %{_libdir}/wine/vcruntime140.dll.so
-%endif
 %{_libdir}/wine/vdmdbg.dll.so
 %{_libdir}/wine/version.dll.so
 %{_libdir}/wine/vssapi.dll.so