aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/darwin.h6
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0d8c853..5e2ee0c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-20 Mike Stump <mrs@apple.com>
+
+ * config/darwin.h (TARGET_OPTION_TRANSLATE_TABLE): Handle the
+ ambiguity between -seg_addr_table and -seg_addr_table_filename.
+ (WORD_SWITCH_TAKES_ARG): Likewise.
+ (LINK_SPEC): Likewise.
+
2005-12-20 Kenneth Zadeck <zadeck@naturalbridge.com>
* cfganal.c (flow_reverse_top_sort_order_compute):
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 757bedc..ad1d051 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -123,7 +123,7 @@ Boston, MA 02110-1301, USA. */
{ "-segs_read_only_addr", "-Zsegs_read_only_addr" }, \
{ "-segs_read_write_addr", "-Zsegs_read_write_addr" }, \
{ "-seg_addr_table", "-Zseg_addr_table" }, \
- { "-seg_addr_table_filename", "-Zseg_addr_table_filename" }, \
+ { "-seg_addr_table_filename", "-Zfn_seg_addr_table_filename" }, \
{ "-filelist", "-Xlinker -filelist -Xlinker" }, \
{ "-framework", "-Xlinker -framework -Xlinker" }, \
{ "-flat_namespace", "-Zflat_namespace" }, \
@@ -167,7 +167,7 @@ Boston, MA 02110-1301, USA. */
!strcmp (STR, "Zsegs_read_only_addr") ? 1 : \
!strcmp (STR, "Zsegs_read_write_addr") ? 1 : \
!strcmp (STR, "Zseg_addr_table") ? 1 : \
- !strcmp (STR, "Zseg_addr_table_filename") ?1 :\
+ !strcmp (STR, "Zfn_seg_addr_table_filename") ? 1 :\
!strcmp (STR, "seg1addr") ? 1 : \
!strcmp (STR, "segprot") ? 3 : \
!strcmp (STR, "sub_library") ? 1 : \
@@ -272,7 +272,7 @@ Boston, MA 02110-1301, USA. */
%{Zsegs_read_only_addr*:-segs_read_only_addr %*} \
%{Zsegs_read_write_addr*:-segs_read_write_addr %*} \
%{Zseg_addr_table*: -seg_addr_table %*} \
- %{Zseg_addr_table_filename*:-seg_addr_table_filename %*} \
+ %{Zfn_seg_addr_table_filename*:-seg_addr_table_filename %*} \
%{sub_library*} %{sub_umbrella*} \
%{isysroot*:-syslibroot %*} \
%{twolevel_namespace} %{twolevel_namespace_hints} \