From 76dc5ab588afe4575b05fb4486990dce4ebbfde1 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 12 Jan 2007 22:27:20 +0000 Subject: [PATCH] + support of -fPIC (is equivalent to -Cg) so people won't be confused if ld tells them to recompile their code with -fPIC git-svn-id: trunk@5934 - --- compiler/msg/errore.msg | 1 + compiler/msgidx.inc | 2 +- compiler/msgtxt.inc | 92 ++++++++++++++++++++--------------------- compiler/options.pas | 8 ++++ 4 files changed, 56 insertions(+), 47 deletions(-) diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 12f305cefe..4ffa1ecea8 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -2463,6 +2463,7 @@ S*2Aas_assemble using GNU AS *O2Dw_PM application **1e_set path to executable **1E_same as -Cn +**1fPIC_same as -Cg **1F_set file names and paths: **2Fa[,y]_for a program load first units and [y] before uses is parsed **2Fc_sets input codepage to diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 584ad072e0..2a0b72389e 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -715,7 +715,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 42485; + MsgTxtSize = 42505; MsgIdxMax : array[1..20] of longint=( 24,82,231,79,63,48,106,22,135,60, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index b416fdd225..2dec5a7fb6 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -864,34 +864,35 @@ const msgtxt : array[0..000177,1..240] of char=( '*O2Dw_PM application'#010+ '**1e_set path to executable'#010+ '**1E_same as -Cn'#010+ + '**1fPIC_same as -Cg'#010+ '**1F_set file names and paths:'#010+ - '**2Fa[,y]_for a program load firs','t units and [y] before uses '+ + '**2Fa[,y]_for',' a program load first units and [y] before uses '+ 'is parsed'#010+ '**2Fc_sets input codepage to '#010+ '**2FD_sets the directory where to search for compiler utilities'#010+ '**2Fe_redirect error output to '#010+ - '**2FE_set exe/unit output path to '#010+ - '**2Fi_adds to include path'#010+ + '**2FE_set exe/unit output path to ',''#010+ + '**2Fi_adds to include path'#010+ '**2Fl_adds to library path'#010+ '**2FL_uses as dynamic linker'#010+ '**2Fo_adds to object path'#010+ '**2Fr_load error message file '#010+ '**2Fu_adds to unit path'#010+ - '**2FU_set unit output path to , overrides -FE',#010+ + '**2FU_set unit output path t','o , overrides -FE'#010+ '*g1g_generate debugger information:'#010+ '*g2gc_generate checks for pointers'#010+ '*g2gd_use dbx'#010+ '*g2gg_use gsym'#010+ '*g2gh_use heap trace unit (for memory leak debugging)'#010+ '*g2gl_use line info unit to show more info for backtraces'#010+ - '*g2gt_trash local variables',' (to detect uninitialized uses)'#010+ + '*g2gt_t','rash local variables (to detect uninitialized uses)'#010+ '*g2gv_generates programs traceable with valgrind'#010+ '*g2gw_generate dwarf debugging info'#010+ '**1i_information'#010+ '**2iD_return compiler date'#010+ '**2iV_return compiler version'#010+ - '**2iW_return full compiler version'#010+ - '**2iSO_return ','compiler OS'#010+ + '**2iW_return full compiler ve','rsion'#010+ + '**2iSO_return compiler OS'#010+ '**2iSP_return compiler processor'#010+ '**2iTO_return target OS'#010+ '**2iTP_return target processor'#010+ @@ -899,62 +900,62 @@ const msgtxt : array[0..000177,1..240] of char=( '**1k_Pass to the linker'#010+ '**1l_write logo'#010+ '**1M_set language mode to '#010+ - '**2Mfpc_free pascal dialect',' (default)'#010+ + '**2Mfpc','_free pascal dialect (default)'#010+ '**2Mobjfpc_switch some Delphi 2 extensions on'#010+ '**2Mdelphi_tries to be Delphi compatible'#010+ '**2Mtp_tries to be TP/BP 7.0 compatible'#010+ '**2Mgpc_tries to be gpc compatible'#010+ - '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010, + '**2Mmacpas_tries to be compatible to the macint','osh pascal dialects'#010+ '**1n_don'#039't read the default config file'#010+ '**1N_node tree optimizations'#010+ '**2Nu_unroll loops'#010+ '**1o_change the name of the executable produced to '#010+ '**1O_optimizations:'#010+ '**2O-_disable optimizations'#010+ - '**2O1_level 1 optimizations (quick and d','ebugger friendly)'#010+ + '**2O1_level 1 optimi','zations (quick and debugger friendly)'#010+ '**2O2_level 2 optimizations (-O1 + quick optimizations)'#010+ '**2O3_level 3 optimizations (-O2 + slow optimizations)'#010+ '**2Oa=_set alignment'#010+ - '**2Oo[NO]_enable or disable optimizations, see fpc -i for possible '+ - 'values'#010+ - '**2Op_set target cpu for optimizing, see fpc -i for possible valu'+ - 'es'#010+ + '**2Oo[NO]_enable or disable optimizations, see fpc -i for pos','sibl'+ + 'e values'#010+ + '**2Op_set target cpu for optimizing, see fpc -i for possible values'+ + #010+ '**2Os_generate smaller code'#010+ '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+ '**1R_assembler reading style:'#010+ '**2Rdefault_use default assembler'#010+ - '3*2Ratt_read AT&T sty','le assembler'#010+ + '3','*2Ratt_read AT&T style assembler'#010+ '3*2Rintel_read Intel style assembler'#010+ '6*2RMOT_read motorola style assembler'#010+ '**1S_syntax options:'#010+ '**2S2_same as -Mobjfpc'#010+ '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+ '**2Sa_include assertion code.'#010+ - '**2Sd_same as -Mdelphi'#010+ - '**','2Se_error options. is a combination of the following:'#010+ + '**2Sd','_same as -Mdelphi'#010+ + '**2Se_error options. is a combination of the following:'#010+ '**3*_ : compiler stops after the errors (default is 1)'#010+ '**3*_w : compiler stops also after warnings'#010+ '**3*_n : compiler stops also after notes'#010+ - '**3*_h : compiler stops also aft','er hints'#010+ + '**3*_h : com','piler stops also after hints'#010+ '**2Sg_allow LABEL and GOTO'#010+ '**2Sh_Use ansistrings'#010+ '**2Si_support C++ styled INLINE'#010+ '**2Sk_load fpcylix unit'#010+ '**2SI_set interface style to '#010+ '**3SIcom_COM compatible interface (default)'#010+ - '**3SIcorba_CORBA compatible interface'#010+ - '**2Sm_su','pport macros like C (global)'#010+ + '**3SIcorba_CORBA compatibl','e interface'#010+ + '**2Sm_support macros like C (global)'#010+ '**2So_same as -Mtp'#010+ '**2Sp_same as -Mgpc'#010+ '**2Ss_constructor name must be init (destructor must be done)'#010+ '**2St_allow static keyword in objects'#010+ - '**2Sx_enable exception keywords (default in Delphi/ObjFPC modes)'#010+ - '**1s_do','n'#039't call assembler and linker'#010+ + '**2Sx_enable exception keywords (default in Delphi/O','bjFPC modes)'#010+ + '**1s_don'#039't call assembler and linker'#010+ '**2sh_Generate script to link on host'#010+ '**2st_Generate script to link on target'#010+ '**2sr_Skip register allocation phase (use with -alr)'#010+ '**1T_Target operating system:'#010+ - '3*2Temx_OS/2 via EMX (including EMX/RSX extend','er)'#010+ + '3*2Temx_OS/2 via EMX (incl','uding EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ '3*2Tlinux_Linux'#010+ @@ -962,8 +963,8 @@ const msgtxt : array[0..000177,1..240] of char=( '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ '3*2Topenbsd_OpenBSD'#010+ - '3*2Tos2_OS/2 / eComStation'#010+ - '3*2T','sunos_SunOS/Solaris'#010+ + '3*2Tos2_OS/','2 / eComStation'#010+ + '3*2Tsunos_SunOS/Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ @@ -971,8 +972,8 @@ const msgtxt : array[0..000177,1..240] of char=( '4*2Tlinux_Linux'#010+ '6*2Tamiga_Commodore Amiga'#010+ '6*2Tatari_Atari ST/STe/TT'#010+ - '6*2Tlinux_Linux/m68k'#010+ - '6*2Tmacos_Maci','ntosh m68k (not supported)'#010+ + '6*2Tlinux_Linux','/m68k'#010+ + '6*2Tmacos_Macintosh m68k (not supported)'#010+ '6*2Tpalmos_PalmOS'#010+ 'A*2Tlinux_Linux'#010+ 'A*2Twince_Windows CE'#010+ @@ -980,55 +981,54 @@ const msgtxt : array[0..000177,1..240] of char=( 'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ 'P*2Tmacos_MacOS (classic) on PowerPC'#010+ - 'P*2Tmorphos_MorphOS'#010+ - 'S*2T','linux_Linux'#010+ + 'P*2T','morphos_MorphOS'#010+ + 'S*2Tlinux_Linux'#010+ '**1u_undefines the symbol '#010+ '**1U_unit options:'#010+ '**2Un_don'#039't check the unit name'#010+ '**2Ur_generate release unit files'#010+ '**2Us_compile a system unit'#010+ - '**1v_Be verbose. is a combination of the following letters:'#010+ - '**2*_e : Show e','rrors (default) 0 : Show nothing (except errors'+ - ')'#010+ + '**1v_Be verbose. is a combination of the following lett','ers:'#010+ + '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ '**2*_w : Show warnings u : Show unit info'#010+ '**2*_n : Show notes t : Show tried/used files'#010+ - '**2*_h : Show hints c : Show conditionals'#010+ - '**2*_i ',': Show general info d : Show debug info'#010+ + '**2*_h : Show hints c : Show ','conditionals'#010+ + '**2*_i : Show general info d : Show debug info'#010+ '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ '**2*_a : Show everything x : Executable info (Win32 only)'#010+ - '**2*_b : Write file names messages with full path'#010, + '**2*_b : Write file names mess','ages with full path'#010+ '**2*_v : write fpcdebug.txt with p : Write tree.log with parse tre'+ 'e'#010+ '**2*_ lots of debugging info'#010+ '3*1W_Win32-like target options'#010+ '3*2WB_Create a relocatable image'#010+ - '3*2WB_Set Image base to Hexadecimal value'#010+ - '3*2WC_Specify consol','e type application'#010+ + '3*2WB_Set Image base to Hexadecimal value'#010, + '3*2WC_Specify console type application'#010+ '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+ '3*2WF_Specify full-screen type application (OS/2 only)'#010+ '3*2WG_Specify graphic type application'#010+ - '3*2WN_Do not generate relocation code (necessary for debugging)'#010+ - '3*2WR_Gener','ate relocation code'#010+ + '3*2WN_Do not generate relocation code (necessary for de','bugging)'#010+ + '3*2WR_Generate relocation code'#010+ 'P*2WC_Specify console type application (MacOS only)'#010+ 'P*2WG_Specify graphic type application (MacOS only)'#010+ 'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+ '**1X_executable options:'#010+ - '**2Xc_pass --shared to the linke','r (Unix only)'#010+ + '**2Xc_pass -','-shared to the linker (Unix only)'#010+ '**2Xd_don'#039't use standard library search path (needed for cross com'+ 'pile)'#010+ '**2Xe_use external linker'#010+ '**2XD_try to link units dynamic (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_use internal linker'#010+ - '**2Xm_generate link map'#010+ - '**2XM_s','et the name of the '#039'main'#039' program routine (default'+ - ' is '#039'main'#039')'#010+ + '**2Xm_generate',' link map'#010+ + '**2XM_set the name of the '#039'main'#039' program routine (default i'+ + 's '#039'main'#039')'#010+ '**2XP_prepend the binutils names with the prefix '#010+ '**2Xr_set library search path to (needed for cross compile)'#010+ - '**2Xs_strip all symbols from executable'#010+ - '**2XS_try to li','nk units static (default) (defines FPC_LINK_STATIC)'#010+ + '**2Xs_strip all symbols from execut','able'#010+ + '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+ '**2Xt_link with static libraries (-static is passed to linker)'#010+ '**2XX_try to link units smart (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_shows this help'#010+ - '**1h_shows this help without wai','ting'#000 + '**1h_shows t','his help without waiting'#000 ); diff --git a/compiler/options.pas b/compiler/options.pas index 282a33aff4..bc3644abd9 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -651,6 +651,14 @@ begin include(init_settings.globalswitches,cs_link_nolink); end; + 'f' : + begin + if more='PIC' then + include(init_settings.moduleswitches,cs_create_pic) + else + IllegalPara(opt); + end; + 'F' : begin c:=more[1];