aboutsummaryrefslogtreecommitdiffstats
path: root/com32/modules
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-10-23 15:02:50 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-10-23 15:02:50 +0100
commit46ea6398fe73c05bbb739886c3ba9ea340699814 (patch)
treed21293fd8f5302eaeb82fb71c71a1273cc8dbc24 /com32/modules
parent4503e6260c032db9bb24843f51fdcd8985ef5768 (diff)
parent7a505bfa33a2fda1d1a687ef42fe7bbf4c0f37ec (diff)
downloadsyslinux-46ea6398fe73c05bbb739886c3ba9ea340699814.tar.gz
syslinux-46ea6398fe73c05bbb739886c3ba9ea340699814.tar.xz
syslinux-46ea6398fe73c05bbb739886c3ba9ea340699814.zip
Merge branch 'elflink' of git://github.com/aericson/syslinux into elflink
Conflicts: com32/modules/Makefile
Diffstat (limited to 'com32/modules')
-rw-r--r--com32/modules/Makefile2
-rw-r--r--com32/modules/hello.c26
2 files changed, 1 insertions, 27 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile
index dd5f2e04..fcdf0471 100644
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@ -24,7 +24,7 @@ MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \
meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \
kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \
ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 \
- whichsys.c32 hello.c32 pxechn.c32
+ whichsys.c32 pxechn.c32
TESTFILES =
diff --git a/com32/modules/hello.c b/com32/modules/hello.c
deleted file mode 100644
index d3d4d299..00000000
--- a/com32/modules/hello.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * hello.c - A simple ELF module that sorts a couple of numbers
- *
- * Created on: Aug 11, 2008
- * Author: Stefan Bucur <stefanb@zytor.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "sort.h"
-
-#define NUM_COUNT 10
-#define MAX_NUM 100
-
-int main(int argc __unused, char **argv __unused)
-{
- int *nums = NULL;
-
- nums = malloc(NUM_COUNT * sizeof(int));
- printf("Hello, world, from 0x%08X! malloc return %p\n", (unsigned int)&main, nums);
-
- free(nums);
-
- return 0;
-}