M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-18 07:56:30 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:m-labs/artiq

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2015-08-10 15:18:50 +08:00
commit af230f6cf3
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/manual/installing.rst
View File

@ -81,6 +81,11 @@ and the ARTIQ kernels.
$ mkdir ~/artiq-dev $ mkdir ~/artiq-dev
* Clone ARTIQ repository: ::
$ cd ~/artiq-dev
$ git clone --recursive https://github.com/m-labs/artiq
* Install OpenRISC binutils (or1k-linux-...): :: * Install OpenRISC binutils (or1k-linux-...): ::
$ cd ~/artiq-dev $ cd ~/artiq-dev
@ -88,8 +93,11 @@ and the ARTIQ kernels.
$ tar xvf binutils-2.25.1.tar.bz2 $ tar xvf binutils-2.25.1.tar.bz2
$ rm binutils-2.25.1.tar.bz2 $ rm binutils-2.25.1.tar.bz2
$ mkdir binutils-2.25.1/build $ cd binutils-2.25.1
$ cd binutils-2.25.1/build $ patch -p1 <~/artiq-dev/misc/binutils-2.25.1-or1k-R_PCREL-pcrel_offset.patch
$ mkdir build
$ cd build
$ ../configure --target=or1k-linux --prefix=/usr/local $ ../configure --target=or1k-linux --prefix=/usr/local
$ make -j4 $ make -j4
$ sudo make install $ sudo make install

29
misc/binutils-2.25.1-or1k-R_PCREL-pcrel_offset.patch Normal file
View File

@ -0,0 +1,29 @@
--- a/bfd/elf32-or1k.c 2015-08-02 15:45:34.275922535 +0300
+++ b/bfd/elf32-or1k.c 2015-08-02 15:45:36.635931622 +0300
@@ -199,7 +199,7 @@
FALSE, /* partial_inplace */
0, /* src_mask */
0xffffffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ TRUE), /* pcrel_offset */
HOWTO (R_OR1K_16_PCREL,
0, /* rightshift */
@@ -213,7 +213,7 @@
FALSE, /* partial_inplace */
0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ TRUE), /* pcrel_offset */
HOWTO (R_OR1K_8_PCREL,
0, /* rightshift */
@@ -227,7 +227,7 @@
FALSE, /* partial_inplace */
0, /* src_mask */
0xff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ TRUE), /* pcrel_offset */
HOWTO (R_OR1K_GOTPC_HI16, /* Type. */
16, /* Rightshift. */