aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/hello_world/Makefile.check2
-rw-r--r--test/hello_world/hello_kernel/asm-utils.h23
2 files changed, 1 insertions, 24 deletions
diff --git a/test/hello_world/Makefile.check b/test/hello_world/Makefile.check
index a730fbf..5b330ed 100644
--- a/test/hello_world/Makefile.check
+++ b/test/hello_world/Makefile.check
@@ -8,7 +8,7 @@ $(HELLO_WORLD_TEST:%=%-check) : %-check: % skiboot.lid
./test/hello_world/run_hello_world.sh
test/hello_world/hello_kernel/hello_kernel.o: test/hello_world/hello_kernel/hello_kernel.S test/hello_world/hello_kernel/hello_kernel.ld
- $(call Q,CC, $(CC) -m64 -c -MMD -Itest/hello_world/hello_kernel/ -o $@ $< ,$@)
+ $(call Q,CC, $(CC) -m64 -c -MMD -o $@ $< ,$@)
hello_kernel_LDFLAGS=-m64 -Wl,--build-id=none -T test/hello_world/hello_kernel/hello_kernel.ld -ffreestanding -nostdlib -Ttext=0x0 -lgcc
diff --git a/test/hello_world/hello_kernel/asm-utils.h b/test/hello_world/hello_kernel/asm-utils.h
deleted file mode 100644
index bddf771..0000000
--- a/test/hello_world/hello_kernel/asm-utils.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2013-2014 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOAD_IMM64(r, e) \
- lis r,(e)@highest; \
- ori r,r,(e)@higher; \
- rldicr r,r, 32, 31; \
- oris r,r, (e)@h; \
- ori r,r, (e)@l;
-