aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-06 15:40:00 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-06 15:40:00 -0700
commitc8dacba762e1c672b9592e0d1e8dca722422f325 (patch)
tree6f829d4a6079498612df8db20582e07a58965d05 /Makefile
parentdbf64e125a96cd9e6de401361613e8dc888c65ee (diff)
parentf200197c39d9181c02cac06c26433edaa9d31219 (diff)
downloadgit-c8dacba762e1c672b9592e0d1e8dca722422f325.tar.gz
git-c8dacba762e1c672b9592e0d1e8dca722422f325.tar.xz
Merge branch 'jn/block-sha1' into maint
* jn/block-sha1: Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads block-sha1: put expanded macro parameters in parentheses block-sha1: avoid pointer conversion that violates alignment constraints
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3019b01d5..df583035e 100644
--- a/Makefile
+++ b/Makefile
@@ -127,9 +127,8 @@ all::
# specify your own (or DarwinPort's) include directories and
# library directories by defining CFLAGS and LDFLAGS appropriately.
#
-# Define BLK_SHA1 environment variable if you want the C version
-# of the SHA1 that assumes you can do unaligned 32-bit loads and
-# have a fast htonl() function.
+# Define BLK_SHA1 environment variable to make use of the bundled
+# optimized C SHA1 routine.
#
# Define PPC_SHA1 environment variable when running make to make use of
# a bundled SHA1 routine optimized for PowerPC.