diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/DeriveConstants.hs index 6344569..93d29b9 100644 --- a/utils/deriveConstants/DeriveConstants.hs +++ b/utils/deriveConstants/DeriveConstants.hs @@ -711,6 +711,7 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram -- "_derivedConstantMAX_Vanilla_REG C b 0" Mac OS X -- "derivedConstantMAX_Vanilla_REG C 0000000b 0000000b" GNU -- "derivedConstantMAX_Vanilla_REG D 1 b" Solaris + -- "_derivedConstantMAX_Vanilla_REG C 000000b" MinGW -- and returns ("MAX_Vanilla_REG", 11) parseNmLine xs0 = case words xs0 of [x0, x1, x2, x3] -> case stripPrefix prefix $ dropWhile (== '_') x0 of @@ -718,6 +719,11 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram [(size, "")] -> Just (name, size) _ -> Nothing _ -> Nothing + [x0, "C", x2] -> case stripPrefix prefix $ dropWhile (== '_') x0 of + Just name -> case readHex x2 of + [(size, "")] -> Just (name, size) + _ -> Nothing + _ -> Nothing _ -> Nothing -- If an Int value is larger than 2^28 or smaller