diff options
| author | Micael Karlberg <[email protected]> | 2011-04-08 17:51:55 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-08 17:51:55 +0200 |
| commit | 24a9408229d14b3b0c41265f0c9f4c6d164e92ed (patch) | |
| tree | 89bd26baac9532bcf9923da39018a36a4d4bca15 /erts/emulator/hipe/hipe_x86_bifs.m4 | |
| parent | 332b91c46d67dc31ca6080b2ba5c03636f3d584f (diff) | |
| parent | 5ad09d2928fd4584ce6dc50f44825b3f6d7ef66a (diff) | |
| download | otp-24a9408229d14b3b0c41265f0c9f4c6d164e92ed.tar.gz otp-24a9408229d14b3b0c41265f0c9f4c6d164e92ed.tar.bz2 otp-24a9408229d14b3b0c41265f0c9f4c6d164e92ed.zip | |
Merge branch 'dev' into bmk/snmp/manager/request_override_options
Diffstat (limited to 'erts/emulator/hipe/hipe_x86_bifs.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_x86_bifs.m4 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/erts/emulator/hipe/hipe_x86_bifs.m4 b/erts/emulator/hipe/hipe_x86_bifs.m4 index 80be74f7b2..1bb6488b00 100644 --- a/erts/emulator/hipe/hipe_x86_bifs.m4 +++ b/erts/emulator/hipe/hipe_x86_bifs.m4 @@ -1,25 +1,23 @@ changecom(`/*', `*/')dnl /* * %CopyrightBegin% - * - * Copyright Ericsson AB 2001-2009. All Rights Reserved. - * + * + * Copyright Ericsson AB 2001-2011. All Rights Reserved. + * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in * compliance with the License. You should have received a copy of the * Erlang Public License along with this software. If not, it can be * retrieved online at http://www.erlang.org/. - * + * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. - * + * * %CopyrightEnd% */ -/* - * $Id$ - */ + include(`hipe/hipe_x86_asm.m4') #`include' "hipe_literals.h" |