aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2011-10-19 16:28:10 +0200
committerRickard Green <[email protected]>2011-10-19 16:28:10 +0200
commitff1fb99fb54ef93cd778366993a448fde2b44d82 (patch)
tree855e6de5506f1b631a219482fec6e66aeddd7590
parent02ec67177b2f5d2de371362e5bb3c9b9771fb0b8 (diff)
downloadotp-ff1fb99fb54ef93cd778366993a448fde2b44d82.tar.gz
otp-ff1fb99fb54ef93cd778366993a448fde2b44d82.tar.bz2
otp-ff1fb99fb54ef93cd778366993a448fde2b44d82.zip
Fix erroneous merge resolution
Previously removed code erroneously reappeared in a merge to the master branch (ec36499d7e329b4dc69a1a3be3422eac7907c260).
-rw-r--r--erts/aclocal.m43
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 27f643921e..bd228a2d1f 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -1366,9 +1366,6 @@ case "$GCC-$host_cpu" in
;;
esac
-test $enable_ethread_pre_pentium4_compatibility = yes &&
- AC_DEFINE(ETHR_PRE_PENTIUM4_COMPAT, 1, [Define if you want compatibility with x86 processors before pentium4.])
-
AC_DEFINE(ETHR_HAVE_ETHREAD_DEFINES, 1, \
[Define if you have all ethread defines])