NewCodeGen does not create enough SRT labels when using SplitObjs

[darchon]

When building HEAD I get the following error:

make -r --no-print-directory -f ghc.mk phase=final all

HC [stage 1] libraries/integer-gmp/dist-install/build/GHC/Integer/Type.o

/var/folders/ka/kaF7CETOGrynlpfcm3Ojdk++06g/-Tmp-/ghc91903_0/ghc91903_0.split__51.s:29:0:

non-relocatable subtraction expression, "_integerzmgmp_GHCziIntegerziType_S3Dk_srt" minus "_c3Co_info"

/var/folders/ka/kaF7CETOGrynlpfcm3Ojdk++06g/-Tmp-/ghc91903_0/ghc91903_0.split__51.s:29:0:

symbol: "_integerzmgmp_GHCziIntegerziType_S3Dk_srt" can't be undefined in a subtraction expression

/var/folders/ka/kaF7CETOGrynlpfcm3Ojdk++06g/-Tmp-/ghc91903_0/ghc91903_0.split__51.s:14:0:

non-relocatable subtraction expression, "_integerzmgmp_GHCziIntegerziType_S3Dk_srt" minus "_integerzmgmp_GHCziIntegerziType_negateInteger_info"

/var/folders/ka/kaF7CETOGrynlpfcm3Ojdk++06g/-Tmp-/ghc91903_0/ghc91903_0.split__51.s:14:0:

symbol: "_integerzmgmp_GHCziIntegerziType_S3Dk_srt" can't be undefined in a subtraction expression

make[1]: *** [libraries/integer-gmp/dist-install/build/GHC/Integer/Type.o] Error 1 make: *** [all] Error 2

Indeed, the symbol/label is not defined in the generated assembly (no .globl declaration)

When building with object splitting disabled ("SplitObjs? = NO" in build.mk) the error does not occur.

[darchon]

Assembly file causing the error

[darchon]

Some additional info.

Build still fails as of: 9615222985f40b62410e1ccc7b6e8581c2729150

My system:

OS X 10.6.8
XCode 3.2.6
Bootstrap: GHC 7.4.2 (i386)

build.mk:

SRC_HC_OPTS     = -O -H64m
GhcStage1HcOpts = -O -fasm
GhcStage2HcOpts = -O2 -fasm
GhcHcOpts       = -Rghc-timing
GhcLibHcOpts    = -O2
GhcLibWays = v

[simonmar]

Could you try again now please? I think I may have fixed this.

[darchon]

Everything is working using: 42cb30bd2c00705da598cc8d4170b41fb5693166

[simonmar]

Great! thanks.