View | Details | Raw Unified | Return to bug 240968 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/cargo.mk (-1 / +1 lines)
Lines 74-80 Link Here
74
RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/}
74
RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/}
75
.endif
75
.endif
76
76
77
.if ${ARCH} == powerpc64
77
.if ${ARCH} == powerpc64 && ${PPC_ABI} == ELFv1
78
USE_GCC?=	yes
78
USE_GCC?=	yes
79
.endif
79
.endif
80
80
(-)Mk/bsd.gecko.mk (+2 lines)
Lines 329-335 Link Here
329
.elif ${ARCH:Mpowerpc*}
329
.elif ${ARCH:Mpowerpc*}
330
. if ${ARCH} == "powerpc64"
330
. if ${ARCH} == "powerpc64"
331
MOZ_EXPORT+=	UNAME_m="${ARCH}"
331
MOZ_EXPORT+=	UNAME_m="${ARCH}"
332
.  if ${PPC_ABI} == ELFv1 
332
CFLAGS+=	-mminimal-toc
333
CFLAGS+=	-mminimal-toc
334
.  endif
333
. endif
335
. endif
334
.elif ${ARCH} == "sparc64"
336
.elif ${ARCH} == "sparc64"
335
# Work around miscompilation/mislinkage of the sCanonicalVTable hacks.
337
# Work around miscompilation/mislinkage of the sCanonicalVTable hacks.
(-)Mk/bsd.port.mk (+7 lines)
Lines 1126-1131 Link Here
1126
.endif
1126
.endif
1127
_EXPORTED_VARS+=	ARCH
1127
_EXPORTED_VARS+=	ARCH
1128
1128
1129
.if ${ARCH} == powerpc64
1130
PPC_ABI!=	${CC} -dM -E - < /dev/null | ${AWK} '/_CALL_ELF/{print "ELFv"$$3}'
1131
.  if ${PPC_ABI} != ELFv2
1132
PPC_ABI=	ELFv1
1133
.  endif
1134
.endif
1135
1129
# Get operating system versions for a cross build
1136
# Get operating system versions for a cross build
1130
.if defined(CROSS_SYSROOT)
1137
.if defined(CROSS_SYSROOT)
1131
.if !exists(${CROSS_SYSROOT}/usr/include/sys/param.h)
1138
.if !exists(${CROSS_SYSROOT}/usr/include/sys/param.h)

Return to bug 240968