commit ec674b4d064d923818d0deba9f8378d13ff6451a
author Elliott Hughes <enh@google.com> Mon Mar 10 23:25:38 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 10 23:25:39 2014 +0000
tree d41780db5bb98c42ecb02267ed18d07ce6876307
parent 21d9e58d01080c7494c639ed3bd9e6c805e022d8
parent 57a883640f3b43bf5e332d64489b3eab67a5ac3f

Merge "Switch to upstream FreeBSD ldexp.c."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index efd6d43..d27d204 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -58,7 +58,6 @@
     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 @@
     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 \

libc/upstream-freebsd/lib/libc/gen/ldexp.c

diff --git a/libc/bionic/ldexp.c b/libc/upstream-freebsd/lib/libc/gen/ldexp.c
similarity index 97%
rename from libc/bionic/ldexp.c
rename to libc/upstream-freebsd/lib/libc/gen/ldexp.c
index ec1f3dd..887f673 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 */