aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-10-03 10:11:18 +0200
committerBjörn Gustavsson <[email protected]>2017-10-05 12:37:56 +0200
commite1c9772ffdacae4007209ac5a82758b8e0d3cec4 (patch)
tree951cc6b18823b447f41660d97bc36a44c8ce8b41
parent15099d5752d99587b24e00335713af9d82f16c34 (diff)
downloadotp-e1c9772ffdacae4007209ac5a82758b8e0d3cec4.tar.gz
otp-e1c9772ffdacae4007209ac5a82758b8e0d3cec4.tar.bz2
otp-e1c9772ffdacae4007209ac5a82758b8e0d3cec4.zip
Move LD flags for hipe from Makefile.in to configure.in
We want the flags to be available for other tests in configure.in.
-rw-r--r--erts/configure.in14
-rw-r--r--erts/emulator/Makefile.in11
2 files changed, 15 insertions, 10 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 9dec562f33..85e167b93b 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2766,6 +2766,20 @@ if test X${enable_hipe} = Xyes && test X$ARCH = Xamd64; then
LDFLAGS=$saved_LDFLAGS])])])
fi
+if test X${enable_hipe} = Xyes; then
+ case $OPSYS in
+ linux)
+ ppcBEAMLDFLAGS="-Wl,-m,elf32ppc"
+ ppc64BEAMLDFLAGS="-Wl,-m,elf64ppc,-T,hipe/elf64ppc.x"
+ ;;
+ darwin)
+ amd64BEAMLDFLAGS="-pagezero_size 0x10000000"
+ ;;
+ esac
+ archVarName="${ARCH}BEAMLDFLAGS"
+ eval HIPEBEAMLDFLAGS=\$$archVarName
+fi
+AC_SUBST(HIPEBEAMLDFLAGS)
if test X${enable_fp_exceptions} = Xauto ; then
case $host_os in
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 915cad4e18..85ca145d9f 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -240,16 +240,7 @@ ARCH=@ARCH@
ultrasparcCFLAGS=-Wa,-xarch=v8plusa
ARCHCFLAGS=$($(ARCH)CFLAGS)
-ifdef HIPE_ENABLED
-ifeq ($(OPSYS),linux)
-ppcBEAMLDFLAGS=-Wl,-m,elf32ppc
-ppc64BEAMLDFLAGS=-Wl,-m,elf64ppc,-T,hipe/elf64ppc.x
-endif
-ifeq ($(OPSYS),darwin)
-amd64BEAMLDFLAGS=-pagezero_size 0x10000000
-endif
-HIPEBEAMLDFLAGS=$($(ARCH)BEAMLDFLAGS)
-endif
+HIPEBEAMLDFLAGS=@HIPEBEAMLDFLAGS@
ERTS_BUILD_FALLBACK_POLL=@ERTS_BUILD_FALLBACK_POLL@