aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--driver/Clflags.ml3
-rw-r--r--driver/Driver.ml8
-rw-r--r--test/regression/Makefile5
3 files changed, 4 insertions, 12 deletions
diff --git a/driver/Clflags.ml b/driver/Clflags.ml
index 79b233a8..fcec4c66 100644
--- a/driver/Clflags.ml
+++ b/driver/Clflags.ml
@@ -20,9 +20,6 @@ let option_fstruct_passing = ref false
let option_fstruct_assign = ref false
let option_fbitfields = ref false
let option_fvararg_calls = ref true
-let all_extensions =
- [option_fstruct_passing; option_fstruct_assign; option_fbitfields;
- option_fvararg_calls; option_flonglong]
let option_fmadd = ref false
let option_dparse = ref false
let option_dclight = ref false
diff --git a/driver/Driver.ml b/driver/Driver.ml
index a6b865cf..2d8b0266 100644
--- a/driver/Driver.ml
+++ b/driver/Driver.ml
@@ -220,8 +220,6 @@ Language support options (use -fno-<opt> to turn off -f<opt>) :
-fstruct-passing Emulate passing structs and unions by value [off]
-fstruct-assign Emulate assignment between structs or unions [off]
-fvararg-calls Emulate calls to variable-argument functions [on]
- -fall-extensions Activate all of the above
- -fno-extensions Deactivate all of the above
Code generation options:
-fmadd Use fused multiply-add and multiply-sub instructions
-fsmall-data <n> Set maximal size <n> for allocation in small data area
@@ -316,11 +314,7 @@ let cmdline_actions =
".*\\.[oa]$", Self (fun s ->
linker_options := s :: !linker_options);
"-fsmall-data$", Integer(fun n -> option_small_data := n);
- "-fsmall-const$", Integer(fun n -> option_small_const := n);
- "-fno-extensions", Self (fun s ->
- List.iter (fun r -> r := false) Clflags.all_extensions);
- "-fall-extensions", Self (fun s ->
- List.iter (fun r -> r := true) Clflags.all_extensions)
+ "-fsmall-const$", Integer(fun n -> option_small_const := n)
]
@ f_opt "longlong" option_flonglong
@ f_opt "struct-passing" option_fstruct_passing
diff --git a/test/regression/Makefile b/test/regression/Makefile
index 2af20e62..cc8684c6 100644
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -1,7 +1,8 @@
include ../../Makefile.config
CCOMP=../../ccomp
-CCOMPFLAGS=-stdlib ../../runtime -dparse -dclight -dasm -fall-extensions
+CCOMPFLAGS=-stdlib ../../runtime -dparse -dclight -dasm \
+ -fstruct-passing -fstruct-assign -fbitfields
LIBS=$(LIBMATH)
@@ -30,7 +31,7 @@ clean:
rm -f *.compcert
rm -f *.parsed.c *.light.c *.s *.o *~
-test_compcert:
+test:
@for i in $(TESTS); do \
if ./$$i.compcert | cmp -s - Results/$$i; \
then echo "$$i: passed"; \