aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Kingdon <jkingdon@engr.sgi.com>1993-08-31 17:11:46 +0000
committerJim Kingdon <jkingdon@engr.sgi.com>1993-08-31 17:11:46 +0000
commitaef3ae9a8f3972806867df03cf4720e830f24242 (patch)
tree1ee3234e2dc41714dd9603affe8e04c1ee89e81d
parent54fdaa7bbb8684d3c16b1dfbf4aea6ba3b363c30 (diff)
downloadgdb-aef3ae9a8f3972806867df03cf4720e830f24242.zip
gdb-aef3ae9a8f3972806867df03cf4720e830f24242.tar.gz
gdb-aef3ae9a8f3972806867df03cf4720e830f24242.tar.bz2
* libhppa.h: Restore #undefs of e_fsel and other e_* symbols.
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/libhppa.h27
2 files changed, 31 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 05aa262..12beae3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 31 12:07:43 1993 Jim Kingdon (kingdon@lioth.cygnus.com)
+
+ * libhppa.h: Restore #undefs of e_fsel and other e_* symbols.
+
Fri Aug 27 16:43:35 1993 Ken Raeburn (raeburn@cambridge.cygnus.com)
* section.c (struct sec): Move position of user_set_vma, and
diff --git a/bfd/libhppa.h b/bfd/libhppa.h
index 14c8899..f357fe5 100644
--- a/bfd/libhppa.h
+++ b/bfd/libhppa.h
@@ -54,6 +54,33 @@ enum hppa_reloc_field_selector_type
R_HPPA_RTSEL = 0xe
};
+/* /usr/include/reloc.h defines these to constants. We want to use
+ them in enums, so #undef them before we start using them. We might
+ be able to fix this another way by simply managing not to include
+ /usr/include/reloc.h, but currently GDB picks up these defines
+ somewhere. */
+#undef e_fsel
+#undef e_lssel
+#undef e_rssel
+#undef e_lsel
+#undef e_rsel
+#undef e_ldsel
+#undef e_rdsel
+#undef e_lrsel
+#undef e_rrsel
+#undef e_psel
+#undef e_lpsel
+#undef e_rpsel
+#undef e_tsel
+#undef e_ltsel
+#undef e_rtsel
+#undef e_one
+#undef e_two
+#undef e_pcrel
+#undef e_con
+#undef e_plabel
+#undef e_abs
+
/* for compatibility */
enum hppa_reloc_field_selector_type_alt
{