diff options
| author | Sverker Eriksson <[email protected]> | 2017-03-31 14:58:12 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-31 14:58:12 +0200 |
| commit | b22affb8b5ea200ec11e98f734cd43218ac6b88e (patch) | |
| tree | 563f03350ea72c910ad47e26aacb9ff8412cca59 | |
| parent | 5da9e0ab5cb96f2cb37e534b2c1a55c0c2c9783c (diff) | |
| parent | 0c2fea970cf8b24d103bcba66bf858eea5663f74 (diff) | |
| download | otp-b22affb8b5ea200ec11e98f734cd43218ac6b88e.tar.gz otp-b22affb8b5ea200ec11e98f734cd43218ac6b88e.tar.bz2 otp-b22affb8b5ea200ec11e98f734cd43218ac6b88e.zip | |
Merge PR-1394 from kostis/hipe-ppc-fixes ERL-369 OTP-14314
HiPE PPC fixes
| -rw-r--r-- | erts/configure.in | 2 | ||||
| -rw-r--r-- | erts/emulator/hipe/elf64ppc.x | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index 7c6f4b163c..d7d56d45b6 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -622,7 +622,7 @@ case $chk_arch_ in powerpc) ARCH=ppc;; ppc) ARCH=ppc;; ppc64) ARCH=ppc64;; - ppc64le) ARCH=ppc64;; + ppc64le) ARCH=ppc64le;; "Power Macintosh") ARCH=ppc;; armv5b) ARCH=arm;; armv5teb) ARCH=arm;; diff --git a/erts/emulator/hipe/elf64ppc.x b/erts/emulator/hipe/elf64ppc.x index 46d2632970..bb14a6cd29 100644 --- a/erts/emulator/hipe/elf64ppc.x +++ b/erts/emulator/hipe/elf64ppc.x @@ -28,7 +28,7 @@ SEARCH_DIR("/mnt/archive/cross-ppc64/ppc64-unknown-linux/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ - PROVIDE (__executable_start = 0x0180000); . = 0x01800000 + SIZEOF_HEADERS; + PROVIDE (__executable_start = 0x01800000); . = 0x01800000 + SIZEOF_HEADERS; .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } |