aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2013-10-07 09:53:41 +1030
committerAlan Modra <amodra@gmail.com>2013-10-07 09:58:30 +1030
commit9ec1b13d0162034464202b06d81b9daa9fe840e7 (patch)
tree84ad3053d978607ac913c0ce99ab0a9a8431633f
parent44a73ed67058f9cef4081202c879827b4454e417 (diff)
downloadglibc-9ec1b13d0162034464202b06d81b9daa9fe840e7.tar
glibc-9ec1b13d0162034464202b06d81b9daa9fe840e7.tar.gz
glibc-9ec1b13d0162034464202b06d81b9daa9fe840e7.tar.bz2
glibc-9ec1b13d0162034464202b06d81b9daa9fe840e7.zip
Fix careless merge.
-rw-r--r--ChangeLog4
-rw-r--r--README2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f48dc4440..44ebf726d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-07 Alan Modra <amodra@gmail.com>
+
+ * README: Fix careless merge.
+
2013-10-05 Alan Modra <amodra@gmail.com>
* NEWS: Mention powerpc64le support and bugs fixed.
diff --git a/README b/README
index 96dd6f6a7c..0999fcf19f 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ The GNU C Library supports these configurations for using Linux kernels:
i[4567]86-*-linux-gnu
x86_64-*-linux-gnu Can build either x86_64 or x32
- powerpc-*-linux-gnu Hardware floating point required, BE only.
+ powerpc-*-linux-gnu Hardware or software floating point, BE only.
powerpc64*-*-linux-gnu Big-endian and little-endian.
s390-*-linux-gnu
s390x-*-linux-gnu