dpatel 02/12/20 09:44:32
Modified: live/gcc3/gcc/config darwin.h
live/gcc3/gcc/config/rs6000 darwin.h
Log:
Reject conflicting code gen style options.
(e.g. -static with -dynamic)
Bug #:
Revision Changes Path
1.190 +3 -3 src/live/gcc3/gcc/config/darwin.h
Index: darwin.h
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/config/darwin.h,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- darwin.h 2002/12/13 22:49:20 1.189
+++ darwin.h 2002/12/20 17:44:31 1.190
@@ -111,7 +111,6 @@
name, that also takes an argument, needs to be modified so the
prefix is different, otherwise a '*' after the shorter option will
match with the longer one. */
-/* Ignore -dynamic for now */
#define TARGET_OPTION_TRANSLATE_TABLE \
{ "-all_load", "-Zall_load" }, \
{ "-allowable_client", "-Zallowable_client" }, \
@@ -122,7 +121,7 @@
{ "-weak_reference_mismatches", "-Zweak_reference_mismatches" }, \
{ "-dependency-file", "-MF" }, \
{ "-dylib_file", "-Zdylib_file" }, \
- { "-dynamic", " " }, \
+ { "-dynamic", "-Zdynamic " }, \
{ "-dynamiclib", "-Zdynamiclib" }, \
{ "-exported_symbols_list", "-Zexported_symbols_list" }, \
{ "-seg_addr_table_filename", "-Zseg_addr_table_filename" }, \
@@ -204,7 +203,7 @@
#undef CPP_SPEC
/* APPLE LOCAL -precomp-trustfile, -arch */
-#define CPP_SPEC "%{static:-D__STATIC__}%{!static:-D__DYNAMIC__} \
+#define CPP_SPEC "%{static:%{!dynamic:-D__STATIC__}}%{!static:-D__DYNAMIC__} \
%{precomp-trustfile} %{arch}"
@@ -279,6 +278,7 @@
%{Zbind_at_load:-bind_at_load} \
%{Zarch_errors_fatal:-arch_errors_fatal} \
%{Zdylib_file*:-dylib_file %*} \
+ %{Zdynamic*:-dynamic} \
%{Zexported_symbols_list*:-exported_symbols_list %*} \
%{Zflat_namespace:-flat_namespace} \
%{headerpad_max_install_names*} \
1.80 +4 -1 src/live/gcc3/gcc/config/rs6000/darwin.h
Index: darwin.h
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/config/rs6000/darwin.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- darwin.h 2002/12/08 00:38:49 1.79
+++ darwin.h 2002/12/20 17:44:31 1.80
@@ -68,7 +68,10 @@
/* APPLE LOCAL dynamic-no-pic */
/* APPLE LOCAL AltiVec */
-#define CC1_SPEC "%{!static:%{!mdynamic-no-pic:-fPIC}} %{faltivec:-D__VEC__=10206
-D__ALTIVEC__=1}"
+#define CC1_SPEC "\
+%{static: %{Zdynamic: %e conflicting code gen style switches are used}}\
+%{static: %{mdynamic-no-pic: %e conflicting code gen style switches are used}}\
+%{!static:%{!mdynamic-no-pic:-fPIC}} %{faltivec:-D__VEC__=10206 -D__ALTIVEC__=1}"
/* APPLE LOCAL asm flags */
#define ASM_SPEC "-arch %T \
