aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/libhppa.h24
2 files changed, 29 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ac925f9..f96af27 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 30 20:04:10 1993 Stu Grossman (grossman@cygnus.com)
+
+ * libhppa.h: #undef e_* symbols which come from <machine/som.h>
+ when compiling under HPUX.
+
Fri Apr 30 17:25:23 1993 Stu Grossman (grossman@cygnus.com)
* The following patches are from Jeffrey Law <law@cs.utah.edu>.
diff --git a/bfd/libhppa.h b/bfd/libhppa.h
index 76b096e..5ae54cb 100644
--- a/bfd/libhppa.h
+++ b/bfd/libhppa.h
@@ -139,6 +139,30 @@ enum hppa_reloc_field_selector_type
};
+/* Need to undefine things defined in <machine/som.h> */
+
+#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
{