Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 3e1e401053ea5f02a9e9c65abddd31a03baa1bd1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yao Qi <yao.qi@linaro.org> |
| 3 | Date: Fri, 29 Dec 2017 12:57:25 +0800 |
| 4 | Subject: [PATCH] Unbreak GDBserver build for x32 |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | When I verify my target description changes, I build GDB and GDBserver for |
| 10 | x32, but it failed. |
| 11 | |
| 12 | /../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c |
| 13 | ../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c: In function ‘const target_desc* get_ipa_tdesc(int)’: |
| 14 | ../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c:184:10: error: ‘X86_TDESC_AVX512’ was not declared in this scope |
| 15 | case X86_TDESC_AVX512: |
| 16 | ^ |
| 17 | ../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c:185:14: error: ‘tdesc_x32_avx512_linux’ was not declared in this scope |
| 18 | return tdesc_x32_avx512_linux; |
| 19 | ^ |
| 20 | ../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c: In function ‘void initialize_low_tracepoint()’: |
| 21 | ../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c:282:36: error: ‘init_registers_x32_avx512_linux’ was not declared in this scope |
| 22 | init_registers_x32_avx512_linux (); |
| 23 | ^ |
| 24 | |
| 25 | ipa_x32_linux_regobj use to be there, but removed by |
| 26 | 22049425ce40324139be82d9a6ec518c46b65815 by mistake. |
| 27 | |
| 28 | gdb/gdbserver: |
| 29 | |
| 30 | 2017-08-04 Yao Qi <yao.qi@linaro.org> |
| 31 | |
| 32 | * configure.srv (ipa_x32_linux_regobj): New. |
| 33 | * linux-amd64-ipa.c (get_ipa_tdesc): Use X86_TDESC_AVX_AVX512 |
| 34 | instead of X86_TDESC_AVX512. |
| 35 | (initialize_low_tracepoint): Call |
| 36 | init_registers_x32_avx_avx512_linux. |
| 37 | |
| 38 | Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=f02fd7745d003d65fd3b981618e07b874b721d79] |
| 39 | |
| 40 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| 41 | --- |
| 42 | ChangeLog | 8 ++++++++ |
| 43 | gdb/gdbserver/configure.srv | 1 + |
| 44 | gdb/gdbserver/linux-amd64-ipa.c | 6 +++--- |
| 45 | 3 files changed, 12 insertions(+), 3 deletions(-) |
| 46 | |
| 47 | diff --git a/ChangeLog b/ChangeLog |
| 48 | index 4ac2d63..b5b8228 100644 |
| 49 | --- a/ChangeLog |
| 50 | +++ b/ChangeLog |
| 51 | @@ -1,3 +1,11 @@ |
| 52 | + 2017-08-04 Yao Qi <yao.qi@linaro.org> |
| 53 | + |
| 54 | + * configure.srv (ipa_x32_linux_regobj): New. |
| 55 | + * linux-amd64-ipa.c (get_ipa_tdesc): Use X86_TDESC_AVX_AVX512 |
| 56 | + instead of X86_TDESC_AVX512. |
| 57 | + (initialize_low_tracepoint): Call |
| 58 | + init_registers_x32_avx_avx512_linux. |
| 59 | + |
| 60 | 2017-04-13 Andrew Jenner <andrew@codesourcery.com> |
| 61 | |
| 62 | * config.sub: Sync with master version in config project. |
| 63 | diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv |
| 64 | index d00d9e2..56951c8 100644 |
| 65 | --- a/gdb/gdbserver/configure.srv |
| 66 | +++ b/gdb/gdbserver/configure.srv |
| 67 | @@ -31,6 +31,7 @@ srv_amd64_linux_regobj="amd64-linux.o amd64-avx-linux.o amd64-avx-avx512-linux.o |
| 68 | |
| 69 | ipa_i386_linux_regobj="i386-linux-ipa.o i386-avx-linux-ipa.o i386-avx-mpx-linux-ipa.o i386-avx-avx512-linux-ipa.o i386-avx-mpx-avx512-pku-linux-ipa.o i386-mpx-linux-ipa.o i386-mmx-linux-ipa.o" |
| 70 | ipa_amd64_linux_regobj="amd64-linux-ipa.o amd64-avx-linux-ipa.o amd64-avx-mpx-linux-ipa.o amd64-avx-avx512-linux-ipa.o amd64-avx-mpx-avx512-pku-linux-ipa.o amd64-mpx-linux-ipa.o" |
| 71 | +ipa_x32_linux_regobj="x32-linux-ipa.o x32-avx-linux-ipa.o x32-avx-avx512-linux-ipa.o" |
| 72 | ipa_ppc_linux_regobj="powerpc-32l-ipa.o powerpc-altivec32l-ipa.o powerpc-cell32l-ipa.o powerpc-vsx32l-ipa.o powerpc-isa205-32l-ipa.o powerpc-isa205-altivec32l-ipa.o powerpc-isa205-vsx32l-ipa.o powerpc-e500l-ipa.o powerpc-64l-ipa.o powerpc-altivec64l-ipa.o powerpc-cell64l-ipa.o powerpc-vsx64l-ipa.o powerpc-isa205-64l-ipa.o powerpc-isa205-altivec64l-ipa.o powerpc-isa205-vsx64l-ipa.o" |
| 73 | |
| 74 | srv_i386_32bit_xmlfiles="i386/32bit-core.xml i386/32bit-sse.xml i386/32bit-avx.xml i386/32bit-avx512.xml i386/32bit-mpx.xml i386/32bit-pkeys.xml" |
| 75 | diff --git a/gdb/gdbserver/linux-amd64-ipa.c b/gdb/gdbserver/linux-amd64-ipa.c |
| 76 | index 67f36c2..683339b 100644 |
| 77 | --- a/gdb/gdbserver/linux-amd64-ipa.c |
| 78 | +++ b/gdb/gdbserver/linux-amd64-ipa.c |
| 79 | @@ -181,8 +181,8 @@ get_ipa_tdesc (int idx) |
| 80 | return tdesc_x32_linux; |
| 81 | case X86_TDESC_AVX: |
| 82 | return tdesc_x32_avx_linux; |
| 83 | - case X86_TDESC_AVX512: |
| 84 | - return tdesc_x32_avx512_linux; |
| 85 | + case X86_TDESC_AVX_AVX512: |
| 86 | + return tdesc_x32_avx_avx512_linux; |
| 87 | default: |
| 88 | break; |
| 89 | } |
| 90 | @@ -279,7 +279,7 @@ initialize_low_tracepoint (void) |
| 91 | #if defined __ILP32__ |
| 92 | init_registers_x32_linux (); |
| 93 | init_registers_x32_avx_linux (); |
| 94 | - init_registers_x32_avx512_linux (); |
| 95 | + init_registers_x32_avx_avx512_linux (); |
| 96 | #else |
| 97 | init_registers_amd64_linux (); |
| 98 | init_registers_amd64_avx_linux (); |
| 99 | -- |
| 100 | 2.7.4 |
| 101 | |