config/binutils.in
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 3120 f32c0f8ffaa3
permissions -rw-r--r--
debug/strace: pump version to 4.7 and 4.8

Pump version for strace to 4.7 and 4.8.
Add patch from strace mainline.


Work around conflict between <sys/ptrace.h> and <linux/ptrace.h>

Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
which collides with <linux/ptrace.h>.

* configure.ac: Check for `struct ptrace_peeksiginfo_args' in
<sys/ptrace.h>.
* process.c: Work around potential conflict between <sys/ptrace.h>
and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
* signal.c: Likewise.
* syscall.c: Likewise.
* util.c: Likewise.
http://sourceforge.net/p/strace/code/ci/0b4060f61f1bb101b5d8d084714b7d2feacdb199/

Signed-off-by: "Daniel Zimmermann" <netzimme@gmail.com>
Message-Id: <67b082cf1cdc8276eb4a.1385366288@haus-VirtualBox>
Patchwork-Id: 293842
yann@1345
     1
# Binary utilities menu
yann@1
     2
yann@1345
     3
menu "Binary utilities"
yann@1
     4
yann@1
     5
choice
yann@1
     6
    bool
yann@1345
     7
    prompt "Binary format:"
yann@1
     8
yann@1345
     9
config ARCH_BINFMT_ELF
yann@1
    10
    bool
yann@1345
    11
    prompt "ELF"
diorcet@3120
    12
    depends on ARCH_USE_MMU || BARE_METAL
yann@1345
    13
    help
antony@2564
    14
      This will make your system build ELF executables,
yann@1345
    15
      suitable for architectures with an MMU.
yann@1
    16
yann@1345
    17
config ARCH_BINFMT_FLAT
yann@1
    18
    bool
yann@1345
    19
    prompt "Flat"
diorcet@3120
    20
    depends on ! ARCH_USE_MMU
yann@1345
    21
    help
yann@1345
    22
      This will build flat binaries, suitable for
yann@1345
    23
      MMU-less architectures.
yann@1
    24
thomas@1887
    25
config ARCH_BINFMT_FDPIC
thomas@1887
    26
    bool
thomas@1887
    27
    prompt "FD_PIC ELF"
diorcet@3120
    28
    depends on ! ARCH_USE_MMU
thomas@1887
    29
    help
thomas@1887
    30
      This will build FD_PIC ELF binaries, suitable for
thomas@1887
    31
      MMU-less architectures that still require to use
thomas@1887
    32
      shared libraries (FIXME).
yann@1
    33
yann@1
    34
endchoice
yann@1
    35
diorcet@3123
    36
config BINUTILS
diorcet@3123
    37
    string
diorcet@3123
    38
diorcet@3123
    39
source "config.gen/binutils.in"
diorcet@3123
    40
source "config.gen/binutils.in.2"
yann@458
    41
yann@1
    42
endmenu