From d996724891805cf3561a53e0bd36e175c3dd4c15 Mon Sep 17 00:00:00 2001 From: David Welch Date: Sun, 8 Oct 2000 23:44:46 +0000 Subject: [PATCH] Fixed compilation bugs Removed useless spec files svn path=/trunk/; revision=1396 --- reactos/apps/tests/regtest/makefile | 2 +- reactos/drivers/net/dd/ne2000/Makefile | 4 +- reactos/lib/advapi32/advapi32_specs | 78 -------------------------- reactos/lib/crtdll/crt_specs | 78 -------------------------- reactos/lib/kernel32/k32_specs | 78 -------------------------- reactos/lib/ntdll/ntdll_specs | 78 -------------------------- reactos/ntoskrnl/hal/x86/portio.c | 20 +++---- reactos/ntoskrnl/nt/nttimer.c | 2 +- 8 files changed, 11 insertions(+), 329 deletions(-) delete mode 100644 reactos/lib/advapi32/advapi32_specs delete mode 100644 reactos/lib/crtdll/crt_specs delete mode 100644 reactos/lib/kernel32/k32_specs delete mode 100644 reactos/lib/ntdll/ntdll_specs diff --git a/reactos/apps/tests/regtest/makefile b/reactos/apps/tests/regtest/makefile index ec42be27289..56be50d4665 100644 --- a/reactos/apps/tests/regtest/makefile +++ b/reactos/apps/tests/regtest/makefile @@ -40,7 +40,7 @@ else endif regtest.exe: $(OBJECTS) $(LIBS) - $(CC) -specs=../../specs $(OBJECTS) $(LIBS) -lgcc -o regtest.exe + $(CC) -nostartfiles -nostdlib $(OBJECTS) $(LIBS) -lgcc -o regtest.exe $(NM) --numeric-sort regtest.exe > regtest.sym include ../../rules.mak diff --git a/reactos/drivers/net/dd/ne2000/Makefile b/reactos/drivers/net/dd/ne2000/Makefile index 2d75087f24b..fc1def72507 100644 --- a/reactos/drivers/net/dd/ne2000/Makefile +++ b/reactos/drivers/net/dd/ne2000/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2000/10/07 18:44:07 dwelch Exp $ +# $Id: Makefile,v 1.5 2000/10/08 23:44:46 dwelch Exp $ # # PATH_TO_TOP = ../../../.. @@ -48,7 +48,7 @@ $(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def --output-lib $(TARGETNAME).a \ --kill-at $(CC) \ - -specs=../../../../specs \ + -nostdlib -nostdinc \ --subsystem=native \ -mdll \ --dll \ diff --git a/reactos/lib/advapi32/advapi32_specs b/reactos/lib/advapi32/advapi32_specs deleted file mode 100644 index 02ba08d1e79..00000000000 --- a/reactos/lib/advapi32/advapi32_specs +++ /dev/null @@ -1,78 +0,0 @@ -*asm: - - -*asm_final: - - -*cpp: --remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} - -*cc1: -%(cc1_spec) - -*cc1plus: - - -*endfile: - - -*link: -%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMain@12} - -*lib: - - -*libgcc: --lgcc - -*startfile: - - -*switches_need_spaces: - - -*signed_char: -%{funsigned-char:-D__CHAR_UNSIGNED__} - -*predefines: --Di386 -D_WIN32 -DWIN32 -D__WIN32__ -D__MINGW32__ -DWINNT -D_X86_=1 -D__STDC__=1 -D__stdcall=__attribute__((__stdcall__)) -D_stdcall=__attribute__((__stdcall__)) -D__cdecl=__attribute__((__cdecl__)) -D__declspec(x)=__attribute__((x)) -Asystem(winnt) -Acpu(i386) -Amachine(i386) - -*cross_compile: -1 - -*version: -egcs-2.91.57 - -*multilib: -. ; - -*multilib_defaults: - - -*multilib_extra: - - -*multilib_matches: - - -*linker: -collect2 - -*cpp_486: -%{!ansi:-Di486} -D__i486 -D__i486__ - -*cpp_586: -%{!ansi:-Di586 -Dpentium} -D__i586 -D__i586__ -D__pentium -D__pentium__ - -*cpp_686: -%{!ansi:-Di686 -Dpentiumpro} -D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__ - -*cpp_cpu_default: -%(cpp_586) - -*cpp_cpu: --Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}} - -*cc1_cpu: -%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}} - diff --git a/reactos/lib/crtdll/crt_specs b/reactos/lib/crtdll/crt_specs deleted file mode 100644 index 88677ea6886..00000000000 --- a/reactos/lib/crtdll/crt_specs +++ /dev/null @@ -1,78 +0,0 @@ -*asm: - - -*asm_final: - - -*cpp: --remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} - -*cc1: -%(cc1_spec) - -*cc1plus: - - -*endfile: - - -*link: -%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMain@12} - -*lib: - - -*libgcc: --lgcc - -*startfile: - - -*switches_need_spaces: - - -*signed_char: -%{funsigned-char:-D__CHAR_UNSIGNED__} - -*predefines: --Di386 -D_WIN32 -DWIN32 -D__WIN32__ -D__MINGW32__ -DWINNT -D_X86_=1 -D__STDC__=1 -D__stdcall=__attribute__((__stdcall__)) -D_stdcall=__attribute__((__stdcall__)) -D__cdecl=__attribute__((__cdecl__)) -D__declspec(x)=__attribute__((x)) -Asystem(winnt) -Acpu(i386) -Amachine(i386) - -*cross_compile: -0 - -*version: -egcs-2.8.2 - -*multilib: -. ; - -*multilib_defaults: - - -*multilib_extra: - - -*multilib_matches: - - -*linker: -collect2 - -*cpp_486: -%{!ansi:-Di486} -D__i486 -D__i486__ - -*cpp_586: -%{!ansi:-Di586 -Dpentium} -D__i586 -D__i586__ -D__pentium -D__pentium__ - -*cpp_686: -%{!ansi:-Di686 -Dpentiumpro} -D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__ - -*cpp_cpu_default: -%(cpp_586) - -*cpp_cpu: --Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}} - -*cc1_cpu: -%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}} - diff --git a/reactos/lib/kernel32/k32_specs b/reactos/lib/kernel32/k32_specs deleted file mode 100644 index e5c1a5f645b..00000000000 --- a/reactos/lib/kernel32/k32_specs +++ /dev/null @@ -1,78 +0,0 @@ -*asm: - - -*asm_final: - - -*cpp: --remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} - -*cc1: -%(cc1_spec) - -*cc1plus: - - -*endfile: - - -*link: -%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMainCRTStartup@12} - -*lib: - - -*libgcc: --lgcc - -*startfile: - - -*switches_need_spaces: - - -*signed_char: -%{funsigned-char:-D__CHAR_UNSIGNED__} - -*predefines: --Di386 -D_WIN32 -DWIN32 -D__WIN32__ -D__MINGW32__ -DWINNT -D_X86_=1 -D__STDC__=1 -D__stdcall=__attribute__((__stdcall__)) -D_stdcall=__attribute__((__stdcall__)) -D__cdecl=__attribute__((__cdecl__)) -D__declspec(x)=__attribute__((x)) -Asystem(winnt) -Acpu(i386) -Amachine(i386) - -*cross_compile: -1 - -*version: -egcs-2.91.57 - -*multilib: -. ; - -*multilib_defaults: - - -*multilib_extra: - - -*multilib_matches: - - -*linker: -collect2 - -*cpp_486: -%{!ansi:-Di486} -D__i486 -D__i486__ - -*cpp_586: -%{!ansi:-Di586 -Dpentium} -D__i586 -D__i586__ -D__pentium -D__pentium__ - -*cpp_686: -%{!ansi:-Di686 -Dpentiumpro} -D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__ - -*cpp_cpu_default: -%(cpp_586) - -*cpp_cpu: --Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}} - -*cc1_cpu: -%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}} - diff --git a/reactos/lib/ntdll/ntdll_specs b/reactos/lib/ntdll/ntdll_specs deleted file mode 100644 index f9cd789df25..00000000000 --- a/reactos/lib/ntdll/ntdll_specs +++ /dev/null @@ -1,78 +0,0 @@ -*asm: - - -*asm_final: - - -*cpp: --remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} - -*cc1: -%(cc1_spec) - -*cc1plus: - - -*endfile: - - -*link: -%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMainCRTStartup@12} - -*lib: - - -*libgcc: --lgcc - -*startfile: - - -*switches_need_spaces: - - -*signed_char: -%{funsigned-char:-D__CHAR_UNSIGNED__} - -*predefines: --Di386 -D_WIN32 -DWIN32 -D__WIN32__ -D__MINGW32__ -DWINNT -D_X86_=1 -D__STDC__=1 -D__stdcall=__attribute__((__stdcall__)) -D_stdcall=__attribute__((__stdcall__)) -D__cdecl=__attribute__((__cdecl__)) -D__declspec(x)=__attribute__((x)) -Asystem(winnt) -Acpu(i386) -Amachine(i386) - -*cross_compile: -1 - -*version: -egcs-2.91.57 - -*multilib: -. ; - -*multilib_defaults: - - -*multilib_extra: - - -*multilib_matches: - - -*linker: -collect2 - -*cpp_486: -%{!ansi:-Di486} -D__i486 -D__i486__ - -*cpp_586: -%{!ansi:-Di586 -Dpentium} -D__i586 -D__i586__ -D__pentium -D__pentium__ - -*cpp_686: -%{!ansi:-Di686 -Dpentiumpro} -D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__ - -*cpp_cpu_default: -%(cpp_586) - -*cpp_cpu: --Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}} - -*cc1_cpu: -%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}} - diff --git a/reactos/ntoskrnl/hal/x86/portio.c b/reactos/ntoskrnl/hal/x86/portio.c index 0404b2000cb..65671c8e491 100644 --- a/reactos/ntoskrnl/hal/x86/portio.c +++ b/reactos/ntoskrnl/hal/x86/portio.c @@ -1,4 +1,4 @@ -/* $Id: portio.c,v 1.4 2000/10/07 13:41:50 dwelch Exp $ +/* $Id: portio.c,v 1.5 2000/10/08 23:44:45 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -87,8 +87,7 @@ READ_PORT_UCHAR (PUCHAR Port) __asm__("inb %w1, %0\n\t" : "=a" (Value) - : "d" (Port) - : "eax", "dx"); + : "d" (Port)); SLOW_DOWN_IO; return(Value); } @@ -100,8 +99,7 @@ READ_PORT_USHORT (PUSHORT Port) __asm__("inw %w1, %0\n\t" : "=a" (Value) - : "d" (Port) - : "eax", "dx"); + : "d" (Port)); SLOW_DOWN_IO; return(Value); } @@ -113,8 +111,7 @@ READ_PORT_ULONG (PULONG Port) __asm__("inl %w1, %0\n\t" : "=a" (Value) - : "d" (Port) - : "eax", "dx"); + : "d" (Port)); SLOW_DOWN_IO; return(Value); } @@ -156,8 +153,7 @@ WRITE_PORT_UCHAR (PUCHAR Port, __asm__("outb %0, %w1\n\t" : : "a" (Value), - "d" (Port) - : "eax", "dx"); + "d" (Port)); SLOW_DOWN_IO; } @@ -168,8 +164,7 @@ WRITE_PORT_USHORT (PUSHORT Port, __asm__("outw %0, %w1\n\t" : : "a" (Value), - "d" (Port) - : "eax", "dx"); + "d" (Port)); SLOW_DOWN_IO; } @@ -180,8 +175,7 @@ WRITE_PORT_ULONG (PULONG Port, __asm__("outl %0, %w1\n\t" : : "a" (Value), - "d" (Port) - : "eax", "dx"); + "d" (Port)); SLOW_DOWN_IO; } diff --git a/reactos/ntoskrnl/nt/nttimer.c b/reactos/ntoskrnl/nt/nttimer.c index 27f0aa9d349..90194ca3e4f 100644 --- a/reactos/ntoskrnl/nt/nttimer.c +++ b/reactos/ntoskrnl/nt/nttimer.c @@ -33,7 +33,7 @@ NtCreateTimer ( OUT PHANDLE TimerHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN CINT TimerType + IN TIMER_TYPE TimerType ) { UNIMPLEMENTED;