* configure.ac: On FreeBSD use -melf_*_fbsd format.

diff --git a/ChangeLog b/ChangeLog
index c9de2e698f3c85524dbda72221670ae294d97c11..356fc8e2079c549ef16316534e5ffaf07b779879 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * configure.ac: On FreeBSD use -melf_*_fbsd format.
+
 2013-09-21  Ales Nesrsta <starous@volny.cz>
 
        * grub-core/bus/usb/ehci.c: Correceted EHCI QH handling (async./sync.)

diff --git a/configure.ac b/configure.ac
index 457aafa4581885fb6a8bbbcd4fcee63ea80712db..e6ad049f14d1815c880736292f97d7d03caeced3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -633,14 +633,26 @@ if test "x$target_m64" = x1; then
   TARGET_MODULE_FORMAT="elf64"
 fi
 
-if test x"$target_os" != xcygwin; then
-   if test x"$target_cpu" = xi386; then
-     TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_i386"
-   fi
-   if test x"$target_cpu" = xx86_64; then
-     TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_x86_64"
-   fi
-fi
+case "$target_os" in
+  cygwin)
+    ;;
+  freebsd)
+    if test x"$target_cpu" = xi386; then
+      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_i386_fbsd"
+    fi
+    if test x"$target_cpu" = xx86_64; then
+      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_x86_64_fbsd"
+    fi
+    ;;
+  *)
+    if test x"$target_cpu" = xi386; then
+      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_i386"
+    fi
+    if test x"$target_cpu" = xx86_64; then
+      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_x86_64"
+    fi
+    ;;
+esac
 
 if test "$target_cpu" = x86_64; then
   # Use large model to support 4G memory