diff options
| author | Micael Karlberg <[email protected]> | 2011-05-27 14:38:08 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-05-27 14:38:08 +0200 |
| commit | 1c01cf2fb625e105dd2355279635edbb3dbb3063 (patch) | |
| tree | 5dbd5a391b86d99c00a01c456f817f30209f1962 /erts/emulator/hipe/hipe_arm_glue.S | |
| parent | 77fe4062599e4ffe897c21d22ad493cfec4b475c (diff) | |
| parent | 4a5a75811e2cd590b5c94f71864a5245fd511ccf (diff) | |
| download | otp-1c01cf2fb625e105dd2355279635edbb3dbb3063.tar.gz otp-1c01cf2fb625e105dd2355279635edbb3dbb3063.tar.bz2 otp-1c01cf2fb625e105dd2355279635edbb3dbb3063.zip | |
Merge branch 'maint-r14' of super:otp into maint-r14
Diffstat (limited to 'erts/emulator/hipe/hipe_arm_glue.S')
| -rw-r--r-- | erts/emulator/hipe/hipe_arm_glue.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/erts/emulator/hipe/hipe_arm_glue.S b/erts/emulator/hipe/hipe_arm_glue.S index 8c1c55b216..2e2b8604a6 100644 --- a/erts/emulator/hipe/hipe_arm_glue.S +++ b/erts/emulator/hipe/hipe_arm_glue.S @@ -1,23 +1,23 @@ /* * %CopyrightBegin% - * + * * Copyright Ericsson AB 2005-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_arm_asm.h" #include "hipe_literals.h" #define ASM |