diff --git a/compiler/globals.pas b/compiler/globals.pas
index acbcfaf008..571e4d8f2d 100644
--- a/compiler/globals.pas
+++ b/compiler/globals.pas
@@ -139,8 +139,9 @@ interface
        utilsdirectory : dirstr;
        { targetname specific prefix used by these utils (options -XP<path>) }
        utilsprefix    : dirstr;
-       { Don't add std paths to linkpath}
-       Dontlinkstdlibpath: Boolean;
+       cshared	      : boolean;	{ pass --shared to ld to link C libs shared}
+       Dontlinkstdlibpath: Boolean;	{ Don't add std paths to linkpath}
+       rlinkpath      : dirstr;		{ rpath-link linkdir override}
 
        { some flags for global compiler switches }
        do_build,
@@ -1614,7 +1615,8 @@ implementation
       { Utils directory }
         utilsdirectory:='';
         utilsprefix:='';
-
+	cshared:=false;
+        rlinkpath:='';
 
       { Search Paths }
         librarysearchpath:=TSearchPathList.Create;
@@ -1710,7 +1712,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.110  2003-10-22 15:22:33  peter
+  Revision 1.111  2003-10-22 15:40:44  marco
+   * -Xc -Xr support
+
+  Revision 1.110  2003/10/22 15:22:33  peter
     * fixed unitsym-globalsymtable relation so the uses of a unit
       is counted correctly
 
diff --git a/compiler/options.pas b/compiler/options.pas
index 6897e79674..722acdeb15 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -1109,6 +1109,7 @@ begin
                       include(initglobalswitches,cs_link_map);
                     's' :
                       include(initglobalswitches,cs_link_strip);
+		    'c' : Cshared:=TRUE;
                     't' :
                       include(initglobalswitches,cs_link_staticflag);
                     'D' :
@@ -1126,6 +1127,10 @@ begin
                              utilsprefix:=Copy(more,2,length(More)-1);
                              More:='';
                           End;
+                    'r' : Begin
+			     rlinkpath:=Copy(more,2,length(More)-1);
+                             More:='';
+			  end;
                     'p' :
                       include(initmoduleswitches,cs_create_pic);
                     'S' :
@@ -1986,7 +1991,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.112  2003-10-18 09:14:18  hajny
+  Revision 1.113  2003-10-22 15:40:44  marco
+   * -Xc -Xr support
+
+  Revision 1.112  2003/10/18 09:14:18  hajny
     * upper limit for heapsize removed
 
   Revision 1.110  2003/10/14 00:30:48  florian