aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSylvain Boulmé <sylvain.boulme@univ-grenoble-alpes.fr>2019-10-17 08:10:01 +0200
committerSylvain Boulmé <sylvain.boulme@univ-grenoble-alpes.fr>2019-10-17 08:10:01 +0200
commit933aeeda897da5076f5a53fe6752a860c30a29bb (patch)
tree97917b8066a250a7a6fa6844178e918e78495130 /configure
parent06a705f54e871fd447f30c59145752c4de6f7fff (diff)
downloadcompcert-kvx-933aeeda897da5076f5a53fe6752a860c30a29bb.tar.gz
compcert-kvx-933aeeda897da5076f5a53fe6752a860c30a29bb.zip
fix configure broken by merge
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 0 insertions, 3 deletions
diff --git a/configure b/configure
index ede8020f..be6f2180 100755
--- a/configure
+++ b/configure
@@ -470,10 +470,7 @@ if test "$arch" = "mppa_k1c"; then
system="linux"
fi
-<<<<<<< HEAD
-=======
#
->>>>>>> mppa-work
# AArch64 (ARMv8 64 bits) Target Configuration
#
if test "$arch" = "aarch64"; then