summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-09-09 21:28:37 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-09-13 11:25:29 -0400
commitccb4e646e0bd18d2664aeb1163ab2852b0844f2c (patch)
treed2afcd3f4e8336aa23622cfff97814cf03902e7f
parent71428a43bf122a24650af1fdf84a64543f267b8b (diff)
downloadhaskell-ccb4e646e0bd18d2664aeb1163ab2852b0844f2c.tar.gz
Compiler should always get fingerprinting impl from base
07ee15915d5a0d6d1aeee137541eec6e9c153e65 started the transition, but the job was never finished.
-rw-r--r--compiler/utils/Fingerprint.hs (renamed from compiler/utils/Fingerprint.hsc)3
-rw-r--r--compiler/utils/md5.h18
-rw-r--r--hadrian/src/Rules.hs1
3 files changed, 1 insertions, 21 deletions
diff --git a/compiler/utils/Fingerprint.hsc b/compiler/utils/Fingerprint.hs
index 377a378bb9..0d4499079f 100644
--- a/compiler/utils/Fingerprint.hsc
+++ b/compiler/utils/Fingerprint.hs
@@ -21,8 +21,7 @@ module Fingerprint (
getFileHash
) where
-#include "md5.h"
-##include "HsVersions.h"
+#include "HsVersions.h"
import GhcPrelude
diff --git a/compiler/utils/md5.h b/compiler/utils/md5.h
deleted file mode 100644
index 0b31f9019c..0000000000
--- a/compiler/utils/md5.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MD5 message digest */
-#pragma once
-
-#include "HsFFI.h"
-
-typedef HsWord32 word32;
-typedef HsWord8 byte;
-
-struct MD5Context {
- word32 buf[4];
- word32 bytes[2];
- word32 in[16];
-};
-
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, byte const *buf, int len);
-void MD5Final(byte digest[16], struct MD5Context *context);
-void MD5Transform(word32 buf[4], word32 const in[16]);
diff --git a/hadrian/src/Rules.hs b/hadrian/src/Rules.hs
index 5bb9d4cdc4..5b2682390a 100644
--- a/hadrian/src/Rules.hs
+++ b/hadrian/src/Rules.hs
@@ -51,7 +51,6 @@ toolArgsTarget = do
root <- buildRoot
let dir = buildDir (vanillaContext Stage0 compiler)
need [ root -/- dir -/- "Config.hs" ]
- need [ root -/- dir -/- "Fingerprint.hs" ]
need [ root -/- dir -/- "Parser.hs" ]
need [ root -/- dir -/- "Lexer.hs" ]
need [ root -/- dir -/- "CmmParse.hs" ]