Author: ddunbar
Date: Thu Jun 10 10:53:17 2010
New Revision: 105789
URL: http://llvm.org/viewvc/llvm-project?rev=105789&view=rev
Log:
Driver: Also mark -F as RenderJoined, the linker doesn't like "-F FOO" either.
Modified:
cfe/trunk/include/clang/Driver/Options.td
cfe/trunk/test/Driver/darwin-cc.c
cfe/trunk/test/Driver/darwin-ld.c
Modified: cfe/trunk/include/clang/Driver/Options.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=105789&r1=105788&r2=105789&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Options.td (original)
+++ cfe/trunk/include/clang/Driver/Options.td Thu Jun 10 10:53:17 2010
@@ -124,7 +124,7 @@
def D : JoinedOrSeparate<"-D">, Group<CompileOnly_Group>;
def E : Flag<"-E">, Flags<[DriverOption]>,
HelpText<"Only run the preprocessor">;
-def F : JoinedOrSeparate<"-F">;
+def F : JoinedOrSeparate<"-F">, Flags<[RenderJoined]>;
def H : Flag<"-H">;
def I_ : Flag<"-I-">, Group<I_Group>;
def I : JoinedOrSeparate<"-I">, Group<I_Group>;
Modified: cfe/trunk/test/Driver/darwin-cc.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-cc.c?rev=105789&r1=105788&r2=105789&view=diff
==============================================================================
--- cfe/trunk/test/Driver/darwin-cc.c (original)
+++ cfe/trunk/test/Driver/darwin-cc.c Thu Jun 10 10:53:17 2010
@@ -1,5 +1,5 @@
// RUN: %clang -ccc-no-clang -ccc-host-triple i386-apple-darwin10 -m32 -###
-MD -g -fast -Q -dA -mkernel -ansi -aFOO -S -o /tmp/OUTPUTNAME -g0 -gfull -O2
-Werror -pedantic -Wmost -w -std=c99 -trigraphs -v -pg -fFOO -undef -Qn --param
a=b -fmudflap -coverage -save-temps -nostdinc -I ARG0 -F ARG1 -I ARG2 -P -MF
ARG3 -MG -MP -remap -g3 -H -D ARG4 -U ARG5 -A ARG6 -D ARG7 -U ARG8 -A ARG9
-include ARG10 -pthread %s 2> %t.log
-// RUN: grep ' ".*cc1" "-E" "-nostdinc" "-v" "-I" "ARG0" "-F" "ARG1" "-I"
"ARG2" "-P" "-MD" "/tmp/OUTPUTNAME.d" "-MF" "ARG3" "-MG" "-MP" "-MQ"
"/tmp/OUTPUTNAME" "-remap" "-dD" "-H" "-D__STATIC__" "-D_REENTRANT" "-D" "ARG4"
"-U" "ARG5" "-A" "ARG6" "-D" "ARG7" "-U" "ARG8" "-A" "ARG9" "-include" "ARG10"
".*darwin-cc.c" "-D_MUDFLAP" "-include" "mf-runtime.h"
"-mmacosx-version-min=10.6.0" "-m32" "-mkernel" "-mtune=core2" "-ansi"
"-std=c99" "-trigraphs" "-Werror" "-pedantic" "-Wmost" "-w" "-fast"
"-fno-eliminate-unused-debug-symbols" "-fFOO" "-fmudflap" "-O2" "-undef"
"-fpch-preprocess" "-o" ".*darwin-cc.i"' %t.log
+// RUN: grep ' ".*cc1" "-E" "-nostdinc" "-v" "-I" "ARG0" "-FARG1" "-I" "ARG2"
"-P" "-MD" "/tmp/OUTPUTNAME.d" "-MF" "ARG3" "-MG" "-MP" "-MQ" "/tmp/OUTPUTNAME"
"-remap" "-dD" "-H" "-D__STATIC__" "-D_REENTRANT" "-D" "ARG4" "-U" "ARG5" "-A"
"ARG6" "-D" "ARG7" "-U" "ARG8" "-A" "ARG9" "-include" "ARG10" ".*darwin-cc.c"
"-D_MUDFLAP" "-include" "mf-runtime.h" "-mmacosx-version-min=10.6.0" "-m32"
"-mkernel" "-mtune=core2" "-ansi" "-std=c99" "-trigraphs" "-Werror" "-pedantic"
"-Wmost" "-w" "-fast" "-fno-eliminate-unused-debug-symbols" "-fFOO" "-fmudflap"
"-O2" "-undef" "-fpch-preprocess" "-o" ".*darwin-cc.i"' %t.log
// RUN: grep ' ".*cc1" "-fpreprocessed" ".*darwin-cc.i" "-O3" "-dumpbase"
".*darwin-cc.c" "-dA" "-mmacosx-version-min=10.6.0" "-m32" "-mkernel"
"-mtune=core2" "-ansi" "-aFOO" "-auxbase-strip" "/tmp/OUTPUTNAME" "-g" "-g0"
"-g" "-g3" "-O2" "-Werror" "-pedantic" "-Wmost" "-w" "-ansi" "-std=c99"
"-trigraphs" "-version" "-p" "-fast" "-fno-eliminate-unused-debug-symbols"
"-fFOO" "-fmudflap" "-undef" "-fno-ident" "-o" "/tmp/OUTPUTNAME" "--param"
"a=b" "-fno-builtin" "-fno-merge-constants" "-fprofile-arcs" "-ftest-coverage"'
%t.log
Modified: cfe/trunk/test/Driver/darwin-ld.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-ld.c?rev=105789&r1=105788&r2=105789&view=diff
==============================================================================
--- cfe/trunk/test/Driver/darwin-ld.c (original)
+++ cfe/trunk/test/Driver/darwin-ld.c Thu Jun 10 10:53:17 2010
@@ -33,7 +33,7 @@
// Note that at conception, this exactly matches gcc.
// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -A ARG0 -F ARG1 -L
ARG2 -Mach -T ARG4 -X -Z -all_load -allowable_client ARG8 -bind_at_load
-compatibility_version ARG11 -current_version ARG12 -d -dead_strip -dylib_file
ARG14 -dylinker -dylinker_install_name ARG16 -dynamic -dynamiclib -e ARG19
-exported_symbols_list ARG20 -fexceptions -flat_namespace -fnested-functions
-fopenmp -force_cpusubtype_ALL -fpie -fprofile-arcs
-headerpad_max_install_names -image_base ARG29 -init ARG30 -install_name ARG31
-m ARG33 -miphoneos-version-min=2.0 -mmacosx-version-min=10.3.2 -multi_module
-multiply_defined ARG37 -multiply_defined_unused ARG38
-no_dead_strip_inits_and_terms -nodefaultlibs -nofixprebinding -nomultidefs
-noprebind -noseglinkedit -nostartfiles -nostdlib -pagezero_size ARG54 -pg
-prebind -prebind_all_twolevel_modules -preload -r -read_only_relocs ARG55 -s
-sectalign ARG57_0 ARG57_1 ARG57_2 -sectcreate ARG58_0 ARG58_1 ARG58_2
-sectobjectsymbols ARG59_0 ARG59_1 -sectorder A
RG60_0 ARG60_1 ARG60_2 -seg1addr ARG61 -seg_addr_table ARG62
-seg_addr_table_filename ARG63 -segaddr ARG64_0 ARG64_1 -segcreate ARG65_0
ARG65_1 ARG65_2 -seglinkedit -segprot ARG67_0 ARG67_1 ARG67_2 -segs_read_FOO
-segs_read_only_addr ARG69 -segs_read_write_addr ARG70 -shared-libgcc
-single_module -static -static-libgcc -sub_library ARG77 -sub_umbrella ARG78 -t
-twolevel_namespace -twolevel_namespace_hints -u ARG82 -umbrella ARG83
-undefined ARG84 -unexported_symbols_list ARG85 -w -weak_reference_mismatches
ARG87 -whatsloaded -whyload -y -filelist FOO -l FOO 2> %t.log
-// RUN: grep '".*ld.*" "-static" "-dylib" "-dylib_compatibility_version"
"ARG11" "-dylib_current_version" "ARG12" "-arch" "i386" "-dylib_install_name"
"ARG31" "-all_load" "-allowable_client" "ARG8" "-bind_at_load" "-dead_strip"
"-no_dead_strip_inits_and_terms" "-dylib_file" "ARG14" "-dynamic"
"-exported_symbols_list" "ARG20" "-flat_namespace"
"-headerpad_max_install_names" "-image_base" "ARG29" "-init" "ARG30"
"-macosx_version_min" "10.3.2" "-iphoneos_version_min" "2.0" "-nomultidefs"
"-multi_module" "-single_module" "-multiply_defined" "ARG37"
"-multiply_defined_unused" "ARG38" "-pie" "-prebind" "-noprebind"
"-nofixprebinding" "-prebind_all_twolevel_modules" "-read_only_relocs" "ARG55"
"-sectcreate" "ARG58_0" "ARG58_1" "ARG58_2" "-sectorder" "ARG60_0" "ARG60_1"
"ARG60_2" "-seg1addr" "ARG61" "-segprot" "ARG67_0" "ARG67_1" "ARG67_2"
"-segaddr" "ARG64_0" "ARG64_1" "-segs_read_only_addr" "ARG69"
"-segs_read_write_addr" "ARG70" "-seg_addr_table" "ARG62"
"-seg_addr_table_filename
" "ARG63" "-sub_library" "ARG77" "-sub_umbrella" "ARG78" "-twolevel_namespace"
"-twolevel_namespace_hints" "-umbrella" "ARG83" "-undefined" "ARG84"
"-unexported_symbols_list" "ARG85" "-weak_reference_mismatches" "ARG87" "-X"
"-y" "-w" "-pagezero_size" "ARG54" "-segs_read_FOO" "-seglinkedit"
"-noseglinkedit" "-sectalign" "ARG57_0" "ARG57_1" "ARG57_2"
"-sectobjectsymbols" "ARG59_0" "ARG59_1" "-segcreate" "ARG65_0" "ARG65_1"
"ARG65_2" "-whyload" "-whatsloaded" "-dylinker_install_name" "ARG16"
"-dylinker" "-Mach" "-d" "-s" "-t" "-Z" "-u" "ARG82" "-undefined" "ARG84" "-A"
"ARG0" "-e" "ARG19" "-m" "ARG33" "-r" "-o" "a.out" "-LARG2" "-lgomp".*
"-filelist" "FOO" "-lFOO" "-lgcov" "-allow_stack_execute" "-T" "ARG4" "-F"
"ARG1"' %t.log
+// RUN: grep '".*ld.*" "-static" "-dylib" "-dylib_compatibility_version"
"ARG11" "-dylib_current_version" "ARG12" "-arch" "i386" "-dylib_install_name"
"ARG31" "-all_load" "-allowable_client" "ARG8" "-bind_at_load" "-dead_strip"
"-no_dead_strip_inits_and_terms" "-dylib_file" "ARG14" "-dynamic"
"-exported_symbols_list" "ARG20" "-flat_namespace"
"-headerpad_max_install_names" "-image_base" "ARG29" "-init" "ARG30"
"-macosx_version_min" "10.3.2" "-iphoneos_version_min" "2.0" "-nomultidefs"
"-multi_module" "-single_module" "-multiply_defined" "ARG37"
"-multiply_defined_unused" "ARG38" "-pie" "-prebind" "-noprebind"
"-nofixprebinding" "-prebind_all_twolevel_modules" "-read_only_relocs" "ARG55"
"-sectcreate" "ARG58_0" "ARG58_1" "ARG58_2" "-sectorder" "ARG60_0" "ARG60_1"
"ARG60_2" "-seg1addr" "ARG61" "-segprot" "ARG67_0" "ARG67_1" "ARG67_2"
"-segaddr" "ARG64_0" "ARG64_1" "-segs_read_only_addr" "ARG69"
"-segs_read_write_addr" "ARG70" "-seg_addr_table" "ARG62"
"-seg_addr_table_filename
" "ARG63" "-sub_library" "ARG77" "-sub_umbrella" "ARG78" "-twolevel_namespace"
"-twolevel_namespace_hints" "-umbrella" "ARG83" "-undefined" "ARG84"
"-unexported_symbols_list" "ARG85" "-weak_reference_mismatches" "ARG87" "-X"
"-y" "-w" "-pagezero_size" "ARG54" "-segs_read_FOO" "-seglinkedit"
"-noseglinkedit" "-sectalign" "ARG57_0" "ARG57_1" "ARG57_2"
"-sectobjectsymbols" "ARG59_0" "ARG59_1" "-segcreate" "ARG65_0" "ARG65_1"
"ARG65_2" "-whyload" "-whatsloaded" "-dylinker_install_name" "ARG16"
"-dylinker" "-Mach" "-d" "-s" "-t" "-Z" "-u" "ARG82" "-undefined" "ARG84" "-A"
"ARG0" "-e" "ARG19" "-m" "ARG33" "-r" "-o" "a.out" "-LARG2" "-lgomp".*
"-filelist" "FOO" "-lFOO" "-lgcov" "-allow_stack_execute" "-T" "ARG4" "-FARG1"'
%t.log
// Check linker changes that came with new linkedit format.
// RUN: touch %t.o
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
