Commit a55d121f authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging 



# By Erik de Castro Lopo (2) and others
# Via Riku Voipio
* riku/linux-user-for-upstream:
  linux-user: pass correct parameter to do_shmctl()
  linux-user: create target_structs header to place ipc_perm and shmid_ds
  flatload: fix non-GOT relocations
  linux-user: Implement handling of 5 POSIX timer syscalls.
  linux-user: Add target struct defs needed for POSIX timer syscalls.

Message-id: cover.1385732338.git.riku.voipio@linaro.org
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents e679f052 a2926784

linux-user/aarch64/target_structs.h

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * ARM AArch64 specific structures for linux-user

 *

 * Copyright (c) 2013 Fabrice Bellard

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */

#ifndef TARGET_STRUCTS_H

#define TARGET_STRUCTS_H



struct target_ipc_perm {

    abi_int __key;                      /* Key.  */

    abi_uint uid;                       /* Owner's user ID.  */

    abi_uint gid;                       /* Owner's group ID.  */

    abi_uint cuid;                      /* Creator's user ID.  */

    abi_uint cgid;                      /* Creator's group ID.  */

    abi_ushort mode;                    /* Read/write permission.  */

    abi_ushort __pad1;

    abi_ushort __seq;                   /* Sequence number.  */

    abi_ushort __pad2;

    abi_ulong __unused1;

    abi_ulong __unused2;

};



struct target_shmid_ds {

    struct target_ipc_perm shm_perm;    /* operation permission struct */

    abi_long shm_segsz;                 /* size of segment in bytes */

    abi_ulong shm_atime;                /* time of last shmat() */

#if TARGET_ABI_BITS == 32

    abi_ulong __unused1;

#endif

    abi_ulong shm_dtime;                /* time of last shmdt() */

#if TARGET_ABI_BITS == 32

    abi_ulong __unused2;

#endif

    abi_ulong shm_ctime;                /* time of last change by shmctl() */

#if TARGET_ABI_BITS == 32

    abi_ulong __unused3;

#endif

    abi_int shm_cpid;                   /* pid of creator */

    abi_int shm_lpid;                   /* pid of last shmop */

    abi_ulong shm_nattch;               /* number of current attaches */

    abi_ulong __unused4;

    abi_ulong __unused5;

};



#endif

linux-user/alpha/target_structs.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Alpha specific structures for linux-user

 *

 * Copyright (c) 2013 Fabrice Bellard

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */

#ifndef TARGET_STRUCTS_H

#define TARGET_STRUCTS_H



struct target_ipc_perm {

    abi_int __key;                      /* Key.  */

    abi_uint uid;                       /* Owner's user ID.  */

    abi_uint gid;                       /* Owner's group ID.  */

    abi_uint cuid;                      /* Creator's user ID.  */

    abi_uint cgid;                      /* Creator's group ID.  */

    abi_uint mode;                      /* Read/write permission.  */

    abi_ushort __seq;                   /* Sequence number.  */

    abi_ushort __pad1;

    abi_ulong __unused1;

    abi_ulong __unused2;

};



struct target_shmid_ds {

    struct target_ipc_perm shm_perm;    /* operation permission struct */

    abi_long shm_segsz;                 /* size of segment in bytes */

    abi_ulong shm_atime;                /* time of last shmat() */

    abi_ulong shm_dtime;                /* time of last shmdt() */

    abi_ulong shm_ctime;                /* time of last change by shmctl() */

    abi_int shm_cpid;                   /* pid of creator */

    abi_int shm_lpid;                   /* pid of last shmop */

    abi_ulong shm_nattch;               /* number of current attaches */

    abi_ulong __unused1;

    abi_ulong __unused2;

};



#endif

linux-user/arm/target_structs.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * ARM specific structures for linux-user

 *

 * Copyright (c) 2013 Fabrice Bellard

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */

#ifndef TARGET_STRUCTS_H

#define TARGET_STRUCTS_H



struct target_ipc_perm {

    abi_int __key;                      /* Key.  */

    abi_uint uid;                       /* Owner's user ID.  */

    abi_uint gid;                       /* Owner's group ID.  */

    abi_uint cuid;                      /* Creator's user ID.  */

    abi_uint cgid;                      /* Creator's group ID.  */

    abi_ushort mode;                    /* Read/write permission.  */

    abi_ushort __pad1;

    abi_ushort __seq;                   /* Sequence number.  */

    abi_ushort __pad2;

    abi_ulong __unused1;

    abi_ulong __unused2;

};



struct target_shmid_ds {

    struct target_ipc_perm shm_perm;    /* operation permission struct */

    abi_long shm_segsz;                 /* size of segment in bytes */

    abi_ulong shm_atime;                /* time of last shmat() */

    abi_ulong __unused1;

    abi_ulong shm_dtime;                /* time of last shmdt() */

    abi_ulong __unused2;

    abi_ulong shm_ctime;                /* time of last change by shmctl() */

    abi_ulong __unused3;

    abi_int shm_cpid;                   /* pid of creator */

    abi_int shm_lpid;                   /* pid of last shmop */

    abi_ulong shm_nattch;               /* number of current attaches */

    abi_ulong __unused4;

    abi_ulong __unused5;

};



#endif

linux-user/cris/target_structs.h

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * CRIS specific structures for linux-user

 *

 * Copyright (c) 2013 Fabrice Bellard

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */

#ifndef TARGET_STRUCTS_H

#define TARGET_STRUCTS_H



struct target_ipc_perm {

    abi_int __key;                      /* Key.  */

    abi_uint uid;                       /* Owner's user ID.  */

    abi_uint gid;                       /* Owner's group ID.  */

    abi_uint cuid;                      /* Creator's user ID.  */

    abi_uint cgid;                      /* Creator's group ID.  */

    abi_ushort mode;                    /* Read/write permission.  */

    abi_ushort __pad1;

    abi_ushort __seq;                   /* Sequence number.  */

    abi_ushort __pad2;

    abi_ulong __unused1;

    abi_ulong __unused2;

};



struct target_shmid_ds {

    struct target_ipc_perm shm_perm;    /* operation permission struct */

    abi_long shm_segsz;                 /* size of segment in bytes */

    abi_ulong shm_atime;                /* time of last shmat() */

#if TARGET_ABI_BITS == 32

    abi_ulong __unused1;

#endif

    abi_ulong shm_dtime;                /* time of last shmdt() */

#if TARGET_ABI_BITS == 32

    abi_ulong __unused2;

#endif

    abi_ulong shm_ctime;                /* time of last change by shmctl() */

#if TARGET_ABI_BITS == 32

    abi_ulong __unused3;

#endif

    abi_int shm_cpid;                   /* pid of creator */

    abi_int shm_lpid;                   /* pid of last shmop */

    abi_ulong shm_nattch;               /* number of current attaches */

    abi_ulong __unused4;

    abi_ulong __unused5;

};



#endif

linux-user/flatload.c

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ static int load_flat_file(struct linux_binprm * bprm, 
            /* Get the pointer's value.  */

            if (get_user_ual(addr, rp))

                return -EFAULT;

            addr = flat_get_addr_from_rp(rp, relval, flags, &persistent);

            addr = flat_get_addr_from_rp(addr, relval, flags, &persistent);

            if (addr != 0) {

                /*

                 * Do the relocation.  PIC relocs in the data section are