From 57a883640f3b43bf5e332d64489b3eab67a5ac3f Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 10 Mar 2014 16:23:09 -0700
Subject: [PATCH] Switch to upstream FreeBSD ldexp.c.

(Yes, this should be in libm, but it isn't. For once, this mistake predates
bionic!)

Change-Id: I1340407acbcdc0151dee969a38ba490bdd5e6767
---
 libc/Android.mk                                        | 2 +-
 libc/{bionic => upstream-freebsd/lib/libc/gen}/ldexp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename libc/{bionic => upstream-freebsd/lib/libc/gen}/ldexp.c (98%)

diff --git a/libc/Android.mk b/libc/Android.mk
index 4d85f890e..a41b1d4c2 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -58,7 +58,6 @@ libc_common_src_files := \
     bionic/ioctl.c \
     bionic/isatty.c \
     bionic/issetugid.c \
-    bionic/ldexp.c \
     bionic/md5.c \
     bionic/memmem.c \
     bionic/pathconf.c \
@@ -230,6 +229,7 @@ libc_bionic_src_files := \
     bionic/wchar.cpp \
 
 libc_upstream_freebsd_src_files := \
+    upstream-freebsd/lib/libc/gen/ldexp.c \
     upstream-freebsd/lib/libc/gen/sleep.c \
     upstream-freebsd/lib/libc/gen/usleep.c \
     upstream-freebsd/lib/libc/stdio/fclose.c \
diff --git a/libc/bionic/ldexp.c b/libc/upstream-freebsd/lib/libc/gen/ldexp.c
similarity index 98%
rename from libc/bionic/ldexp.c
rename to libc/upstream-freebsd/lib/libc/gen/ldexp.c
index ec1f3ddda..887f673ee 100644
--- a/libc/bionic/ldexp.c
+++ b/libc/upstream-freebsd/lib/libc/gen/ldexp.c
@@ -12,9 +12,10 @@
  */
 
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <endian.h>
+#include <machine/endian.h>
 #include <math.h>
 
 /* Bit fiddling routines copied from msun/src/math_private.h,v 1.15 */