get rid of i386elf.h which is an embedded platform include.

Get the only define we want, namely the debugger registers.
with this, i386 emits dwarf2 by default. Considering how well stabs
are tested in recent gcc (not), this is a good thing.

Sleuthing work by kettenis@ and me.

Tried out by lots of people, including me, naddy, pvalchev, kettenis,
henning, hshoexer...

2 files changed, 3 insertions, 2 deletions

diff --git a/gnu/usr.bin/gcc/gcc/config.gcc b/gnu/usr.bin/gcc/gcc/config.gcc
index 5360322ff8e..8bca2161852 100644
--- a/gnu/usr.bin/gcc/gcc/config.gcc
+++ b/gnu/usr.bin/gcc/gcc/config.gcc
@@ -1170,12 +1170,11 @@ i[34567]86-*-openbsd2* | i[34567]86-*-openbsd3.[0123])
 i[34567]86-*-openbsd*)
 	# needed to unconfuse gdb
 	tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
-	tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
+	tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h"
 	tm_file="${tm_file} exec-stack.h"
 	tm_file="${tm_file} openbsd.h openbsd-libpthread.h i386/openbsdelf.h"
 	gas=yes
 	gnu_ld=yes
-	stabs=yes
   	;;
 x86_64-*-openbsd*)
 	tm_file="i386/biarch64.h i386/i386.h i386/unix.h i386/att.h dbxelf.h elfos.h openbsd.h openbsd-libpthread.h i386/x86-64.h i386/openbsd64.h"
diff --git a/gnu/usr.bin/gcc/gcc/config/i386/openbsdelf.h b/gnu/usr.bin/gcc/gcc/config/i386/openbsdelf.h
index 49dc00a7ca3..52e6fda4944 100644
--- a/gnu/usr.bin/gcc/gcc/config/i386/openbsdelf.h
+++ b/gnu/usr.bin/gcc/gcc/config/i386/openbsdelf.h
@@ -27,6 +27,8 @@ Boston, MA 02111-1307, USA.  */
 #undef ASM_COMMENT_START
 #define ASM_COMMENT_START "#"
 
+#undef DBX_REGISTER_NUMBER
+#define DBX_REGISTER_NUMBER(n)  svr4_dbx_register_map[n]
 
 /* This goes away when the math-emulator is fixed */
 #undef TARGET_DEFAULT