loader [1/2]: change FreeBSD startup

Tijl Coosemans tijl at ulyssis.org
Tue Aug 8 10:15:23 CDT 2006


* locate Wine loader at 0x63f00000 on FreeBSD
* use wine-glibc as main binary on FreeBSD


Don't forget to regenerate configure.


Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.531
diff -u -r1.531 configure.ac
--- configure.ac	7 Aug 2006 18:15:59 -0000	1.531
+++ configure.ac	8 Aug 2006 14:34:46 -0000
@@ -1116,12 +1116,18 @@
 
         case $host_cpu in
           *i[[3456789]]86* | x86_64)
-            AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,
-              [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400],
+            case $host_os in
+              freebsd*)
+                reloc_addr=0x63f00400 ;;
+              *)
+                reloc_addr=0x7bf00400 ;;
+            esac
+            AC_CACHE_CHECK([whether we can relocate the executable to $reloc_addr], ac_cv_ld_reloc_exec,
+              [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=$reloc_addr],
                                ac_cv_ld_reloc_exec="yes", ac_cv_ld_reloc_exec="no")])
             if test "$ac_cv_ld_reloc_exec" = "yes"
             then
-              LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"
+              LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=$reloc_addr"
             fi
             ;;
         esac
@@ -1220,6 +1226,9 @@
       linux* | k*bsd*-gnu)
         AC_SUBST(MAIN_BINARY,"wine-glibc")
         AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") ;;
+      freebsd*)
+        AC_SUBST(MAIN_BINARY,"wine-glibc")
+        AC_SUBST(EXTRA_BINARIES,"wine-pthread") ;;
     esac
     ;;
 esac



More information about the wine-patches mailing list